MM-?: Elasticsearch, IS NULL or empty.

apache · Mar 12, 2021 · 4aa2024 · 4aa2024
1 parent 5e8dacf
commit 4aa2024
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/...ch/common/src/main/java/org/apache/metamodel/elasticsearch/common/ElasticSearchUtils.java b/...ch/common/src/main/java/org/apache/metamodel/elasticsearch/common/ElasticSearchUtils.java
@@ -225,8 +225,6 @@ private static QueryBuilder createQueryBuilderForOperator(final FilterItem filte
         if (OperatorType.EQUALS_TO.equals(filterItem.getOperator())) {
             if (filterItem.getOperand() == null) {
                 return getMissingQuery(column.getName());
-            } else if (filterItem.getOperand().equals("")) {
-                return QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery(column.getName()));
             } else {
                 return matchOrTermQuery(column, filterItem.getOperand());
             }
@@ -250,7 +248,7 @@ private static QueryBuilder createQueryBuilderForOperator(final FilterItem filte
     }
 
     private static QueryBuilder matchOrTermQuery(final Column column, final Object operand) {
-        if (column.getType().isLiteral()) {
+        if (column.getType().isLiteral() && operand != null && !operand.equals("")) {
             return QueryBuilders.matchQuery(column.getName(), operand);
         } else {
             return QueryBuilders.termQuery(column.getName(), operand);