Split "other" operations from "write" in QueryType by CRZbulabula · Pull Request #17485 · apache/iotdb

CRZbulabula · 2026-04-15T05:39:02Z

To better distinguish the user requests.

Copilot

Pull request overview

Introduces a new QueryType.OTHER to distinguish non-read, non-insert “operations” (e.g., DDL/admin/config) from actual data WRITE, and updates analyzers/executors/tests to use this classification for better request categorization.

Changes:

Add QueryType.OTHER and reclassify many statements/context setters from WRITE to OTHER.
Update “is query?” checks to treat only READ / READ_WRITE as queries (and route everything else as non-query).
Adjust fragment dispatch to handle OTHER similarly to WRITE, plus update impacted tests.

Reviewed changes

Copilot reviewed 75 out of 75 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/statement/sys/pipe/PipeStatementTest.java	Update pipe statement tests to expect `QueryType.OTHER`.
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/ConfigExecutionTest.java	Update test context to use `QueryType.OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/quota/SetThrottleQuotaStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/quota/SetSpaceQuotaStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/StopRepairDataStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/StartRepairDataStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSystemStatusStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetConfigurationStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/MergeStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/LoadConfigurationStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/KillQueryStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/FlushStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/ClearCacheStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/AuthorStatement.java	Reclassify author operations from `WRITE` to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/RenameLogicalViewStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/DeleteLogicalViewStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/UnsetSchemaTemplateStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/SetSchemaTemplateStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/DropSchemaTemplateStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/DeactivateTemplateStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/CreateSchemaTemplateStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/AlterSchemaTemplateStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/DropTopicStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/DropSubscriptionStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/CreateTopicStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/RemoveRegionStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/ReconstructRegionStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/MigrateRegionStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/ExtendRegionStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/StopPipeStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/StartPipeStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/DropPipeStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/DropPipePluginStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/CreatePipeStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/CreatePipePluginStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/AlterPipeStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/UnloadModelStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/LoadModelStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/DropModelStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/CreateTrainingStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/CreateModelStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/StopExternalServiceStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/StartExternalServiceStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/DropExternalServiceStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/CreateExternalServiceStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/SetTTLStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveDataNodeStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveConfigNodeStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveAINodeStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropTriggerStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropFunctionStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropContinuousQueryStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DeleteTimeSeriesStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DeleteDatabaseStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DatabaseSchemaStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateTriggerStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateFunctionStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateContinuousQueryStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/AlterTimeSeriesDataTypeStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/AlterEncodingCompressorStatement.java	Reclassify statement query type to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java	Route `OTHER` through write dispatch/execution paths; refine query detection.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java	Refine query detection logic for scheduling/state tracking.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java	Reclassify relational author ops to `OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java	Set `QueryType.OTHER` for selected relational statements.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/AuthorizerTask.java	Update permission-path branching for new query type semantics.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/RelationalAuthorizerTask.java	Update permission-path branching for new query type semantics.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java	Set context query type to `OTHER` for many config tasks.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigExecution.java	Delegate `isQuery()` to `MPPQueryContext.isQuery()`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java	Use `context.isQuery()` to distinguish query vs non-query failure behavior and `isQuery()` API.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/QueryType.java	Add `QueryType.OTHER`.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java	Set query type to `OTHER` for many analyzed statements.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java	Set query type to `OTHER` for relational delete analysis.
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java	Refine `isQuery()` to treat only `READ`/`READ_WRITE` as queries.

Comments suppressed due to low confidence (1)

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/QueryType.java:28

QueryType is serialized/deserialized by ordinal (e.g., FragmentInstance.serializeToByteBuffer() writes type.ordinal() and deserializeFrom() uses QueryType.values()[...]). Adding OTHER at the beginning shifts existing ordinals and will break cross-version compatibility and any persisted/transported fragment instances. To keep compatibility, append OTHER at the end (so existing ordinals stay stable) or switch serialization to an explicit/stable id (e.g., write/read name() or a fixed int code).

public enum QueryType {
  OTHER,
  WRITE,
  READ,
  // Currently READ_WRITE is only used by insert into query, which means it behaves as a READ query
  // type. However, the protocol layer regards it as WRITE operation when it returns.
  READ_WRITE,

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

.../datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java

  private boolean isQuery() {
-    return queryType != QueryType.WRITE;
+    return queryType == QueryType.READ || queryType == QueryType.READ_WRITE;
  }


sonarqubecloud · 2026-04-15T06:08:06Z

Quality Gate passed

Issues
9 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
4.1% Duplication on New Code

See analysis details on SonarQube Cloud

codecov · 2026-04-15T07:04:38Z

Codecov Report

❌ Patch coverage is 8.39161% with 131 lines in your changes missing coverage. Please review.
✅ Project coverage is 39.84%. Comparing base (da250b8) to head (8aa37d3).
⚠️ Report is 3 commits behind head on master.

Files with missing lines	Patch %	Lines
.../plan/execution/config/TableConfigTaskVisitor.java	3.84%	50 Missing ⚠️
...db/db/queryengine/plan/analyze/AnalyzeVisitor.java	28.57%	10 Missing ⚠️
.../db/queryengine/plan/execution/QueryExecution.java	0.00%	3 Missing ⚠️
.../metadata/relational/RelationalAuthorizerTask.java	0.00%	2 Missing ⚠️
...gine/plan/execution/config/sys/AuthorizerTask.java	0.00%	2 Missing ⚠️
...ne/plan/relational/analyzer/StatementAnalyzer.java	0.00%	2 Missing ⚠️
...b/queryengine/plan/scheduler/ClusterScheduler.java	0.00%	2 Missing ⚠️
...otdb/db/queryengine/plan/analyze/AnalyzeUtils.java	0.00%	1 Missing ⚠️
...yengine/plan/execution/config/ConfigExecution.java	0.00%	1 Missing ⚠️
.../relational/sql/ast/RelationalAuthorStatement.java	0.00%	1 Missing ⚠️
... and 57 more

Additional details and impacted files

@@             Coverage Diff              @@
##             master   #17485      +/-   ##
============================================
- Coverage     39.85%   39.84%   -0.01%     
  Complexity      312      312              
============================================
  Files          5135     5135              
  Lines        346929   346932       +3     
  Branches      44210    44212       +2     
============================================
- Hits         138259   138251       -8     
- Misses       208670   208681      +11

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

seems finish

7fae562

CRZbulabula requested a review from Copilot April 15, 2026 05:39

Copilot started reviewing on behalf of CRZbulabula April 15, 2026 05:39 View session

Copilot AI reviewed Apr 15, 2026

View reviewed changes

.../datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java

Comment on lines 177 to 179

private boolean isQuery() {

return queryType != QueryType.WRITE;

return queryType == QueryType.READ || queryType == QueryType.READ_WRITE;

}

CRZbulabula added 2 commits April 15, 2026 13:47

spotless

45d9680

bug fix

8aa37d3

JackieTien97 approved these changes Apr 15, 2026

View reviewed changes

CRZbulabula merged commit 2d20fc8 into master Apr 15, 2026
28 of 30 checks passed

CRZbulabula deleted the split-query-type branch April 15, 2026 07:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split "other" operations from "write" in QueryType#17485

Split "other" operations from "write" in QueryType#17485
CRZbulabula merged 3 commits intomasterfrom
split-query-type

CRZbulabula commented Apr 15, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

sonarqubecloud bot commented Apr 15, 2026

Uh oh!

codecov bot commented Apr 15, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

CRZbulabula commented Apr 15, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

sonarqubecloud bot commented Apr 15, 2026

Quality Gate passed

Uh oh!

codecov bot commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Apr 15, 2026 •

edited

Loading