Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-02-27 14:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

almost ready?

Browse Source
This commit is contained in:
Zoltan Haindrich 2024-05-16 10:01:22 +00:00
parent 27735f2621
commit 28ea884e19
2 changed files with 60 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
integration-tests/src/main/java/org/apache/druid/quidem/Launcher.java
View File

@ -65,7 +65,7 @@ import org.apache.druid.guice.http.HttpClientModule;
import org.apache.druid.guice.security.AuthenticatorModule; import org.apache.druid.guice.security.AuthenticatorModule;
import org.apache.druid.guice.security.AuthorizerModule; import org.apache.druid.guice.security.AuthorizerModule;
import org.apache.druid.guice.security.DruidAuthModule; import org.apache.druid.guice.security.DruidAuthModule;
import org.apache.druid.guice.security.EscalatorModule; import org.apache.druid.initialization.CoreInjectorBuilder;
import org.apache.druid.initialization.DruidModule; import org.apache.druid.initialization.DruidModule;
import org.apache.druid.initialization.Log4jShutterDownerModule; import org.apache.druid.initialization.Log4jShutterDownerModule;
import org.apache.druid.initialization.TombstoneDataStorageModule; import org.apache.druid.initialization.TombstoneDataStorageModule;
@ -85,8 +85,6 @@ import org.apache.druid.server.QueryLifecycleFactory;
import org.apache.druid.server.QueryScheduler; import org.apache.druid.server.QueryScheduler;
import org.apache.druid.server.QuerySchedulerProvider; import org.apache.druid.server.QuerySchedulerProvider;
import org.apache.druid.server.SpecificSegmentsQuerySegmentWalker; import org.apache.druid.server.SpecificSegmentsQuerySegmentWalker;
import org.apache.druid.server.initialization.AuthenticatorMapperModule;
import org.apache.druid.server.initialization.AuthorizerMapperModule;
import org.apache.druid.server.initialization.ExternalStorageAccessSecurityModule; import org.apache.druid.server.initialization.ExternalStorageAccessSecurityModule;
import org.apache.druid.server.initialization.jetty.JettyServerModule; import org.apache.druid.server.initialization.jetty.JettyServerModule;
import org.apache.druid.server.log.RequestLogger; import org.apache.druid.server.log.RequestLogger;
@ -554,12 +552,18 @@ public class Launcher
@Override @Override
public void configureGuice(DruidInjectorBuilder builder) public void configureGuice(DruidInjectorBuilder builder)
{
throw new RuntimeException("f");
}
@Override
public void configureGuice(CoreInjectorBuilder builder, List<Module> overrideModules)
{ {
delegate.configureGuice(builder); delegate.configureGuice(builder);
TestRequestLogger testRequestLogger = new TestRequestLogger(); TestRequestLogger testRequestLogger = new TestRequestLogger();
// builder.addModule(connectionModule); // builder.addModule(connectionModule);
// builder.addModule(new DiscovertModule()); overrideModules.add(new DiscovertModule());
if(false) { if(false) {
builder.addModule(new LegacyBrokerParallelMergeConfigModule()); builder.addModule(new LegacyBrokerParallelMergeConfigModule());
@ -571,48 +575,6 @@ public class Launcher
builder.addModule(new BrokerServiceModule()); builder.addModule(new BrokerServiceModule());
} }
if(false) {
builder.addModules(
new Log4jShutterDownerModule(),
new LifecycleModule(),
// ExtensionsModule.SecondaryModule.class,
new DruidAuthModule(),
// TLSCertificateCheckerModule.class,
// EmitterModule.class,
HttpClientModule.global(),
HttpClientModule.escalatedGlobal(),
new HttpClientModule("druid.broker.http", Client.class, true),
new HttpClientModule("druid.broker.http", EscalatedClient.class, true),
new CuratorModule(),
new AnnouncerModule(),
// new MetricsModule(),
new SegmentWriteOutMediumModule(),
new ServerModule(),
new StorageNodeModule(),
new JettyServerModule(),
new ExpressionModule(),
new NestedDataModule(),
new DiscoveryModule(),
new ServerViewModule(),
new MetadataConfigModule(),
new DerbyMetadataStorageDruidModule(),
new JacksonConfigManagerModule(),
new CoordinatorDiscoveryModule(),
new LocalDataStorageDruidModule(),
new TombstoneDataStorageModule(),
new FirehoseModule(),
new JavaScriptModule(),
new AuthenticatorModule(),
new AuthenticatorMapperModule(),
new EscalatorModule(),
new AuthorizerModule(),
new AuthorizerMapperModule(),
new StartupLoggingModule(),
new ExternalStorageAccessSecurityModule(),
new ServiceClientModule(),
new StorageConnectorModule()
);
}
// builder.addModule(new StorageNodeModule()); // builder.addModule(new StorageNodeModule());
@ -644,6 +606,48 @@ public class Launcher
} }
); );
if(true) {
builder.addModules(
new Log4jShutterDownerModule(),
new LifecycleModule(),
// ExtensionsModule.SecondaryModule.class,
new DruidAuthModule(),
// TLSCertificateCheckerModule.class,
// EmitterModule.class,
HttpClientModule.global(),
HttpClientModule.escalatedGlobal(),
new HttpClientModule("druid.broker.http", Client.class, true),
new HttpClientModule("druid.broker.http", EscalatedClient.class, true),
new CuratorModule(),
new AnnouncerModule(),
// new MetricsModule(),
new SegmentWriteOutMediumModule(),
new ServerModule(),
new StorageNodeModule(),
new JettyServerModule(),
new ExpressionModule(),
new NestedDataModule(),
new DiscoveryModule(),
new ServerViewModule(),
new MetadataConfigModule(),
new DerbyMetadataStorageDruidModule(),
new JacksonConfigManagerModule(),
new CoordinatorDiscoveryModule(),
new LocalDataStorageDruidModule(),
new TombstoneDataStorageModule(),
new FirehoseModule(),
new JavaScriptModule(),
new AuthenticatorModule(),
// new AuthenticatorMapperModule(),
// new EscalatorModule(),
new AuthorizerModule(),
// new AuthorizerMapperModule(),
new StartupLoggingModule(),
new ExternalStorageAccessSecurityModule(),
new ServiceClientModule(),
new StorageConnectorModule()
);
}
} }
@Override @Override

14
sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java
View File

@ -184,6 +184,10 @@ public class SqlTestFramework
default void close() throws IOException default void close() throws IOException
{ {
} }
default void configureGuice(CoreInjectorBuilder injectorBuilder, List<Module> overrideModules) {
configureGuice(injectorBuilder);
}
} }
public interface PlannerComponentSupplier public interface PlannerComponentSupplier
@ -646,13 +650,15 @@ return componentSupplier.getPlannerComponentSupplier().createViewManager();
.addModule(new LookylooModule()) .addModule(new LookylooModule())
.addModule(new SegmentWranglerModule()) .addModule(new SegmentWranglerModule())
.addModule(new SqlAggregationModule()) .addModule(new SqlAggregationModule())
.addModule(new ExpressionModule()) .addModule(new ExpressionModule());
.addModule(testSetupModule()); // .addModule(testSetupModule());
builder.componentSupplier.configureGuice(injectorBuilder); List<Module> overrideModules = new ArrayList<>(builder.overrideModules);
overrideModules.add(testSetupModule());
builder.componentSupplier.configureGuice(injectorBuilder, overrideModules);
ServiceInjectorBuilder serviceInjector = new ServiceInjectorBuilder(injectorBuilder); ServiceInjectorBuilder serviceInjector = new ServiceInjectorBuilder(injectorBuilder);
serviceInjector.addAll(builder.overrideModules); serviceInjector.addAll(overrideModules);
this.injector = serviceInjector.build(); this.injector = serviceInjector.build();
this.engine = builder.componentSupplier.createEngine(queryLifecycleFactory(), queryJsonMapper(), injector); this.engine = builder.componentSupplier.createEngine(queryLifecycleFactory(), queryJsonMapper(), injector);