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

Remove some unnecessary JoinableFactoryWrappers. (#17051) 

* Remove some unnecessary JoinableFactoryWrappers.

* Remove unused import.
This commit is contained in:
Gian Merlino 2024-09-15 23:02:12 -07:00 committed by GitHub
parent 5b7fb5fbca
commit d789723331
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/ServerManagerForQueryErrorTest.java
View File

@ -47,7 +47,6 @@ import org.apache.druid.query.ResourceLimitExceededException;
import org.apache.druid.query.SegmentDescriptor; import org.apache.druid.query.SegmentDescriptor;
import org.apache.druid.segment.ReferenceCountingSegment; import org.apache.druid.segment.ReferenceCountingSegment;
import org.apache.druid.segment.SegmentReference; import org.apache.druid.segment.SegmentReference;
import org.apache.druid.segment.join.JoinableFactoryWrapper;
import org.apache.druid.server.SegmentManager; import org.apache.druid.server.SegmentManager;
import org.apache.druid.server.coordination.ServerManager; import org.apache.druid.server.coordination.ServerManager;
import org.apache.druid.server.initialization.ServerConfig; import org.apache.druid.server.initialization.ServerConfig;
@ -98,7 +97,6 @@ public class ServerManagerForQueryErrorTest extends ServerManager
Cache cache, Cache cache,
CacheConfig cacheConfig, CacheConfig cacheConfig,
SegmentManager segmentManager, SegmentManager segmentManager,
JoinableFactoryWrapper joinableFactoryWrapper,
ServerConfig serverConfig ServerConfig serverConfig
) )
{ {
@ -111,7 +109,6 @@ public class ServerManagerForQueryErrorTest extends ServerManager
cache, cache,
cacheConfig, cacheConfig,
segmentManager, segmentManager,
joinableFactoryWrapper,
serverConfig serverConfig
); );
} }

3
integration-tests/src/main/java/org/apache/druid/server/coordination/ServerManagerForQueryErrorTest.java
View File

@ -47,7 +47,6 @@ import org.apache.druid.query.ResourceLimitExceededException;
import org.apache.druid.query.SegmentDescriptor; import org.apache.druid.query.SegmentDescriptor;
import org.apache.druid.segment.ReferenceCountingSegment; import org.apache.druid.segment.ReferenceCountingSegment;
import org.apache.druid.segment.SegmentReference; import org.apache.druid.segment.SegmentReference;
import org.apache.druid.segment.join.JoinableFactoryWrapper;
import org.apache.druid.server.SegmentManager; import org.apache.druid.server.SegmentManager;
import org.apache.druid.server.initialization.ServerConfig; import org.apache.druid.server.initialization.ServerConfig;
import org.apache.druid.timeline.VersionedIntervalTimeline; import org.apache.druid.timeline.VersionedIntervalTimeline;
@ -96,7 +95,6 @@ public class ServerManagerForQueryErrorTest extends ServerManager
Cache cache, Cache cache,
CacheConfig cacheConfig, CacheConfig cacheConfig,
SegmentManager segmentManager, SegmentManager segmentManager,
JoinableFactoryWrapper joinableFactoryWrapper,
ServerConfig serverConfig ServerConfig serverConfig
) )
{ {
@ -109,7 +107,6 @@ public class ServerManagerForQueryErrorTest extends ServerManager
cache, cache,
cacheConfig, cacheConfig,
segmentManager, segmentManager,
joinableFactoryWrapper,
serverConfig serverConfig
); );
} }

4
server/src/main/java/org/apache/druid/server/coordination/ServerManager.java
View File

@ -59,7 +59,6 @@ import org.apache.druid.query.spec.SpecificSegmentSpec;
import org.apache.druid.segment.ReferenceCountingSegment; import org.apache.druid.segment.ReferenceCountingSegment;
import org.apache.druid.segment.SegmentReference; import org.apache.druid.segment.SegmentReference;
import org.apache.druid.segment.TimeBoundaryInspector; import org.apache.druid.segment.TimeBoundaryInspector;
import org.apache.druid.segment.join.JoinableFactoryWrapper;
import org.apache.druid.server.ResourceIdPopulatingQueryRunner; import org.apache.druid.server.ResourceIdPopulatingQueryRunner;
import org.apache.druid.server.SegmentManager; import org.apache.druid.server.SegmentManager;
import org.apache.druid.server.SetAndVerifyContextQueryRunner; import org.apache.druid.server.SetAndVerifyContextQueryRunner;
@ -90,7 +89,6 @@ public class ServerManager implements QuerySegmentWalker
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
private final CacheConfig cacheConfig; private final CacheConfig cacheConfig;
private final SegmentManager segmentManager; private final SegmentManager segmentManager;
private final JoinableFactoryWrapper joinableFactoryWrapper;
private final ServerConfig serverConfig; private final ServerConfig serverConfig;
@Inject @Inject
@ -103,7 +101,6 @@ public class ServerManager implements QuerySegmentWalker
Cache cache, Cache cache,
CacheConfig cacheConfig, CacheConfig cacheConfig,
SegmentManager segmentManager, SegmentManager segmentManager,
JoinableFactoryWrapper joinableFactoryWrapper,
ServerConfig serverConfig ServerConfig serverConfig
) )
{ {
@ -117,7 +114,6 @@ public class ServerManager implements QuerySegmentWalker
this.cacheConfig = cacheConfig; this.cacheConfig = cacheConfig;
this.segmentManager = segmentManager; this.segmentManager = segmentManager;
this.joinableFactoryWrapper = joinableFactoryWrapper;
this.serverConfig = serverConfig; this.serverConfig = serverConfig;
} }

2
server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java
View File

@ -77,7 +77,6 @@ import org.apache.druid.segment.ReferenceCountingSegment;
import org.apache.druid.segment.Segment; import org.apache.druid.segment.Segment;
import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.TestHelper;
import org.apache.druid.segment.TestIndex; import org.apache.druid.segment.TestIndex;
import org.apache.druid.segment.join.JoinableFactoryWrapperTest;
import org.apache.druid.segment.loading.LeastBytesUsedStorageLocationSelectorStrategy; import org.apache.druid.segment.loading.LeastBytesUsedStorageLocationSelectorStrategy;
import org.apache.druid.segment.loading.SegmentLoaderConfig; import org.apache.druid.segment.loading.SegmentLoaderConfig;
import org.apache.druid.segment.loading.SegmentLoadingException; import org.apache.druid.segment.loading.SegmentLoadingException;
@ -208,7 +207,6 @@ public class ServerManagerTest
new LocalCacheProvider().get(), new LocalCacheProvider().get(),
new CacheConfig(), new CacheConfig(),
segmentManager, segmentManager,
JoinableFactoryWrapperTest.NOOP_JOINABLE_FACTORY_WRAPPER,
new ServerConfig() new ServerConfig()
); );