Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use standard ways to load query types in tests #17572

Merged
merged 79 commits into from
Jan 6, 2025
Merged

Use standard ways to load query types in tests #17572

merged 79 commits into from
Jan 6, 2025

Conversation

kgyrtkirk
Copy link
Member

@kgyrtkirk kgyrtkirk commented Dec 16, 2024 •
edited
Loading

  • biggest change is to use QueryRunnerFactoryModule instead of more complicated ways
  • in the future these things should mostly load normal druid modules as "core" modules ; and test related overrides as overrides

github-advanced-security[bot]
github-advanced-security bot found potential problems Dec 19, 2024
View reviewed changes
...st/java/org/apache/druid/compressedbigdecimal/CompressedBigDecimalSqlAggregatorTestBase.java Fixed Show fixed Hide fixed
...ava/org/apache/druid/query/aggregation/tdigestsketch/sql/TDigestSketchSqlAggregatorTest.java Fixed Show fixed Hide fixed
...java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java Fixed Show fixed Hide fixed
...pache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java Fixed Show fixed Hide fixed
.../org/apache/druid/query/aggregation/datasketches/theta/sql/ThetaSketchSqlAggregatorTest.java Fixed Show fixed Hide fixed
...ns-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteMSQTestsHelper.java

@Deprecated
public static List<Module> fetchModules(
Function<String, File> tempFolderProducer,

Check notice

Code scanning / CodeQL

Useless parameter Note test

The parameter 'tempFolderProducer' is never used.
...ns-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteMSQTestsHelper.java
@Deprecated
public static List<Module> fetchModules(
Function<String, File> tempFolderProducer,
TestGroupByBuffers groupByBuffers

Check notice

Code scanning / CodeQL

Useless parameter Note test

The parameter 'groupByBuffers' is never used.
...src/test/java/org/apache/druid/query/aggregation/variance/sql/VarianceSqlAggregatorTest.java Fixed Show fixed Hide fixed
extensions-core/testing-tools/src/test/java/org/apache/druid/query/sql/SleepSqlTest.java Fixed Show fixed Hide fixed
sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java
* Deprecated; see: {@link QueryComponentSupplier#configureGuice(DruidInjectorBuilder, List)}
*/
@Deprecated
protected void configureGuice(DruidInjectorBuilder builder)

Check notice

Code scanning / CodeQL

Useless parameter Note test

The parameter 'builder' is never used.
github-advanced-security[bot]
github-advanced-security bot found potential problems Dec 19, 2024
View reviewed changes
...st/java/org/apache/druid/compressedbigdecimal/CompressedBigDecimalSqlAggregatorTestBase.java
@@ -79,11 +77,9 @@
private static final List<InputRow> ROWS1 =
TestDataBuilder.RAW_ROWS1.stream().map(m -> TestDataBuilder.createRow(m, SCHEMA)).collect(Collectors.toList());

@Override
public void configureGuice(DruidInjectorBuilder builder)
public DruidModule getCoreModule()

Check notice

Code scanning / CodeQL

Missing Override annotation

This method overrides [StandardComponentSupplier.getCoreModule](1); it is advisable to add an Override annotation.
...ava/org/apache/druid/query/aggregation/tdigestsketch/sql/TDigestSketchSqlAggregatorTest.java
@@ -70,11 +71,9 @@
super(tempFolderProducer);
}

@Override
public void configureGuice(DruidInjectorBuilder builder)
public DruidModule getCoreModule()

Check notice

Code scanning / CodeQL

Missing Override annotation

This method overrides [StandardComponentSupplier.getCoreModule](1); it is advisable to add an Override annotation.
...java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java
@@ -259,11 +260,9 @@
properties.put(SqlModule.PROPERTY_SQL_APPROX_COUNT_DISTINCT_CHOICE, HllSketchApproxCountDistinctSqlAggregator.NAME);
}

@Override
public void configureGuice(DruidInjectorBuilder builder)
public DruidModule getCoreModule()

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking
CalciteTestBase.makeExpression
Loading
should be avoided because it has been deprecated.
...pache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java
@@ -90,11 +91,9 @@
super(tempFolderProducer);
}

@Override
public void configureGuice(DruidInjectorBuilder builder)
public DruidModule getCoreModule()

Check notice

Code scanning / CodeQL

Exposing internal representation Note

getUsedSegmentsTimelinesPerDataSource exposes the internal representation stored in field usedSegmentsTimelinesPerDataSource. The value may be modified
after this call to getUsedSegmentsTimelinesPerDataSource
Loading
.
.../org/apache/druid/query/aggregation/datasketches/theta/sql/ThetaSketchSqlAggregatorTest.java
@@ -113,11 +114,9 @@
);
}

@Override
public void configureGuice(DruidInjectorBuilder builder)
public DruidModule getCoreModule()

Check notice

Code scanning / CodeQL

Missing Override annotation

This method overrides [StandardComponentSupplier.getCoreModule](1); it is advisable to add an Override annotation.
...ns-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteMSQTestsHelper.java

@Deprecated
public static List<Module> fetchModules(
Function<String, File> tempFolderProducer,

Check notice

Code scanning / CodeQL

Useless parameter

The parameter 'tempFolderProducer' is never used.
...ns-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteMSQTestsHelper.java
@Deprecated
public static List<Module> fetchModules(
Function<String, File> tempFolderProducer,
TestGroupByBuffers groupByBuffers

Check notice

Code scanning / CodeQL

Useless parameter

The parameter 'groupByBuffers' is never used.
...src/test/java/org/apache/druid/query/aggregation/variance/sql/VarianceSqlAggregatorTest.java
@@ -85,11 +86,9 @@
super(tempFolderProducer);
}

@Override
public void configureGuice(DruidInjectorBuilder builder)
public DruidModule getCoreModule()

Check notice

Code scanning / CodeQL

Missing Override annotation

This method overrides [StandardComponentSupplier.getCoreModule](1); it is advisable to add an Override annotation.
extensions-core/testing-tools/src/test/java/org/apache/druid/query/sql/SleepSqlTest.java
@@ -46,13 +47,11 @@
super(tempFolderProducer);
}

@Override
public void configureGuice(DruidInjectorBuilder builder)
public DruidModule getCoreModule()

Check notice

Code scanning / CodeQL

Missing Override annotation

This method overrides [StandardComponentSupplier.getCoreModule](1); it is advisable to add an Override annotation.
sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java
* Deprecated; see: {@link QueryComponentSupplier#configureGuice(DruidInjectorBuilder, List)}
*/
@Deprecated
protected void configureGuice(DruidInjectorBuilder builder)

Check notice

Code scanning / CodeQL

Useless parameter

The parameter 'builder' is never used.
github-advanced-security[bot]
github-advanced-security bot found potential problems Dec 19, 2024
View reviewed changes
sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java
LookupSchema lookupSchema, DruidOperatorTable createOperatorTable)
{
final DruidSchemaCatalog rootSchema = QueryFrameworkUtils.createMockRootSchema(
plannerConfig,

Check notice

Code scanning / CodeQL

Deprecated method or constructor invocation Note test

Invoking
QueryComponentSupplier.configureJsonMapper
Loading
should be avoided because it has been deprecated.
@kgyrtkirk kgyrtkirk merged commit 06f186f into apache:master Jan 6, 2025
77 checks passed
@adarshsanjeev adarshsanjeev added this to the 32.0.0 milestone Jan 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@imply-cheddar imply-cheddar imply-cheddar left review comments

@cryptoe cryptoe cryptoe approved these changes

Assignees
No one assigned
Labels
Area - Batch Ingestion Area - Dependencies Area - Ingestion Area - Lookups Area - MSQ For multi stage queries - https://github.com/apache/druid/issues/12262 Area - Querying Area - Segment Format and Ser/De Kubernetes
Projects
None yet
Milestone
32.0.0
Development

Successfully merging this pull request may close these issues.
4 participants
@kgyrtkirk @cryptoe @imply-cheddar @adarshsanjeev