fixes

apache · Jun 8, 2024 · 24a9bd7 · 24a9bd7
1 parent cb6a51d
commit 24a9bd7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionPlan.java b/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionPlan.java
@@ -274,15 +274,18 @@ public ColumnCapabilities inferColumnCapabilities(@Nullable ColumnType outputTyp
             // since we don't know if the expression is 1:1 or if it retains ordering we can only piggy back only
             // report as dictionary encoded, but it still allows us to use algorithms which work with dictionaryIds
             // to create a dictionary encoded selector instead of an object selector to defer expression evaluation
-            // until query time
-            return ColumnCapabilitiesImpl.copyOf(underlyingCapabilities)
+            // until query time. However, currently dictionary encodedness is tied to string selectors and sad stuff
+            // happens if the input type isn't string, so we also limit this to string input types
+            final boolean useDictionary = underlyingCapabilities.isDictionaryEncoded().isTrue() &&
+                                          underlyingCapabilities.is(ValueType.STRING);
+            return ColumnCapabilitiesImpl.createDefault()
                                          .setType(ColumnType.STRING)
-                                         // this is sad, but currently dictionary encodedness is tied to string
-                                         // selectors and sad stuff happens if the input type isn't string
-                                         .setDictionaryEncoded(underlyingCapabilities.is(ValueType.STRING))
-                                         .setDictionaryValuesSorted(false)
-                                         .setDictionaryValuesUnique(false)
-                                         .setHasBitmapIndexes(false)
+                                         .setDictionaryEncoded(useDictionary)
+                                         .setHasBitmapIndexes(underlyingCapabilities.hasBitmapIndexes())
+                                         .setHasMultipleValues(underlyingCapabilities.hasMultipleValues())
+                                         .setHasSpatialIndexes(underlyingCapabilities.hasSpatialIndexes())
+                                         // we aren't sure if the expression might produce null values or not, so always
+                                         // set hasNulls to true
                                          .setHasNulls(true);
           }
         }

diff --git a/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionPlannerTest.java b/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionPlannerTest.java
@@ -384,7 +384,7 @@ public void testScalarStringDictionaryEncoded()
     Assert.assertFalse(inferred.areDictionaryValuesSorted().isMaybeTrue());
     Assert.assertFalse(inferred.areDictionaryValuesUnique().isMaybeTrue());
     Assert.assertFalse(inferred.hasMultipleValues().isMaybeTrue());
-    Assert.assertFalse(inferred.hasBitmapIndexes());
+    Assert.assertTrue(inferred.hasBitmapIndexes());
     Assert.assertFalse(inferred.hasSpatialIndexes());
 
     // multiple input columns
@@ -478,7 +478,7 @@ public void testMultiValueStringDictionaryEncoded()
     Assert.assertFalse(inferred.areDictionaryValuesSorted().isMaybeTrue());
     Assert.assertFalse(inferred.areDictionaryValuesUnique().isMaybeTrue());
     Assert.assertTrue(inferred.hasMultipleValues().isTrue());
-    Assert.assertFalse(inferred.hasBitmapIndexes());
+    Assert.assertTrue(inferred.hasBitmapIndexes());
     Assert.assertFalse(inferred.hasSpatialIndexes());
 
     thePlan = plan("concat(scalar_string, multi_dictionary_string_nonunique)");