diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java index 88bd1998f683c..a507b98008bbd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java @@ -500,7 +500,7 @@ public boolean isUserQuery() { } public boolean isQuery() { - return queryType != QueryType.WRITE; + return queryType == QueryType.READ || queryType == QueryType.READ_WRITE; } public void setUserQuery(boolean userQuery) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java index 2e0b0b52fdc09..4c30067a9b5e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java @@ -311,7 +311,7 @@ public static void analyzeDataPartition( } public static void analyzeDelete(final Delete node, final MPPQueryContext queryContext) { - queryContext.setQueryType(QueryType.WRITE); + queryContext.setQueryType(QueryType.OTHER); validateSchema(node, queryContext); try (final ConfigNodeClient configNodeClient = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java index dacdc69ba4596..e38267ab22356 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java @@ -2492,7 +2492,7 @@ private boolean checkSorted(long[] times) { @Override public Analysis visitCreateTimeseries( CreateTimeSeriesStatement createTimeSeriesStatement, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); if (createTimeSeriesStatement.getPath().getNodeLength() < 3) { throw new SemanticException( new IllegalPathException(createTimeSeriesStatement.getPath().getFullPath())); @@ -2594,7 +2594,7 @@ private void analyzeSchemaProps(final List> propsList) { @Override public Analysis visitCreateAlignedTimeseries( CreateAlignedTimeSeriesStatement createAlignedTimeSeriesStatement, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); if (createAlignedTimeSeriesStatement.getDevicePath().getNodeLength() < 2) { throw new SemanticException( new IllegalPathException(createAlignedTimeSeriesStatement.getDevicePath().getFullPath())); @@ -2632,7 +2632,7 @@ public Analysis visitCreateAlignedTimeseries( public Analysis visitInternalCreateTimeseries( InternalCreateTimeSeriesStatement internalCreateTimeSeriesStatement, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); Analysis analysis = new Analysis(); analysis.setRealStatement(internalCreateTimeSeriesStatement); @@ -2660,7 +2660,7 @@ public Analysis visitInternalCreateTimeseries( public Analysis visitInternalCreateMultiTimeSeries( final InternalCreateMultiTimeSeriesStatement internalCreateMultiTimeSeriesStatement, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final Analysis analysis = new Analysis(); analysis.setRealStatement(internalCreateMultiTimeSeriesStatement); @@ -2685,7 +2685,7 @@ public Analysis visitInternalCreateMultiTimeSeries( public Analysis visitCreateMultiTimeSeries( final CreateMultiTimeSeriesStatement createMultiTimeSeriesStatement, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final Analysis analysis = new Analysis(); analysis.setRealStatement(createMultiTimeSeriesStatement); @@ -2713,7 +2713,7 @@ public Analysis visitCreateMultiTimeSeries( @Override public Analysis visitAlterTimeSeries( AlterTimeSeriesStatement alterTimeSeriesStatement, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); Analysis analysis = new Analysis(); analysis.setRealStatement(alterTimeSeriesStatement); @@ -2900,7 +2900,7 @@ public Analysis visitPipeEnrichedStatement( @Override public Analysis visitLoadFile(LoadTsFileStatement loadTsFileStatement, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); try (final LoadTsFileAnalyzer loadTsFileAnalyzer = new LoadTsFileAnalyzer( @@ -3391,7 +3391,7 @@ private Analysis visitSchemaNodeManagementPartition( @Override public Analysis visitDeleteData( DeleteDataStatement deleteDataStatement, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); Analysis analysis = new Analysis(); analysis.setRealStatement(deleteDataStatement); @@ -3471,7 +3471,7 @@ public Analysis visitDeleteData( public Analysis visitCreateSchemaTemplate( CreateSchemaTemplateStatement createTemplateStatement, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); List measurements = createTemplateStatement.getMeasurements(); Set measurementsSet = new HashSet<>(measurements); if (measurementsSet.size() < measurements.size()) { @@ -3486,7 +3486,7 @@ public Analysis visitCreateSchemaTemplate( @Override public Analysis visitSetSchemaTemplate( SetSchemaTemplateStatement setSchemaTemplateStatement, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); Analysis analysis = new Analysis(); analysis.setRealStatement(setSchemaTemplateStatement); return analysis; @@ -3495,7 +3495,7 @@ public Analysis visitSetSchemaTemplate( @Override public Analysis visitActivateTemplate( ActivateTemplateStatement activateTemplateStatement, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); Analysis analysis = new Analysis(); analysis.setRealStatement(activateTemplateStatement); @@ -3525,7 +3525,7 @@ public Analysis visitActivateTemplate( @Override public Analysis visitBatchActivateTemplate( BatchActivateTemplateStatement batchActivateTemplateStatement, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); Analysis analysis = new Analysis(); analysis.setRealStatement(batchActivateTemplateStatement); @@ -3561,7 +3561,7 @@ public Analysis visitBatchActivateTemplate( public Analysis visitInternalBatchActivateTemplate( InternalBatchActivateTemplateStatement internalBatchActivateTemplateStatement, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); Analysis analysis = new Analysis(); analysis.setRealStatement(internalBatchActivateTemplateStatement); @@ -3751,7 +3751,7 @@ private boolean analyzeWhereForShowStatements( public Analysis visitCreateLogicalView( CreateLogicalViewStatement createLogicalViewStatement, MPPQueryContext context) { Analysis analysis = new Analysis(); - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); analysis.setRealStatement(createLogicalViewStatement); if (createLogicalViewStatement.getViewExpressions() == null) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/QueryType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/QueryType.java index 59221e2f1cdaf..b2cac89074682 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/QueryType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/QueryType.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze; public enum QueryType { + OTHER, WRITE, READ, // Currently READ_WRITE is only used by insert into query, which means it behaves as a READ query diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java index 7500fbb9c34db..97070e37357b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java @@ -212,7 +212,7 @@ public void start() { // When some columns in one insert failed, other column will continue executing insertion. // The error message should be return to client, therefore we need to set it after the insertion // of other column finished. - if (context.getQueryType() == QueryType.WRITE && analysis.isFailed()) { + if (!context.isQuery() && analysis.isFailed()) { stateMachine.transitionToFailed(analysis.getFailStatus()); } } @@ -625,7 +625,7 @@ private void initResultHandle() { @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning private ExecutionResult getExecutionResult(QueryState state) { TSStatusCode statusCode; - if (context.getQueryType() == QueryType.WRITE && analysis.isFailed()) { + if (!context.isQuery() && analysis.isFailed()) { // For WRITE, the state should be FINISHED statusCode = state == QueryState.FINISHED @@ -671,7 +671,7 @@ public DistributedQueryPlan getDistributedPlan() { @Override public boolean isQuery() { - return context.getQueryType() != QueryType.WRITE; + return context.isQuery(); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigExecution.java index 75f5ddd25bf78..a3fde74fa4194 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigExecution.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigExecution.java @@ -306,7 +306,7 @@ public DatasetHeader getDatasetHeader() { @Override public boolean isQuery() { - return context.getQueryType() != QueryType.WRITE; + return context.isQuery(); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java index 320c904ac20ee..0bb2efa9fd54e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java @@ -331,7 +331,7 @@ protected IConfigTask visitAlterDB(final AlterDB node, final MPPQueryContext con private IConfigTask visitDatabaseStatement( final DatabaseStatement node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final TDatabaseSchema schema = new TDatabaseSchema(); schema.setIsTableModel(true); @@ -398,7 +398,7 @@ private IConfigTask visitDatabaseStatement( @Override protected IConfigTask visitUse(final Use node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkCanShowOrUseDatabase( context.getSession().getUserName(), node.getDatabaseId().getValue(), context); return new UseDBTask(node, clientSession); @@ -406,7 +406,7 @@ protected IConfigTask visitUse(final Use node, final MPPQueryContext context) { @Override protected IConfigTask visitDropDB(final DropDB node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkCanDropDatabase( context.getSession().getUserName(), node.getDbName().getValue(), context); return new DropDBTask(node, clientSession); @@ -466,7 +466,7 @@ protected IConfigTask visitShowRegions( @Override protected IConfigTask visitRemoveDataNode( final RemoveDataNode removeDataNode, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); // As the implementation is identical, we'll simply translate to the // corresponding tree-model variant and execute that. @@ -478,7 +478,7 @@ protected IConfigTask visitRemoveDataNode( @Override protected IConfigTask visitRemoveConfigNode( final RemoveConfigNode removeConfigNode, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); // As the implementation is identical, we'll simply translate to the // corresponding tree-model variant and execute that. @@ -490,7 +490,7 @@ protected IConfigTask visitRemoveConfigNode( @Override protected IConfigTask visitRemoveAINode( final RemoveAINode removeAINode, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); // As the implementation is identical, we'll simply translate to the // corresponding tree-model variant and execute that. @@ -534,7 +534,7 @@ protected IConfigTask visitShowAINodes( @Override protected IConfigTask visitClearCache( final ClearCache clearCacheStatement, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new ClearCacheTask(clearCacheStatement); } @@ -564,7 +564,7 @@ protected IConfigTask visitCreateView(final CreateView node, final MPPQueryConte private Pair parseTable4CreateTableOrView( final CreateTable node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final Pair databaseTablePair = splitQualifiedName(node.getName()); final String database = databaseTablePair.getLeft(); final String tableName = databaseTablePair.getRight(); @@ -665,7 +665,7 @@ private void validateAndGenerateTimeColumn( @Override protected IConfigTask visitAlterColumnDataType( AlterColumnDataType node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final Pair databaseTablePair = splitQualifiedName(node.getTableName()); final String columnName = node.getColumnName().getValue(); final DataType dataType = node.getDataType(); @@ -688,7 +688,7 @@ protected IConfigTask visitAlterColumnDataType( @Override protected IConfigTask visitRenameTable(final RenameTable node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final Pair databaseTablePair = splitQualifiedName(node.getSource()); final String database = databaseTablePair.getLeft(); final String tableName = databaseTablePair.getRight(); @@ -712,7 +712,7 @@ protected IConfigTask visitRenameTable(final RenameTable node, final MPPQueryCon @Override protected IConfigTask visitAddColumn(final AddColumn node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final Pair databaseTablePair = splitQualifiedName(node.getTableName()); final String database = databaseTablePair.getLeft(); final String tableName = databaseTablePair.getRight(); @@ -745,7 +745,7 @@ protected IConfigTask visitAddColumn(final AddColumn node, final MPPQueryContext @Override protected IConfigTask visitRenameColumn(final RenameColumn node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final Pair databaseTablePair = splitQualifiedName(node.getTable()); final String database = databaseTablePair.getLeft(); final String tableName = databaseTablePair.getRight(); @@ -772,7 +772,7 @@ protected IConfigTask visitRenameColumn(final RenameColumn node, final MPPQueryC @Override protected IConfigTask visitDropColumn(final DropColumn node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final Pair databaseTablePair = splitQualifiedName(node.getTable()); final String database = databaseTablePair.getLeft(); final String tableName = databaseTablePair.getRight(); @@ -793,7 +793,7 @@ protected IConfigTask visitDropColumn(final DropColumn node, final MPPQueryConte @Override protected IConfigTask visitSetProperties( final SetProperties node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final Pair databaseTablePair = splitQualifiedName(node.getName()); final String database = databaseTablePair.getLeft(); final String tableName = databaseTablePair.getRight(); @@ -813,7 +813,7 @@ protected IConfigTask visitSetProperties( @Override protected IConfigTask visitSetTableComment( final SetTableComment node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final Pair databaseTablePair = splitQualifiedName(node.getTableName()); final String database = databaseTablePair.getLeft(); final String tableName = databaseTablePair.getRight(); @@ -833,7 +833,7 @@ protected IConfigTask visitSetTableComment( @Override protected IConfigTask visitSetColumnComment( final SetColumnComment node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final Pair databaseTablePair = splitQualifiedName(node.getTable()); final String database = databaseTablePair.getLeft(); final String tableName = databaseTablePair.getRight(); @@ -919,7 +919,7 @@ private TSDataType getDataType(final DataType dataType) { @Override protected IConfigTask visitDropTable(final DropTable node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final Pair databaseTablePair = splitQualifiedName(node.getTableName()); final String database = databaseTablePair.getLeft(); final String tableName = databaseTablePair.getRight(); @@ -1012,14 +1012,14 @@ protected IConfigTask visitDescribeTable( @Override protected IConfigTask visitFlush(final Flush node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new FlushTask(((FlushStatement) node.getInnerTreeStatement())); } @Override protected IConfigTask visitSetConfiguration(SetConfiguration node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); SetConfigurationStatement setConfigurationStatement = (SetConfigurationStatement) node.getInnerTreeStatement(); try { @@ -1049,28 +1049,28 @@ protected IConfigTask visitShowConfiguration(ShowConfiguration node, MPPQueryCon @Override protected IConfigTask visitStartRepairData(StartRepairData node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new StartRepairDataTask(((StartRepairDataStatement) node.getInnerTreeStatement())); } @Override protected IConfigTask visitStopRepairData(StopRepairData node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new StopRepairDataTask(((StopRepairDataStatement) node.getInnerTreeStatement())); } @Override protected IConfigTask visitLoadConfiguration(LoadConfiguration node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserIsAdmin(context.getSession().getUserEntity()); return new LoadConfigurationTask(((LoadConfigurationStatement) node.getInnerTreeStatement())); } @Override protected IConfigTask visitSetSystemStatus(SetSystemStatus node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new SetSystemStatusTask(((SetSystemStatusStatement) node.getInnerTreeStatement())); } @@ -1121,7 +1121,7 @@ private int parseIntFromLiteral(final Object value, final String name) { @Override protected IConfigTask visitCreatePipe(final CreatePipe node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); final Map sourceAttributes = node.getSourceAttributes(); @@ -1268,7 +1268,7 @@ public static void checkAndEnrichSinkUser( @Override protected IConfigTask visitAlterPipe(final AlterPipe node, final MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); final String userName = context.getSession().getUserName(); accessControl.checkUserGlobalSysPrivilege(context); @@ -1315,21 +1315,21 @@ protected IConfigTask visitAlterPipe(final AlterPipe node, final MPPQueryContext @Override protected IConfigTask visitDropPipe(DropPipe node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new DropPipeTask(node); } @Override protected IConfigTask visitStartPipe(StartPipe node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new StartPipeTask(node); } @Override protected IConfigTask visitStopPipe(StopPipe node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new StopPipeTask(node); } @@ -1342,7 +1342,7 @@ protected IConfigTask visitShowPipes(ShowPipes node, MPPQueryContext context) { @Override protected IConfigTask visitCreatePipePlugin(CreatePipePlugin node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); if (node.getUriString() != null && isUriTrusted(node.getUriString())) { // 1. user specified uri and that uri is trusted @@ -1356,7 +1356,7 @@ protected IConfigTask visitCreatePipePlugin(CreatePipePlugin node, MPPQueryConte @Override protected IConfigTask visitDropPipePlugin(DropPipePlugin node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new DropPipePluginTask(node); } @@ -1370,7 +1370,7 @@ protected IConfigTask visitShowPipePlugins(ShowPipePlugins node, MPPQueryContext @Override protected IConfigTask visitCreateTopic(CreateTopic node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); // Inject table model into the topic attributes @@ -1382,7 +1382,7 @@ protected IConfigTask visitCreateTopic(CreateTopic node, MPPQueryContext context @Override protected IConfigTask visitDropTopic(DropTopic node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new DropTopicTask(node); } @@ -1403,7 +1403,7 @@ protected IConfigTask visitShowSubscriptions(ShowSubscriptions node, MPPQueryCon @Override protected IConfigTask visitDropSubscription(DropSubscription node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new DropSubscriptionTask(node); } @@ -1423,19 +1423,19 @@ protected IConfigTask visitShowCurrentSqlDialect( @Override protected IConfigTask visitSetSqlDialect(SetSqlDialect node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); return new SetSqlDialectTask(node.getSqlDialect()); } @Override protected IConfigTask visitPrepare(Prepare node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); return new PrepareTask(node.getStatementName().getValue(), node.getSql()); } @Override protected IConfigTask visitDeallocate(Deallocate node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); return new DeallocateTask(node.getStatementName().getValue()); } @@ -1500,7 +1500,7 @@ private void visitUpdateUser(RelationalAuthorStatement node) { @Override protected IConfigTask visitKillQuery(KillQuery node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); String allowedUsername = context.getSession().getUserName(); if (accessControl.hasGlobalPrivilege( context.getSession().getUserEntity(), PrivilegeType.SYSTEM)) { @@ -1511,7 +1511,7 @@ protected IConfigTask visitKillQuery(KillQuery node, MPPQueryContext context) { @Override protected IConfigTask visitCreateFunction(CreateFunction node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); if (node.getUriString().map(ExecutableManager::isUriTrusted).orElse(true)) { // 1. user specified uri and that uri is trusted @@ -1531,7 +1531,7 @@ protected IConfigTask visitShowFunctions(ShowFunctions node, MPPQueryContext con @Override protected IConfigTask visitDropFunction(DropFunction node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new DropFunctionTask(Model.TABLE, node.getUdfName()); } @@ -1539,7 +1539,7 @@ protected IConfigTask visitDropFunction(DropFunction node, MPPQueryContext conte @Override protected IConfigTask visitCreateExternalService( CreateExternalService node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new CreateExternalServiceTask(node); } @@ -1547,7 +1547,7 @@ protected IConfigTask visitCreateExternalService( @Override protected IConfigTask visitStartExternalService( StartExternalService node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new StartExternalServiceTask(node.getServiceName()); } @@ -1555,7 +1555,7 @@ protected IConfigTask visitStartExternalService( @Override protected IConfigTask visitStopExternalService( StopExternalService node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new StopExternalServiceTask(node.getServiceName()); } @@ -1563,14 +1563,14 @@ protected IConfigTask visitStopExternalService( @Override protected IConfigTask visitDropExternalService( DropExternalService node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new DropExternalServiceTask(node.getServiceName(), node.isForcedly()); } @Override protected IConfigTask visitMigrateRegion(MigrateRegion migrateRegion, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); // As the implementation is identical, we'll simply translate to the // corresponding tree-model variant and execute that. @@ -1580,7 +1580,7 @@ protected IConfigTask visitMigrateRegion(MigrateRegion migrateRegion, MPPQueryCo @Override protected IConfigTask visitReconstructRegion( ReconstructRegion reconstructRegion, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); // As the implementation is identical, we'll simply translate to the // corresponding tree-model variant and execute that. @@ -1589,7 +1589,7 @@ protected IConfigTask visitReconstructRegion( @Override protected IConfigTask visitExtendRegion(ExtendRegion extendRegion, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); // As the implementation is identical, we'll simply translate to the // corresponding tree-model variant and execute that. @@ -1598,7 +1598,7 @@ protected IConfigTask visitExtendRegion(ExtendRegion extendRegion, MPPQueryConte @Override protected IConfigTask visitRemoveRegion(RemoveRegion removeRegion, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); // As the implementation is identical, we'll simply translate to the // corresponding tree-model variant and execute that. @@ -1607,7 +1607,7 @@ protected IConfigTask visitRemoveRegion(RemoveRegion removeRegion, MPPQueryConte @Override protected IConfigTask visitCreateTraining(CreateTraining node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new CreateTuningTask( node.getModelId(), node.getParameters(), node.getExistingModelId(), node.getTargetSql()); @@ -1615,7 +1615,7 @@ protected IConfigTask visitCreateTraining(CreateTraining node, MPPQueryContext c @Override protected IConfigTask visitCreateModel(CreateModel node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); String uri = node.getUri(); if (uri != null && ExecutableManager.isUriTrusted(uri)) { @@ -1634,7 +1634,7 @@ protected IConfigTask visitShowModels(ShowModels node, MPPQueryContext context) @Override protected IConfigTask visitDropModel(DropModel node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new DropModelTask(node.getModelId()); } @@ -1654,14 +1654,14 @@ protected IConfigTask visitShowAIDevices(ShowAIDevices node, MPPQueryContext con @Override protected IConfigTask visitLoadModel(LoadModel node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new LoadModelTask(node.getModelId(), node.getDeviceIdList()); } @Override protected IConfigTask visitUnloadModel(UnloadModel node, MPPQueryContext context) { - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); accessControl.checkUserGlobalSysPrivilege(context); return new UnloadModelTask(node.getModelId(), node.getDeviceIdList()); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/RelationalAuthorizerTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/RelationalAuthorizerTask.java index a3f8fbd92b16f..6d74bbf038ea0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/RelationalAuthorizerTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/RelationalAuthorizerTask.java @@ -36,7 +36,8 @@ public RelationalAuthorizerTask(RelationalAuthorStatement statement) { @Override public ListenableFuture execute(IConfigTaskExecutor configTaskExecutor) { - if (statement.getQueryType() == QueryType.WRITE) { + if (statement.getQueryType() != QueryType.READ + && statement.getQueryType() != QueryType.READ_WRITE) { return AuthorityChecker.operatePermission(statement); } else { return AuthorityChecker.queryPermission(statement); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/AuthorizerTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/AuthorizerTask.java index 96a5414a4df5b..3501497ddb33b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/AuthorizerTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/AuthorizerTask.java @@ -40,7 +40,8 @@ public AuthorizerTask(AuthorStatement authorStatement) { public ListenableFuture execute(IConfigTaskExecutor configTaskExecutor) { // If the action is executed successfully, return the Future. // If your operation is async, you can return the corresponding future directly. - if (authorStatement.getQueryType() == QueryType.WRITE) { + if (authorStatement.getQueryType() != QueryType.READ + && authorStatement.getQueryType() != QueryType.READ_WRITE) { return AuthorityChecker.operatePermission(authorStatement); } else { return AuthorityChecker.queryPermission(authorStatement); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index cff29c0d83a1a..a438ef165ba01 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -827,7 +827,7 @@ protected Scope visitPipeEnriched(PipeEnriched node, Optional scope) { @Override protected Scope visitLoadTsFile(final LoadTsFile node, final Optional scope) { - queryContext.setQueryType(QueryType.WRITE); + queryContext.setQueryType(QueryType.OTHER); try (final LoadTsFileAnalyzer loadTsFileAnalyzer = new LoadTsFileAnalyzer(node, node.isGeneratedByPipe(), queryContext)) { @@ -4548,7 +4548,7 @@ private Scope.Builder scopeBuilder(Optional parentScope) { @Override protected Scope visitCreateOrUpdateDevice( final CreateOrUpdateDevice node, final Optional context) { - queryContext.setQueryType(QueryType.WRITE); + queryContext.setQueryType(QueryType.OTHER); DataNodeSchemaLockManager.getInstance() .takeReadLock(queryContext, SchemaLockType.VALIDATE_VS_DELETION_TABLE); // Check if the table exists diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java index 8509b21987d24..f77910254925e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java @@ -261,7 +261,7 @@ public QueryType getQueryType() { case REVOKE_USER_ROLE: case RENAME_USER: case ACCOUNT_UNLOCK: - return QueryType.WRITE; + return QueryType.OTHER; case LIST_ROLE: case LIST_USER: case LIST_ROLE_PRIV: diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java index f8d288d8e875f..d4b4263e407e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java @@ -139,8 +139,8 @@ public void start() { QUERY_EXECUTION_METRICS.recordExecutionCost(WAIT_FOR_DISPATCH, System.nanoTime() - startTime); } - // For the FragmentInstance of WRITE, it will be executed directly when dispatching. - if (queryType == QueryType.WRITE) { + // For the FragmentInstance of non-query, it will be executed directly when dispatching. + if (!isQuery()) { stateMachine.transitionToFinished(); return; } @@ -175,6 +175,6 @@ public FragmentInfo getFragmentInfo() { } private boolean isQuery() { - return queryType != QueryType.WRITE; + return queryType == QueryType.READ || queryType == QueryType.READ_WRITE; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java index 18ab1cdc27544..c52f8f94eb2a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java @@ -507,6 +507,7 @@ private void dispatchRemoteHelper(final FragmentInstance instance, final TEndPoi } break; case WRITE: + case OTHER: final TSendBatchPlanNodeReq sendPlanNodeReq = new TSendBatchPlanNodeReq( Collections.singletonList( @@ -644,6 +645,7 @@ private void dispatchLocally(final FragmentInstance instance) } break; case WRITE: + case OTHER: final PlanNode planNode = instance.getFragment().getPlanNodeTree(); final RegionWriteExecutor writeExecutor = new RegionWriteExecutor(); final RegionExecutionResult writeResult = writeExecutor.execute(groupId, planNode); @@ -682,6 +684,6 @@ private void dispatchLocally(final FragmentInstance instance) public void abort() {} private boolean isQuery() { - return type != QueryType.WRITE; + return type == QueryType.READ || type == QueryType.READ_WRITE; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/AlterEncodingCompressorStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/AlterEncodingCompressorStatement.java index a8dd88841a437..fbad38ec6f0d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/AlterEncodingCompressorStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/AlterEncodingCompressorStatement.java @@ -121,6 +121,6 @@ public R accept(final StatementVisitor visitor, final C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/AlterTimeSeriesDataTypeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/AlterTimeSeriesDataTypeStatement.java index d2a740ae5baa2..029b0e1ef074b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/AlterTimeSeriesDataTypeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/AlterTimeSeriesDataTypeStatement.java @@ -39,6 +39,6 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateContinuousQueryStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateContinuousQueryStatement.java index 92cd2e0572265..a6261377c8c48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateContinuousQueryStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateContinuousQueryStatement.java @@ -155,7 +155,7 @@ public String constructFormattedSQL() { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateFunctionStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateFunctionStatement.java index baa7a4a295b15..c524cbc790255 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateFunctionStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateFunctionStatement.java @@ -63,7 +63,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateTriggerStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateTriggerStatement.java index 2a1affe577e8f..53ba59075fd52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateTriggerStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateTriggerStatement.java @@ -110,7 +110,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DatabaseSchemaStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DatabaseSchemaStatement.java index 53ff33e2437cb..9fc9f2704f019 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DatabaseSchemaStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DatabaseSchemaStatement.java @@ -131,7 +131,7 @@ public R accept(final StatementVisitor visitor, final C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DeleteDatabaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DeleteDatabaseStatement.java index 6b538267555f2..0f7aed62ef7cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DeleteDatabaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DeleteDatabaseStatement.java @@ -72,6 +72,6 @@ public void setPrefixPath(List prefixPathList) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DeleteTimeSeriesStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DeleteTimeSeriesStatement.java index d51aee564a304..b24fe95096e7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DeleteTimeSeriesStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DeleteTimeSeriesStatement.java @@ -63,7 +63,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } public void setMayDeleteAudit(boolean mayDeleteAudit) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropContinuousQueryStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropContinuousQueryStatement.java index 12932d8a8d056..68336517a88a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropContinuousQueryStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropContinuousQueryStatement.java @@ -45,7 +45,7 @@ public String getCqId() { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropFunctionStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropFunctionStatement.java index 14a7d8b686883..d80af227e68e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropFunctionStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropFunctionStatement.java @@ -50,7 +50,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropTriggerStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropTriggerStatement.java index 96a07a116352f..fd7a8b099f0f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropTriggerStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/DropTriggerStatement.java @@ -49,7 +49,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveAINodeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveAINodeStatement.java index b8ee3d6f08b58..2f4a9df4325b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveAINodeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveAINodeStatement.java @@ -53,7 +53,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveConfigNodeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveConfigNodeStatement.java index 3851ecb0e1e23..54b906560d328 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveConfigNodeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveConfigNodeStatement.java @@ -47,7 +47,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveDataNodeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveDataNodeStatement.java index 44a6ddc6907d4..23a03ca6aa318 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveDataNodeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/RemoveDataNodeStatement.java @@ -50,7 +50,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/SetTTLStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/SetTTLStatement.java index c71a7ecb35edb..2e2284b12e944 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/SetTTLStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/SetTTLStatement.java @@ -61,7 +61,7 @@ public void setTTL(long ttl) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/CreateExternalServiceStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/CreateExternalServiceStatement.java index 3e85b2ad0a2f5..f6466a86f0707 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/CreateExternalServiceStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/CreateExternalServiceStatement.java @@ -58,7 +58,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/DropExternalServiceStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/DropExternalServiceStatement.java index 64a72e3efbb0a..babcbd433fed9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/DropExternalServiceStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/DropExternalServiceStatement.java @@ -58,7 +58,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/StartExternalServiceStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/StartExternalServiceStatement.java index 37b6553e7cdda..9565dabe1868f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/StartExternalServiceStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/StartExternalServiceStatement.java @@ -52,7 +52,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/StopExternalServiceStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/StopExternalServiceStatement.java index 6462210c6a389..928530bf5c4bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/StopExternalServiceStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/externalservice/StopExternalServiceStatement.java @@ -52,7 +52,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/CreateModelStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/CreateModelStatement.java index 2300af074a4b0..5d2bf56ce786e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/CreateModelStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/CreateModelStatement.java @@ -61,7 +61,7 @@ public List getPaths() { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/CreateTrainingStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/CreateTrainingStatement.java index 0628c22ae2b88..4aed87dde33a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/CreateTrainingStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/CreateTrainingStatement.java @@ -120,7 +120,7 @@ public List getPaths() { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/DropModelStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/DropModelStatement.java index 34ba98207e4fb..d3fd47344a47f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/DropModelStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/DropModelStatement.java @@ -47,7 +47,7 @@ public List getPaths() { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/LoadModelStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/LoadModelStatement.java index e3e2e3bc4f4ba..02ea3fd9d02b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/LoadModelStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/LoadModelStatement.java @@ -49,7 +49,7 @@ public List getDeviceIdList() { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/UnloadModelStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/UnloadModelStatement.java index be5057a8f008b..5aa65fb17c740 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/UnloadModelStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/model/UnloadModelStatement.java @@ -49,7 +49,7 @@ public List getDeviceIdList() { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/AlterPipeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/AlterPipeStatement.java index a3738a15fbdfd..250b349b0e195 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/AlterPipeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/AlterPipeStatement.java @@ -129,7 +129,7 @@ public void setUserName(String userName) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/CreatePipePluginStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/CreatePipePluginStatement.java index e1b22ea9de7b0..0147da9a64371 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/CreatePipePluginStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/CreatePipePluginStatement.java @@ -74,7 +74,7 @@ public String getUriString() { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/CreatePipeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/CreatePipeStatement.java index 718283182a733..e7d8591c71c1e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/CreatePipeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/CreatePipeStatement.java @@ -84,7 +84,7 @@ public void setSinkAttributes(final Map sinkAttributes) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/DropPipePluginStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/DropPipePluginStatement.java index 24b44f85cf6b4..d37ff02f730f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/DropPipePluginStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/DropPipePluginStatement.java @@ -66,7 +66,7 @@ public void setTableModel(final boolean tableModel) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/DropPipeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/DropPipeStatement.java index 3099a8d5dd5e8..39ee68fe9e182 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/DropPipeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/DropPipeStatement.java @@ -65,7 +65,7 @@ public void setTableModel(final boolean tableModel) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/StartPipeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/StartPipeStatement.java index 1122310b001b5..df46daf3141f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/StartPipeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/StartPipeStatement.java @@ -56,7 +56,7 @@ public void setTableModel(final boolean tableModel) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/StopPipeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/StopPipeStatement.java index 23bb60ae39cbb..2930cfe3c29d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/StopPipeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/pipe/StopPipeStatement.java @@ -56,7 +56,7 @@ public void setTableModel(final boolean tableModel) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/ExtendRegionStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/ExtendRegionStatement.java index 353cb11955399..4b2961038d134 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/ExtendRegionStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/ExtendRegionStatement.java @@ -54,7 +54,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/MigrateRegionStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/MigrateRegionStatement.java index 616357f537952..f13323542bbef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/MigrateRegionStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/MigrateRegionStatement.java @@ -70,7 +70,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/ReconstructRegionStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/ReconstructRegionStatement.java index cd22e61ad7f7d..f5b97f1ce3b73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/ReconstructRegionStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/ReconstructRegionStatement.java @@ -52,7 +52,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/RemoveRegionStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/RemoveRegionStatement.java index f64d6d84fe1bc..44eec637c8127 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/RemoveRegionStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/region/RemoveRegionStatement.java @@ -54,7 +54,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/CreateTopicStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/CreateTopicStatement.java index 7d1d59c44f46f..4dd493a963b66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/CreateTopicStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/CreateTopicStatement.java @@ -67,7 +67,7 @@ public void setTopicAttributes(Map topicAttributes) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/DropSubscriptionStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/DropSubscriptionStatement.java index fb64cfdeb8eb3..dfae59c61c8f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/DropSubscriptionStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/DropSubscriptionStatement.java @@ -66,7 +66,7 @@ public void setTableModel(final boolean tableModel) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/DropTopicStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/DropTopicStatement.java index 5c7d7d115f673..9f745c72de4da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/DropTopicStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/subscription/DropTopicStatement.java @@ -66,7 +66,7 @@ public void setTableModel(final boolean tableModel) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/AlterSchemaTemplateStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/AlterSchemaTemplateStatement.java index ef86d01d94e9b..ab352f84bd292 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/AlterSchemaTemplateStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/AlterSchemaTemplateStatement.java @@ -74,7 +74,7 @@ public TemplateAlterOperationType getOperationType() { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/CreateSchemaTemplateStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/CreateSchemaTemplateStatement.java index 807a83491b3b3..72c4142ab710f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/CreateSchemaTemplateStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/CreateSchemaTemplateStatement.java @@ -112,6 +112,6 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/DeactivateTemplateStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/DeactivateTemplateStatement.java index 7057003d3945c..152873dda0788 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/DeactivateTemplateStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/DeactivateTemplateStatement.java @@ -103,6 +103,6 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/DropSchemaTemplateStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/DropSchemaTemplateStatement.java index ff4237fdb8ec0..e0c9500b52862 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/DropSchemaTemplateStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/DropSchemaTemplateStatement.java @@ -54,7 +54,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/SetSchemaTemplateStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/SetSchemaTemplateStatement.java index e8a384cd8201d..743baca57bc07 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/SetSchemaTemplateStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/SetSchemaTemplateStatement.java @@ -69,6 +69,6 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/UnsetSchemaTemplateStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/UnsetSchemaTemplateStatement.java index 4240007257d48..834ab56dab736 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/UnsetSchemaTemplateStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/template/UnsetSchemaTemplateStatement.java @@ -64,7 +64,7 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java index 8bca6b8f5d1cf..ce7c1f906bc71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java @@ -126,6 +126,6 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/DeleteLogicalViewStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/DeleteLogicalViewStatement.java index f09ab0829f288..c1d960f687798 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/DeleteLogicalViewStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/DeleteLogicalViewStatement.java @@ -61,6 +61,6 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/RenameLogicalViewStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/RenameLogicalViewStatement.java index af1246d533924..115437f3a1c6f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/RenameLogicalViewStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/RenameLogicalViewStatement.java @@ -68,6 +68,6 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/AuthorStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/AuthorStatement.java index ecc10a8ae7a52..af6a94e9055a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/AuthorStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/AuthorStatement.java @@ -236,7 +236,7 @@ public QueryType getQueryType() { case UPDATE_USER: case RENAME_USER: case ACCOUNT_UNLOCK: - queryType = QueryType.WRITE; + queryType = QueryType.OTHER; break; case LIST_USER: case LIST_ROLE: diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/ClearCacheStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/ClearCacheStatement.java index 3b31739636617..d2bcfc1e772a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/ClearCacheStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/ClearCacheStatement.java @@ -58,7 +58,7 @@ public void setOptions(final Set options) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/FlushStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/FlushStatement.java index 24d5458a1f00d..894427eb9af62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/FlushStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/FlushStatement.java @@ -71,7 +71,7 @@ public void setOnCluster(final boolean onCluster) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/KillQueryStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/KillQueryStatement.java index f5f236f1b91eb..f2d6f59229a5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/KillQueryStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/KillQueryStatement.java @@ -69,6 +69,6 @@ public R accept(StatementVisitor visitor, C context) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/LoadConfigurationStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/LoadConfigurationStatement.java index 12ccafacf80f4..e1fc1d13a7067 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/LoadConfigurationStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/LoadConfigurationStatement.java @@ -46,7 +46,7 @@ public void setOnCluster(boolean onCluster) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/MergeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/MergeStatement.java index 29d1fbc8f05fc..2b327c7609419 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/MergeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/MergeStatement.java @@ -47,7 +47,7 @@ public void setOnCluster(boolean onCluster) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetConfigurationStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetConfigurationStatement.java index 06c438481a929..58e15e59cefc6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetConfigurationStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetConfigurationStatement.java @@ -64,7 +64,7 @@ public Map getConfigItems() { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java index 75cbbee32e693..391301934fecd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java @@ -58,7 +58,7 @@ public List getPaths() { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSystemStatusStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSystemStatusStatement.java index 4fdf7a2cd0997..6a4b6a05bb008 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSystemStatusStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSystemStatusStatement.java @@ -57,7 +57,7 @@ public void setStatus(NodeStatus status) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/StartRepairDataStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/StartRepairDataStatement.java index 24bed11fd6e2a..73fd1ddf8eab2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/StartRepairDataStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/StartRepairDataStatement.java @@ -52,7 +52,7 @@ public List getPaths() { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/StopRepairDataStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/StopRepairDataStatement.java index 698c6dc0853ca..55a8426bf2f98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/StopRepairDataStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/StopRepairDataStatement.java @@ -52,7 +52,7 @@ public List getPaths() { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/quota/SetSpaceQuotaStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/quota/SetSpaceQuotaStatement.java index bc92d45704bc4..eef29f365117f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/quota/SetSpaceQuotaStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/quota/SetSpaceQuotaStatement.java @@ -85,7 +85,7 @@ public void setPrefixPathList(List prefixPathList) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/quota/SetThrottleQuotaStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/quota/SetThrottleQuotaStatement.java index 5aa8b5bce413c..2413d3edcd677 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/quota/SetThrottleQuotaStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/quota/SetThrottleQuotaStatement.java @@ -79,7 +79,7 @@ public void setCpuLimit(int cpuLimit) { @Override public QueryType getQueryType() { - return QueryType.WRITE; + return QueryType.OTHER; } @Override diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/ConfigExecutionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/ConfigExecutionTest.java index c49ea7cf35f72..e2522b2730dea 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/ConfigExecutionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/ConfigExecutionTest.java @@ -159,7 +159,7 @@ public void exceptionAfterInvokeGetStatusTest() { private MPPQueryContext genMPPQueryContext() { MPPQueryContext context = new MPPQueryContext(new QueryId("query1")); - context.setQueryType(QueryType.WRITE); + context.setQueryType(QueryType.OTHER); return context; } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/statement/sys/pipe/PipeStatementTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/statement/sys/pipe/PipeStatementTest.java index 04fccc195600e..9694c4563736e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/statement/sys/pipe/PipeStatementTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/statement/sys/pipe/PipeStatementTest.java @@ -51,7 +51,7 @@ public void testCreatePipeStatement() { Assert.assertEquals(processorAttributes, statement.getProcessorAttributes()); Assert.assertEquals(connectorAttributes, statement.getSinkAttributes()); - Assert.assertEquals(QueryType.WRITE, statement.getQueryType()); + Assert.assertEquals(QueryType.OTHER, statement.getQueryType()); } @Test @@ -59,7 +59,7 @@ public void testDropPipeStatement() { DropPipeStatement statement = new DropPipeStatement(StatementType.DROP_PIPE); statement.setPipeName("test"); Assert.assertEquals("test", statement.getPipeName()); - Assert.assertEquals(QueryType.WRITE, statement.getQueryType()); + Assert.assertEquals(QueryType.OTHER, statement.getQueryType()); } @Test @@ -77,7 +77,7 @@ public void testStartPipeStatement() { StartPipeStatement statement = new StartPipeStatement(StatementType.START_PIPE); statement.setPipeName("test"); Assert.assertEquals("test", statement.getPipeName()); - Assert.assertEquals(QueryType.WRITE, statement.getQueryType()); + Assert.assertEquals(QueryType.OTHER, statement.getQueryType()); } @Test @@ -85,6 +85,6 @@ public void testStopPipeStatement() { StopPipeStatement statement = new StopPipeStatement(StatementType.STOP_PIPE); statement.setPipeName("test"); Assert.assertEquals("test", statement.getPipeName()); - Assert.assertEquals(QueryType.WRITE, statement.getQueryType()); + Assert.assertEquals(QueryType.OTHER, statement.getQueryType()); } }