You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by gi...@apache.org on 2021/11/05 19:49:41 UTC
[druid] branch master updated: Properly count segment references in
tests. (#11870)
This is an automated email from the ASF dual-hosted git repository.
gian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 8971056 Properly count segment references in tests. (#11870)
8971056 is described below
commit 897105676375112422bb362f4cc2163fc981a6ca
Author: Gian Merlino <gi...@gmail.com>
AuthorDate: Fri Nov 5 12:49:10 2021 -0700
Properly count segment references in tests. (#11870)
---
.../druid/server/TestClusterQuerySegmentWalker.java | 15 +++++++++------
.../calcite/util/SpecificSegmentsQuerySegmentWalker.java | 11 +++++++----
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/server/src/test/java/org/apache/druid/server/TestClusterQuerySegmentWalker.java b/server/src/test/java/org/apache/druid/server/TestClusterQuerySegmentWalker.java
index 324eb14..ddf8d4e 100644
--- a/server/src/test/java/org/apache/druid/server/TestClusterQuerySegmentWalker.java
+++ b/server/src/test/java/org/apache/druid/server/TestClusterQuerySegmentWalker.java
@@ -38,6 +38,7 @@ import org.apache.druid.query.QueryRunnerFactory;
import org.apache.druid.query.QueryRunnerFactoryConglomerate;
import org.apache.druid.query.QuerySegmentWalker;
import org.apache.druid.query.QueryToolChest;
+import org.apache.druid.query.ReferenceCountingSegmentQueryRunner;
import org.apache.druid.query.SegmentDescriptor;
import org.apache.druid.query.TableDataSource;
import org.apache.druid.query.context.ResponseContext.Key;
@@ -45,7 +46,6 @@ import org.apache.druid.query.planning.DataSourceAnalysis;
import org.apache.druid.query.spec.SpecificSegmentQueryRunner;
import org.apache.druid.query.spec.SpecificSegmentSpec;
import org.apache.druid.segment.ReferenceCountingSegment;
-import org.apache.druid.segment.Segment;
import org.apache.druid.segment.SegmentReference;
import org.apache.druid.segment.filter.Filters;
import org.apache.druid.segment.join.JoinableFactory;
@@ -220,8 +220,11 @@ public class TestClusterQuerySegmentWalker implements QuerySegmentWalker
.transform(
segment ->
new SpecificSegmentQueryRunner<>(
- factory.createRunner(segmentMapFn.apply(ReferenceCountingSegment.wrapRootGenerationSegment(
- segment.getSegment()))),
+ new ReferenceCountingSegmentQueryRunner<>(
+ factory,
+ segmentMapFn.apply(segment.getSegment()),
+ segment.getDescriptor()
+ ),
new SpecificSegmentSpec(segment.getDescriptor())
)
)
@@ -274,17 +277,17 @@ public class TestClusterQuerySegmentWalker implements QuerySegmentWalker
private static class WindowedSegment
{
- private final Segment segment;
+ private final ReferenceCountingSegment segment;
private final Interval interval;
- public WindowedSegment(Segment segment, Interval interval)
+ public WindowedSegment(ReferenceCountingSegment segment, Interval interval)
{
this.segment = segment;
this.interval = interval;
Preconditions.checkArgument(segment.getId().getInterval().contains(interval));
}
- public Segment getSegment()
+ public ReferenceCountingSegment getSegment()
{
return segment;
}
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/util/SpecificSegmentsQuerySegmentWalker.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/SpecificSegmentsQuerySegmentWalker.java
index 7fde642..512b2f6 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/util/SpecificSegmentsQuerySegmentWalker.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/SpecificSegmentsQuerySegmentWalker.java
@@ -38,7 +38,6 @@ import org.apache.druid.segment.MapSegmentWrangler;
import org.apache.druid.segment.QueryableIndex;
import org.apache.druid.segment.QueryableIndexSegment;
import org.apache.druid.segment.ReferenceCountingSegment;
-import org.apache.druid.segment.Segment;
import org.apache.druid.segment.SegmentWrangler;
import org.apache.druid.segment.join.JoinableFactory;
import org.apache.druid.server.ClientQuerySegmentWalker;
@@ -146,7 +145,11 @@ public class SpecificSegmentsQuerySegmentWalker implements QuerySegmentWalker, C
public SpecificSegmentsQuerySegmentWalker add(final DataSegment descriptor, final QueryableIndex index)
{
- final Segment segment = new QueryableIndexSegment(index, descriptor.getId());
+ final ReferenceCountingSegment segment =
+ ReferenceCountingSegment.wrapSegment(
+ new QueryableIndexSegment(index, descriptor.getId()),
+ descriptor.getShardSpec()
+ );
final VersionedIntervalTimeline<String, ReferenceCountingSegment> timeline = timelines.computeIfAbsent(
descriptor.getDataSource(),
datasource -> new VersionedIntervalTimeline<>(Ordering.natural())
@@ -154,10 +157,10 @@ public class SpecificSegmentsQuerySegmentWalker implements QuerySegmentWalker, C
timeline.add(
descriptor.getInterval(),
descriptor.getVersion(),
- descriptor.getShardSpec().createChunk(ReferenceCountingSegment.wrapSegment(segment, descriptor.getShardSpec()))
+ descriptor.getShardSpec().createChunk(segment)
);
segments.add(descriptor);
- closeables.add(index);
+ closeables.add(segment);
return this;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org