Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow overriding default JoinableFactory in SpecificSegmentsQuerySegmentWalker (#9330)

This commit is contained in:
Jonathan Wei 2020-02-06 18:35:26 -08:00 committed by GitHub
parent 0aa7a2a3ee
commit 57765a499b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
View File

@ -741,7 +741,8 @@ public class CalciteTests
return new SpecificSegmentsQuerySegmentWalker( return new SpecificSegmentsQuerySegmentWalker(
conglomerate, conglomerate,
INJECTOR.getInstance(LookupExtractorFactoryContainerProvider.class) INJECTOR.getInstance(LookupExtractorFactoryContainerProvider.class),
null
).add( ).add(
DataSegment.builder() DataSegment.builder()
.dataSource(DATASOURCE1) .dataSource(DATASOURCE1)

35
sql/src/test/java/org/apache/druid/sql/calcite/util/SpecificSegmentsQuerySegmentWalker.java
View File

@ -71,6 +71,7 @@ import org.apache.druid.timeline.partition.PartitionChunk;
import org.apache.druid.timeline.partition.PartitionHolder; import org.apache.druid.timeline.partition.PartitionHolder;
import org.joda.time.Interval; import org.joda.time.Interval;
import javax.annotation.Nullable;
import java.io.Closeable; import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -102,19 +103,23 @@ public class SpecificSegmentsQuerySegmentWalker implements QuerySegmentWalker, C
/** /**
* Create an instance using the provided query runner factory conglomerate and lookup provider. * Create an instance using the provided query runner factory conglomerate and lookup provider.
* If a JoinableFactory is provided, it will be used instead of the default.
*/ */
public SpecificSegmentsQuerySegmentWalker( public SpecificSegmentsQuerySegmentWalker(
final QueryRunnerFactoryConglomerate conglomerate, final QueryRunnerFactoryConglomerate conglomerate,
final LookupExtractorFactoryContainerProvider lookupProvider final LookupExtractorFactoryContainerProvider lookupProvider,
@Nullable final JoinableFactory joinableFactory
) )
{ {
this.conglomerate = conglomerate; this.conglomerate = conglomerate;
this.joinableFactory = MapJoinableFactoryTest.fromMap( this.joinableFactory = joinableFactory == null ?
ImmutableMap.<Class<? extends DataSource>, JoinableFactory>builder() MapJoinableFactoryTest.fromMap(
.put(InlineDataSource.class, new InlineJoinableFactory()) ImmutableMap.<Class<? extends DataSource>, JoinableFactory>builder()
.put(LookupDataSource.class, new LookupJoinableFactory(lookupProvider)) .put(InlineDataSource.class, new InlineJoinableFactory())
.build() .put(LookupDataSource.class, new LookupJoinableFactory(lookupProvider))
); .build()
) : joinableFactory;
this.walker = new ClientQuerySegmentWalker( this.walker = new ClientQuerySegmentWalker(
new NoopServiceEmitter(), new NoopServiceEmitter(),
new DataServerLikeWalker(), new DataServerLikeWalker(),
@ -160,9 +165,20 @@ public class SpecificSegmentsQuerySegmentWalker implements QuerySegmentWalker, C
} }
/** /**
* Create an instance without any lookups. * Create an instance without any lookups, using the default JoinableFactory
*/ */
public SpecificSegmentsQuerySegmentWalker(final QueryRunnerFactoryConglomerate conglomerate) public SpecificSegmentsQuerySegmentWalker(final QueryRunnerFactoryConglomerate conglomerate)
{
this(conglomerate, null);
}
/**
* Create an instance without any lookups, optionally allowing the default JoinableFactory to be overridden
*/
public SpecificSegmentsQuerySegmentWalker(
final QueryRunnerFactoryConglomerate conglomerate,
@Nullable JoinableFactory joinableFactory
)
{ {
this( this(
conglomerate, conglomerate,
@ -179,7 +195,8 @@ public class SpecificSegmentsQuerySegmentWalker implements QuerySegmentWalker, C
{ {
return Optional.empty(); return Optional.empty();
} }
} },
joinableFactory
); );
} }