Merge pull request apache#2583 from guobingkun/fix_multiple_specs_2

update querySegmentSpec when passing query to getQueryRunner
praveev · Mar 3, 2016 · d06c1c5 · d06c1c5
2 parents 9e74772 + 4a58462
commit d06c1c5
Show file tree

Hide file tree

Showing 4 changed files with 231 additions and 43 deletions.
diff --git a/processing/src/test/java/io/druid/query/QueryRunnerTestHelper.java b/processing/src/test/java/io/druid/query/QueryRunnerTestHelper.java
@@ -400,6 +400,18 @@ public void remove()
     };
   }
 
+  public static <T, QueryType extends Query<T>> QueryRunner<T> makeQueryRunner(
+      QueryRunnerFactory<T, QueryType> factory,
+      String resourceFileName
+  )
+  {
+    return makeQueryRunner(
+        factory,
+        segmentId,
+        new IncrementalIndexSegment(TestIndex.makeRealtimeIndex(resourceFileName), segmentId)
+    );
+  }
+
   public static <T, QueryType extends Query<T>> QueryRunner<T> makeQueryRunner(
       QueryRunnerFactory<T, QueryType> factory,
       Segment adapter

diff --git a/processing/src/test/java/io/druid/segment/TestIndex.java b/processing/src/test/java/io/druid/segment/TestIndex.java
@@ -163,7 +163,7 @@ public static QueryableIndex mergedRealtimeIndex()
     }
   }
 
-  private static IncrementalIndex makeRealtimeIndex(final String resourceFilename)
+  public static IncrementalIndex makeRealtimeIndex(final String resourceFilename)
   {
     final URL resource = TestIndex.class.getClassLoader().getResource(resourceFilename);
     if (resource == null) {

diff --git a/server/src/main/java/io/druid/segment/realtime/RealtimeManager.java b/server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
@@ -44,6 +44,7 @@
 import io.druid.query.QuerySegmentWalker;
 import io.druid.query.QueryToolChest;
 import io.druid.query.SegmentDescriptor;
+import io.druid.query.spec.SpecificSegmentSpec;
 import io.druid.segment.indexing.DataSchema;
 import io.druid.segment.indexing.RealtimeTuningConfig;
 import io.druid.segment.realtime.plumber.Committers;
@@ -192,7 +193,9 @@ public <T> QueryRunner<T> getQueryRunnerForSegments(final Query<T> query, final
                          public QueryRunner<T> apply(SegmentDescriptor spec)
                          {
                            final FireChief retVal = partitionChiefs.get(spec.getPartitionNumber());
-                           return retVal == null ? new NoopQueryRunner<T>() : retVal.getQueryRunner(query);
+                           return retVal == null
+                                  ? new NoopQueryRunner<T>()
+                                  : retVal.getQueryRunner(query.withQuerySegmentSpec(new SpecificSegmentSpec(spec)));
                          }
                        }
                    )