github-advanced-security[bot] commented on code in PR #17572:
URL: https://github.com/apache/druid/pull/17572#discussion_r1892658179
##########
sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java:
##########
@@ -823,61 +874,116 @@
@Provides
@LazySingleton
- ViewManager createViewManager()
+ ViewManager createViewManager(Builder builder)
+ {
+ return
builder.componentSupplier.getPlannerComponentSupplier().createViewManager();
+ }
+
+ @Provides
+ SqlTestFrameworkConfig getTestConfig(Builder builder)
+ {
+ return builder.config;
+ }
+
+ @Provides
+ @Named("quidem")
+ public URI getDruidTestURI(SqlTestFrameworkConfig config)
+ {
+ return config.getDruidTestURI();
+ }
+
+ @Provides
+ @Named("isExplainSupported")
+ public Boolean isExplainSupported(Builder builder)
{
- return
componentSupplier.getPlannerComponentSupplier().createViewManager();
+ return builder.componentSupplier.isExplainSupported();
}
+ @Provides
+ public QueryWatcher getQueryWatcher()
+ {
+ return QueryRunnerTestHelper.NOOP_QUERYWATCHER;
+ }
+ }
+
+ public static class TestSchemaSetupModule implements DruidModule
+ {
+
@Provides
@LazySingleton
- public DruidSchemaCatalog makeCatalog(
+ private DruidSchema makeDruidSchema(
final Injector injector,
- final PlannerConfig plannerConfig,
- final AuthConfig authConfig,
- final ViewManager viewManager,
QueryRunnerFactoryConglomerate conglomerate,
- QuerySegmentWalker walker
- )
+ QuerySegmentWalker walker,
+ Builder builder)
{
- final DruidSchemaCatalog rootSchema =
QueryFrameworkUtils.createMockRootSchema(
+ return QueryFrameworkUtils.createMockSchema(
injector,
conglomerate,
(SpecificSegmentsQuerySegmentWalker) walker,
- plannerConfig,
- viewManager,
-
componentSupplier.getPlannerComponentSupplier().createSchemaManager(),
- authorizerMapper,
+
builder.componentSupplier.getPlannerComponentSupplier().createSchemaManager(),
builder.catalogResolver
);
- return rootSchema;
}
@Provides
- SqlTestFrameworkConfig getTestConfig()
+ @LazySingleton
+ private SystemSchema makeSystemSchema(QuerySegmentWalker walker,
AuthorizerMapper authorizerMapper,
+ DruidSchema druidSchema)
{
- return builder.config;
+ return CalciteTests
+ .createMockSystemSchema(druidSchema,
(SpecificSegmentsQuerySegmentWalker) walker, authorizerMapper);
}
@Provides
- @Named("quidem")
- public URI getDruidTestURI()
+ @LazySingleton
+ private LookupSchema makeLookupSchema(final Injector injector)
{
- return getTestConfig().getDruidTestURI();
+ return QueryFrameworkUtils.createMockLookupSchema(injector);
}
@Provides
- @Named("isExplainSupported")
- public Boolean isExplainSupported()
+ @LazySingleton
+ private DruidSchemaCatalog makeCatalog(final PlannerConfig plannerConfig,
final ViewManager viewManager,
+ AuthorizerMapper authorizerMapper, DruidSchema druidSchema,
SystemSchema systemSchema,
+ LookupSchema lookupSchema, DruidOperatorTable createOperatorTable)
+ {
+ final DruidSchemaCatalog rootSchema =
QueryFrameworkUtils.createMockRootSchema(
+ plannerConfig,
Review Comment:
## Deprecated method or constructor invocation
Invoking [QueryComponentSupplier.configureJsonMapper](1) should be avoided
because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8595)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
