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

clkeaup

This commit is contained in:
Zoltan Haindrich 2024-05-28 15:27:18 +00:00
parent a713b663b0
commit ff31c14dba
4 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration-tests/src/main/resources/log4j2.xml
View File

@ -25,7 +25,7 @@
</Console> </Console>
</Appenders> </Appenders>
<Loggers> <Loggers>
<Root level="debug"> <Root level="info">
<AppenderRef ref="Console"/> <AppenderRef ref="Console"/>
</Root> </Root>
<Logger name="org.apache.druid.segment.metadata" level="debug" additivity="false"> <Logger name="org.apache.druid.segment.metadata" level="debug" additivity="false">

2
processing/src/main/java/org/apache/druid/guice/BaseInjectorBuilder.java
View File

@ -33,7 +33,7 @@ import java.util.List;
*/ */
public class BaseInjectorBuilder<T extends BaseInjectorBuilder<?>> public class BaseInjectorBuilder<T extends BaseInjectorBuilder<?>>
{ {
protected final List<Module> modules = new ArrayList<>(); private final List<Module> modules = new ArrayList<>();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public T add(Module... modules) public T add(Module... modules)

17
sql/src/test/java/org/apache/druid/sql/calcite/SqlTestFrameworkConfig.java
View File

@ -341,20 +341,10 @@ public class SqlTestFrameworkConfig
public static class ConfigurationInstance public static class ConfigurationInstance
{ {
public SqlTestFramework framework; public SqlTestFramework framework;
private SqlTestFrameworkConfig config;
private QueryComponentSupplier testHost;
ConfigurationInstance(SqlTestFrameworkConfig config, QueryComponentSupplier testHost) ConfigurationInstance(SqlTestFrameworkConfig config, QueryComponentSupplier testHost)
{ {
this.config = config; Module[] modules = {};
this.testHost = testHost;
SqlTestFramework framework1 = extracted();
framework=framework1;
}
//FIXME remove
public SqlTestFramework extracted(Module ...modules)
{
SqlTestFramework.Builder builder = new SqlTestFramework.Builder(testHost) SqlTestFramework.Builder builder = new SqlTestFramework.Builder(testHost)
.withConfig(config) .withConfig(config)
.catalogResolver(testHost.createCatalogResolver()) .catalogResolver(testHost.createCatalogResolver())
@ -365,8 +355,7 @@ public class SqlTestFrameworkConfig
builder.withOverrideModule(m); builder.withOverrideModule(m);
} }
SqlTestFramework framework1 = builder.build(); framework = builder.build();
return framework1;
} }
public ConfigurationInstance( public ConfigurationInstance(
@ -435,7 +424,7 @@ public class SqlTestFrameworkConfig
catch (URISyntaxException e) { catch (URISyntaxException e) {
throw new SQLException("Can't decode URI", e); throw new SQLException("Can't decode URI", e);
} }
return new SqlTestFrameworkConfig(queryParams); return new SqlTestFrameworkConfig(queryParams);
} }

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

@ -654,12 +654,6 @@ return componentSupplier.getPlannerComponentSupplier().createViewManager();
// test pulls in a module, then pull in that module, even though we are // test pulls in a module, then pull in that module, even though we are
// not the Druid node to which the module is scoped. // not the Druid node to which the module is scoped.
.ignoreLoadScopes() .ignoreLoadScopes()
// .addModule(new LookylooModule())
// .addModule(new SegmentWranglerModule())
// .addModule(new SqlAggregationModule())
// .addModule(new SqlModule())
// .addModule(new ExpressionModule());
// .addModule(testSetupModule());
; ;
List<Module> overrideModules = new ArrayList<>(builder.overrideModules); List<Module> overrideModules = new ArrayList<>(builder.overrideModules);