fix

clintropolis · Nov 30, 2023 · f974fcc · f974fcc
1 parent ca7ccf4
commit f974fcc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/...java/org/apache/druid/sql/calcite/expression/builtin/ArrayContainsOperatorConversion.java b/...java/org/apache/druid/sql/calcite/expression/builtin/ArrayContainsOperatorConversion.java
@@ -154,6 +154,11 @@ public DimFilter toDruidFilter(
         ExprEval<?> exprEval = expr.eval(InputBindings.nilBindings());
         if (exprEval.isArray()) {
           final Object[] arrayElements = exprEval.asArray();
+          if (arrayElements.length == 0) {
+            // this isn't likely possible today because array constructor function does not accept empty argument list
+            // but just in case, return null
+            return null;
+          }
           final List<DimFilter> filters = new ArrayList<>(arrayElements.length);
           final ColumnType elementType = ExpressionType.toColumnType(ExpressionType.elementType(exprEval.type()));
           for (final Object val : arrayElements) {

diff --git a/.../java/org/apache/druid/sql/calcite/expression/builtin/ArrayOverlapOperatorConversion.java b/.../java/org/apache/druid/sql/calcite/expression/builtin/ArrayOverlapOperatorConversion.java
@@ -164,6 +164,11 @@ public DimFilter toDruidFilter(
         ExprEval<?> exprEval = expr.eval(InputBindings.nilBindings());
         if (exprEval.isArray()) {
           final Object[] arrayElements = exprEval.asArray();
+          if (arrayElements.length == 0) {
+            // this isn't likely possible today because array constructor function does not accept empty argument list
+            // but just in case, return null
+            return null;
+          }
           final List<DimFilter> filters = new ArrayList<>(arrayElements.length);
           final ColumnType elementType = ExpressionType.toColumnType(ExpressionType.elementType(exprEval.type()));
           for (final Object val : arrayElements) {

diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
@@ -1563,7 +1563,8 @@ public void testGroupByRootSingleTypeArrayLongNullsFilteredMore()
                             .setDimFilter(
                                 or(
                                     new ArrayContainsElementFilter("arrayLongNulls", ColumnType.LONG, 1L, null),
-                                    expressionFilter("array_overlap(\"arrayLongNulls\",array(2,3))")
+                                    new ArrayContainsElementFilter("arrayLongNulls", ColumnType.LONG, 2L, null),
+                                    new ArrayContainsElementFilter("arrayLongNulls", ColumnType.LONG, 3L, null)
                                 )
                             )
                             .setAggregatorSpecs(aggregators(new LongSumAggregatorFactory("a0", "cnt")))