This is an automated email from the ASF dual-hosted git repository.
FrankChen021 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 77e9c222f56 minor: cleanup use of some deprecated and marked for
removal context keys (#20668)
77e9c222f56 is described below
commit 77e9c222f564fc5e26cb0b9857da3a477628374f
Author: Lucas Capistrant <[email protected]>
AuthorDate: Thu Oct 22 21:19:32 2026 -0500
minor: cleanup use of some deprecated and marked for removal context keys
(#20668)
---
.../msq/indexing/IndexerControllerContext.java | 26 ++++++++++------------
.../msq/indexing/IndexerControllerContextTest.java | 25 ++++++++++-----------
2 files changed, 24 insertions(+), 27 deletions(-)
diff --git
a/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerControllerContext.java
b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerControllerContext.java
index b540a7e0353..104ab432273 100644
---
a/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerControllerContext.java
+++
b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerControllerContext.java
@@ -50,13 +50,11 @@ import
org.apache.druid.msq.indexing.client.ControllerChatHandler;
import org.apache.druid.msq.indexing.client.IndexerWorkerClient;
import org.apache.druid.msq.indexing.destination.MSQDestination;
import org.apache.druid.msq.indexing.error.MSQException;
-import org.apache.druid.msq.indexing.error.MSQWarnings;
import org.apache.druid.msq.indexing.error.UnknownFault;
import org.apache.druid.msq.input.InputSpecSlicerProvider;
import org.apache.druid.msq.kernel.WorkOrder;
import org.apache.druid.msq.kernel.controller.ControllerQueryKernelConfig;
import org.apache.druid.msq.util.MultiStageQueryContext;
-import org.apache.druid.query.BaseQuery;
import org.apache.druid.query.DruidMetrics;
import org.apache.druid.query.QueryContext;
import org.apache.druid.query.context.QueryContextParameters;
@@ -91,21 +89,21 @@ public class IndexerControllerContext implements
ControllerContext
* Worker context keys that worker tasks require in their task context.
*/
private static final Set<String> WORKER_TASK_CONTEXT_KEYS = ImmutableSet.of(
- MultiStageQueryContext.CTX_DURABLE_SHUFFLE_STORAGE,
- MSQWarnings.CTX_MAX_PARSE_EXCEPTIONS_ALLOWED,
- MultiStageQueryContext.CTX_IS_REINDEX,
- MultiStageQueryContext.CTX_MAX_CONCURRENT_STAGES,
- MultiStageQueryContext.CTX_ROW_BASED_FRAME_TYPE,
- MultiStageQueryContext.CTX_REMOVE_NULL_BYTES,
- MultiStageQueryContext.CTX_INCLUDE_ALL_COUNTERS,
- MultiStageQueryContext.CTX_MAX_FRAME_SIZE,
- MultiStageQueryContext.CTX_SELECT_DESTINATION,
- MultiStageQueryContext.CTX_LIVE_REPORT_COUNTERS,
- MultiStageQueryContext.CTX_MAX_THREADS,
+ QueryContextParameters.DURABLE_SHUFFLE_STORAGE.getName(),
+ QueryContextParameters.MAX_PARSE_EXCEPTIONS.getName(),
+ QueryContextParameters.IS_REINDEX.getName(),
+ QueryContextParameters.MAX_CONCURRENT_STAGES.getName(),
+ QueryContextParameters.ROW_BASED_FRAME_TYPE.getName(),
+ QueryContextParameters.REMOVE_NULL_BYTES.getName(),
+ QueryContextParameters.INCLUDE_ALL_COUNTERS.getName(),
+ QueryContextParameters.MAX_FRAME_SIZE.getName(),
+ QueryContextParameters.SELECT_DESTINATION.getName(),
+ QueryContextParameters.LIVE_REPORT_COUNTERS.getName(),
+ QueryContextParameters.MAX_THREADS.getName(),
MultiStageQueryContext.CTX_VIRTUAL_STORAGE_PARTIAL_DOWNLOADS,
Tasks.STORE_EMPTY_COLUMNS_KEY,
QueryContextParameters.QUERY_ID.getName(),
- BaseQuery.SQL_QUERY_ID,
+ QueryContextParameters.SQL_QUERY_ID.getName(),
QueryContextParameters.DEBUG.getName()
);
diff --git
a/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/IndexerControllerContextTest.java
b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/IndexerControllerContextTest.java
index ac08070bc49..31cc298e3e1 100644
---
a/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/IndexerControllerContextTest.java
+++
b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/IndexerControllerContextTest.java
@@ -24,11 +24,10 @@ import org.apache.druid.indexing.common.task.Tasks;
import org.apache.druid.java.util.common.Intervals;
import org.apache.druid.msq.indexing.destination.TaskReportMSQDestination;
import org.apache.druid.msq.kernel.controller.ControllerQueryKernelConfig;
-import org.apache.druid.msq.util.MultiStageQueryContext;
-import org.apache.druid.query.BaseQuery;
import org.apache.druid.query.Druids;
import org.apache.druid.query.QueryContext;
import org.apache.druid.query.TableDataSource;
+import org.apache.druid.query.context.QueryContextParameters;
import org.apache.druid.query.scan.ScanQuery;
import org.apache.druid.query.spec.LegacySegmentSpec;
import org.apache.druid.segment.column.ColumnType;
@@ -45,12 +44,12 @@ public class IndexerControllerContextTest
public void testMakeTaskContextCopiesOnlyWorkerStartupKeys()
{
final Map<String, Object> queryContext = ImmutableMap.of(
- BaseQuery.QUERY_ID, "query-id",
- BaseQuery.SQL_QUERY_ID, "sql-query-id",
- MultiStageQueryContext.CTX_MAX_THREADS, 2,
+ QueryContextParameters.QUERY_ID.getName(), "query-id",
+ QueryContextParameters.SQL_QUERY_ID.getName(), "sql-query-id",
+ QueryContextParameters.MAX_THREADS.getName(), 2,
Tasks.STORE_EMPTY_COLUMNS_KEY, false,
- MultiStageQueryContext.CTX_FINALIZE_AGGREGATIONS, false,
- MultiStageQueryContext.CTX_ARRAY_INGEST_MODE, "array"
+ QueryContextParameters.FINALIZE_AGGREGATIONS.getName(), false,
+ QueryContextParameters.ARRAY_INGEST_MODE.getName(), "array"
);
final LegacyMSQSpec querySpec =
@@ -79,17 +78,17 @@ public class IndexerControllerContextTest
IndexerControllerContext.makeTaskContext(querySpec, queryKernelConfig,
ImmutableMap.of());
// Keys that workers read from the task context at startup.
- Assertions.assertEquals("query-id", taskContext.get(BaseQuery.QUERY_ID));
- Assertions.assertEquals("sql-query-id",
taskContext.get(BaseQuery.SQL_QUERY_ID));
- Assertions.assertEquals(2,
taskContext.get(MultiStageQueryContext.CTX_MAX_THREADS));
+ Assertions.assertEquals("query-id",
taskContext.get(QueryContextParameters.QUERY_ID.getName()));
+ Assertions.assertEquals("sql-query-id",
taskContext.get(QueryContextParameters.SQL_QUERY_ID.getName()));
+ Assertions.assertEquals(2,
taskContext.get(QueryContextParameters.MAX_THREADS.getName()));
Assertions.assertEquals(false,
taskContext.get(Tasks.STORE_EMPTY_COLUMNS_KEY));
Assertions.assertEquals(
TaskReportMSQDestination.instance().toSelectDestination().getName(),
- taskContext.get(MultiStageQueryContext.CTX_SELECT_DESTINATION)
+ taskContext.get(QueryContextParameters.SELECT_DESTINATION.getName())
);
// Other query context keys reach workers through the work order, not the
task context.
-
Assertions.assertFalse(taskContext.containsKey(MultiStageQueryContext.CTX_FINALIZE_AGGREGATIONS));
-
Assertions.assertFalse(taskContext.containsKey(MultiStageQueryContext.CTX_ARRAY_INGEST_MODE));
+
Assertions.assertFalse(taskContext.containsKey(QueryContextParameters.FINALIZE_AGGREGATIONS.getName()));
+
Assertions.assertFalse(taskContext.containsKey(QueryContextParameters.ARRAY_INGEST_MODE.getName()));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
