return emptylist

kgyrtkirk · Oct 3, 2024 · 932d61d · 932d61d
1 parent 8f9b808
commit 932d61d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/processing/src/main/java/org/apache/druid/query/union/RealUnionQueryRunner.java b/processing/src/main/java/org/apache/druid/query/union/RealUnionQueryRunner.java
@@ -58,6 +58,7 @@ public Sequence<RowsAndColumns> run(QueryPlus<RowsAndColumns> queryPlus, Respons
 
   private void runTsQuery(QueryPlus<RowsAndColumns> queryPlus, TimeseriesQuery q, ResponseContext responseContext)
   {
+    // FIXME: is passing the walker here correct?
     QueryRunner<Result<TimeseriesResultValue>> runner = q.getRunner(walker);
     Sequence<Result<TimeseriesResultValue>> res = runner.run(queryPlus.withQuery(q), responseContext);
 

diff --git a/processing/src/main/java/org/apache/druid/segment/DimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/DimensionSelector.java
@@ -36,6 +36,7 @@
 
 import javax.annotation.Nullable;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -143,7 +144,7 @@ static Object rowToObject(IndexedInts row, DimensionDictionarySelector selector)
   {
     int rowSize = row.size();
     if (rowSize == 0) {
-      return null;
+      return Collections.emptyList();
     } else if (rowSize == 1) {
       return selector.lookupName(row.get(0));
     } else {