You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2023/01/03 11:06:11 UTC
[iotdb] branch master updated: Rename SQL show cluster parameters to show variables (#8715)
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new e1f905192d Rename SQL show cluster parameters to show variables (#8715)
e1f905192d is described below
commit e1f905192d88168ed4ecdb1a2b9f041b1e092e8a
Author: YongzaoDan <33...@users.noreply.github.com>
AuthorDate: Tue Jan 3 19:06:04 2023 +0800
Rename SQL show cluster parameters to show variables (#8715)
---
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 9 +++++++--
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 4 ++--
.../iotdb/confignode/manager/ConfigManager.java | 6 +++---
.../apache/iotdb/confignode/manager/IManager.java | 8 ++++----
.../thrift/ConfigNodeRPCServiceProcessor.java | 6 +++---
docs/UserGuide/Cluster/Cluster-Maintenance.md | 10 +++++-----
docs/zh/UserGuide/Cluster/Cluster-Maintenance.md | 8 ++++----
.../it/cluster/IoTDBClusterNodeGetterIT.java | 9 ++++-----
.../apache/iotdb/db/client/ConfigNodeClient.java | 6 +++---
.../db/mpp/common/header/ColumnHeaderConstant.java | 7 +++----
.../db/mpp/common/header/DatasetHeaderFactory.java | 2 +-
.../plan/execution/config/ConfigTaskVisitor.java | 11 ++++++++---
.../config/executor/ClusterConfigTaskExecutor.java | 10 +++++-----
...rParametersTask.java => ShowVariablesTask.java} | 13 ++++++------
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 8 ++++++--
.../db/mpp/plan/statement/StatementVisitor.java | 5 +++++
.../statement/metadata/ShowClusterStatement.java | 9 ---------
...rStatement.java => ShowVariablesStatement.java} | 23 ++--------------------
.../src/main/thrift/confignode.thrift | 6 +++---
19 files changed, 74 insertions(+), 86 deletions(-)
diff --git a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
index 25df223525..29120d1810 100644
--- a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
+++ b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
@@ -42,7 +42,7 @@ ddlStatement
| dropFunction | dropTrigger | dropContinuousQuery | dropSchemaTemplate
| setTTL | unsetTTL | startTrigger | stopTrigger | setSchemaTemplate | unsetSchemaTemplate
| showStorageGroup | showDevices | showTimeseries | showChildPaths | showChildNodes
- | showFunctions | showTriggers | showContinuousQueries | showTTL | showAllTTL | showCluster | showRegion | showDataNodes | showConfigNodes
+ | showFunctions | showTriggers | showContinuousQueries | showTTL | showAllTTL | showCluster | showVariables | showRegion | showDataNodes | showConfigNodes
| showSchemaTemplates | showNodesInSchemaTemplate
| showPathsUsingSchemaTemplate | showPathsSetSchemaTemplate
| countStorageGroup | countDevices | countTimeseries | countNodes
@@ -339,9 +339,14 @@ showAllTTL
: SHOW ALL TTL
;
+// Show Variables
+showVariables
+ : SHOW VARIABLES
+ ;
+
// Show Cluster
showCluster
- : SHOW CLUSTER (DETAILS | PARAMETERS)?
+ : SHOW CLUSTER (DETAILS)?
;
// Show Region
diff --git a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
index 3b67376159..a11400cd47 100644
--- a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
+++ b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4
@@ -121,8 +121,8 @@ CLUSTER
: C L U S T E R
;
-PARAMETERS
- : P A R A M E T E R S
+VARIABLES
+ : V A R I A B L E S
;
CONCAT
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index 168a35af12..1fb519ea2b 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -137,13 +137,13 @@ import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionTableResp;
import org.apache.iotdb.confignode.rpc.thrift.TSetDataNodeStatusReq;
import org.apache.iotdb.confignode.rpc.thrift.TSetSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowCQResp;
-import org.apache.iotdb.confignode.rpc.thrift.TShowClusterParametersResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowVariablesResp;
import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq;
@@ -407,9 +407,9 @@ public class ConfigManager implements IManager {
}
@Override
- public TShowClusterParametersResp showClusterParameters() {
+ public TShowVariablesResp showVariables() {
TSStatus status = confirmLeader();
- TShowClusterParametersResp resp = new TShowClusterParametersResp();
+ TShowVariablesResp resp = new TShowVariablesResp();
resp.setStatus(status);
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
resp.setClusterParameters(getClusterParameters());
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
index 391cd337dd..ced0ecc058 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java
@@ -89,13 +89,13 @@ import org.apache.iotdb.confignode.rpc.thrift.TSchemaPartitionTableResp;
import org.apache.iotdb.confignode.rpc.thrift.TSetDataNodeStatusReq;
import org.apache.iotdb.confignode.rpc.thrift.TSetSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowCQResp;
-import org.apache.iotdb.confignode.rpc.thrift.TShowClusterParametersResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowVariablesResp;
import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq;
import org.apache.iotdb.consensus.common.DataSet;
@@ -245,11 +245,11 @@ public interface IManager {
TShowClusterResp showCluster();
/**
- * Get Cluster parameters
+ * Get variables
*
- * @return TShowClusterParametersResp
+ * @return TShowVariablesResp
*/
- TShowClusterParametersResp showClusterParameters();
+ TShowVariablesResp showVariables();
TSStatus setTTL(SetTTLPlan configRequest);
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index accfab2dbe..db3d6aaf25 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
@@ -134,7 +134,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TSetSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TSetStorageGroupReq;
import org.apache.iotdb.confignode.rpc.thrift.TSetTimePartitionIntervalReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowCQResp;
-import org.apache.iotdb.confignode.rpc.thrift.TShowClusterParametersResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
@@ -147,6 +146,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowTrailReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowTrailResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowVariablesResp;
import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchemaResp;
import org.apache.iotdb.confignode.rpc.thrift.TSystemConfigurationResp;
@@ -269,8 +269,8 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
}
@Override
- public TShowClusterParametersResp showClusterParameters() throws TException {
- return configManager.showClusterParameters();
+ public TShowVariablesResp showVariables() throws TException {
+ return configManager.showVariables();
}
@Override
diff --git a/docs/UserGuide/Cluster/Cluster-Maintenance.md b/docs/UserGuide/Cluster/Cluster-Maintenance.md
index 91bdad5c0f..6f04fd8b1f 100644
--- a/docs/UserGuide/Cluster/Cluster-Maintenance.md
+++ b/docs/UserGuide/Cluster/Cluster-Maintenance.md
@@ -21,18 +21,18 @@
# Cluster Information Query Command
-## Show Cluster Parameters
+## Show Variables
Currently, IoTDB supports showing key parameters of the cluster:
```
-SHOW CLUSTER PARAMETERS
+SHOW VARIABLES
```
Eg:
```
-IoTDB> show cluster parameters
+IoTDB> show variables
+----------------------------------+-----------------------------------------------------------------+
-| ClusterParameters| Value|
+| Variables| Value|
+----------------------------------+-----------------------------------------------------------------+
| ClusterName| defaultCluster|
| DataReplicationFactor| 1|
@@ -51,7 +51,7 @@ IoTDB> show cluster parameters
| DiskSpaceWarningThreshold| 0.05|
+----------------------------------+-----------------------------------------------------------------+
Total line number = 15
-It costs 0.242s
+It costs 0.225s
```
**Notice:** Ensure that all key parameters displayed in this SQL are consist on each node in the same cluster
diff --git a/docs/zh/UserGuide/Cluster/Cluster-Maintenance.md b/docs/zh/UserGuide/Cluster/Cluster-Maintenance.md
index 3196b6f06d..641dbd53ca 100644
--- a/docs/zh/UserGuide/Cluster/Cluster-Maintenance.md
+++ b/docs/zh/UserGuide/Cluster/Cluster-Maintenance.md
@@ -25,14 +25,14 @@
当前 IoTDB 支持使用如下 SQL 展示集群的关键参数：
```
-SHOW CLUSTER PARAMETERS
+SHOW VARIABLES
```
示例：
```
-IoTDB> show cluster parameters
+IoTDB> show variables
+----------------------------------+-----------------------------------------------------------------+
-| ClusterParameters| Value|
+| Variables| Value|
+----------------------------------+-----------------------------------------------------------------+
| ClusterName| defaultCluster|
| DataReplicationFactor| 1|
@@ -51,7 +51,7 @@ IoTDB> show cluster parameters
| DiskSpaceWarningThreshold| 0.05|
+----------------------------------+-----------------------------------------------------------------+
Total line number = 15
-It costs 0.242s
+It costs 0.225s
```
**注意：** 必须保证该 SQL 展示的所有配置参数在同一集群各个节点完全一致
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/cluster/IoTDBClusterNodeGetterIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/cluster/IoTDBClusterNodeGetterIT.java
index 1462f579cd..1066e48c46 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/cluster/IoTDBClusterNodeGetterIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/cluster/IoTDBClusterNodeGetterIT.java
@@ -30,10 +30,10 @@ import org.apache.iotdb.confignode.rpc.thrift.TDataNodeConfigurationResp;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeInfo;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeRemoveReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeRemoveResp;
-import org.apache.iotdb.confignode.rpc.thrift.TShowClusterParametersResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowVariablesResp;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.it.env.ConfigFactory;
import org.apache.iotdb.it.env.ConfigNodeWrapper;
@@ -143,11 +143,10 @@ public class IoTDBClusterNodeGetterIT {
}
/* Tests showClusterParameters */
- TShowClusterParametersResp showClusterParametersResp = client.showClusterParameters();
+ TShowVariablesResp showVariablesResp = client.showVariables();
Assert.assertEquals(
- TSStatusCode.SUCCESS_STATUS.getStatusCode(),
- showClusterParametersResp.getStatus().getCode());
- TClusterParameters clusterParameters = showClusterParametersResp.getClusterParameters();
+ TSStatusCode.SUCCESS_STATUS.getStatusCode(), showVariablesResp.getStatus().getCode());
+ TClusterParameters clusterParameters = showVariablesResp.getClusterParameters();
Assert.assertEquals(
testConsensusProtocolClass, clusterParameters.getConfigNodeConsensusProtocolClass());
Assert.assertEquals(
diff --git a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
index 3106627b8b..16e88eb618 100644
--- a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
+++ b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
@@ -102,7 +102,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TSetSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TSetStorageGroupReq;
import org.apache.iotdb.confignode.rpc.thrift.TSetTimePartitionIntervalReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowCQResp;
-import org.apache.iotdb.confignode.rpc.thrift.TShowClusterParametersResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
@@ -115,6 +114,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowTrailReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowTrailResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowVariablesResp;
import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchemaResp;
import org.apache.iotdb.confignode.rpc.thrift.TSystemConfigurationResp;
import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq;
@@ -489,10 +489,10 @@ public class ConfigNodeClient
}
@Override
- public TShowClusterParametersResp showClusterParameters() throws TException {
+ public TShowVariablesResp showVariables() throws TException {
for (int i = 0; i < RETRY_NUM; i++) {
try {
- TShowClusterParametersResp resp = client.showClusterParameters();
+ TShowVariablesResp resp = client.showVariables();
if (!updateConfigNodeLeader(resp.status)) {
return resp;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
index 3460e18e53..7bef5278a7 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
@@ -58,7 +58,7 @@ public class ColumnHeaderConstant {
public static final String VERSION = "Version";
public static final String BUILD_INFO = "BuildInfo";
public static final String PATHS = "Paths";
- public static final String CLUSTER_PARAMETERS = "ClusterParameters";
+ public static final String VARIABLES = "Variables";
// column names for count statement
public static final String COLUMN = "Column";
@@ -290,10 +290,9 @@ public class ColumnHeaderConstant {
new ColumnHeader(SCHEMA_CONSENSUS_PORT, TSDataType.TEXT),
new ColumnHeader(DATA_CONSENSUS_PORT, TSDataType.TEXT));
- public static final List<ColumnHeader> showClusterParametersColumnHeaders =
+ public static final List<ColumnHeader> showVariablesColumnHeaders =
ImmutableList.of(
- new ColumnHeader(CLUSTER_PARAMETERS, TSDataType.TEXT),
- new ColumnHeader(VALUE, TSDataType.TEXT));
+ new ColumnHeader(VARIABLES, TSDataType.TEXT), new ColumnHeader(VALUE, TSDataType.TEXT));
public static final List<ColumnHeader> showFunctionsColumnHeaders =
ImmutableList.of(
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/DatasetHeaderFactory.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/DatasetHeaderFactory.java
index 704d75d925..f452e066df 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/DatasetHeaderFactory.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/DatasetHeaderFactory.java
@@ -82,7 +82,7 @@ public class DatasetHeaderFactory {
}
public static DatasetHeader getShowClusterParametersHeader() {
- return new DatasetHeader(ColumnHeaderConstant.showClusterParametersColumnHeaders, true);
+ return new DatasetHeader(ColumnHeaderConstant.showVariablesColumnHeaders, true);
}
public static DatasetHeader getShowClusterDetailsHeader() {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigTaskVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigTaskVisitor.java
index 279e645ad4..0535e1ef1a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigTaskVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigTaskVisitor.java
@@ -35,7 +35,6 @@ import org.apache.iotdb.db.mpp.plan.execution.config.metadata.MigrateRegionTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.SetStorageGroupTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.SetTTLTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowClusterDetailsTask;
-import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowClusterParametersTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowClusterTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowConfigNodesTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowContinuousQueriesTask;
@@ -45,6 +44,7 @@ import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowRegionTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowStorageGroupTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowTTLTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowTriggersTask;
+import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowVariablesTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.UnSetTTLTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.template.CreateSchemaTemplateTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.template.DeactivateSchemaTemplateTask;
@@ -95,6 +95,7 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowRegionStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStorageGroupStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTriggersStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowVariablesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.UnSetTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.CreateSchemaTemplateStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.DeactivateTemplateStatement;
@@ -172,13 +173,17 @@ public class ConfigTaskVisitor
return new ShowTTLTask(showTTLStatement);
}
+ @Override
+ public IConfigTask visitShowVariables(
+ ShowVariablesStatement showVariablesStatement, TaskContext context) {
+ return new ShowVariablesTask();
+ }
+
@Override
public IConfigTask visitShowCluster(
ShowClusterStatement showClusterStatement, TaskContext context) {
if (showClusterStatement.isDetails()) {
return new ShowClusterDetailsTask(showClusterStatement);
- } else if (showClusterStatement.isParameters()) {
- return new ShowClusterParametersTask();
} else {
return new ShowClusterTask(showClusterStatement);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java
index ad0cff1281..2a8231b29c 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java
@@ -60,7 +60,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TMigrateRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TPipeSinkInfo;
import org.apache.iotdb.confignode.rpc.thrift.TSetStorageGroupReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowCQResp;
-import org.apache.iotdb.confignode.rpc.thrift.TShowClusterParametersResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
@@ -70,6 +69,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowPipeResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowVariablesResp;
import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchemaResp;
import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq;
@@ -87,7 +87,6 @@ import org.apache.iotdb.db.mpp.plan.execution.config.metadata.GetSeriesSlotListT
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.GetTimeSlotListTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.SetStorageGroupTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowClusterDetailsTask;
-import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowClusterParametersTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowClusterTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowConfigNodesTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowContinuousQueriesTask;
@@ -97,6 +96,7 @@ import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowRegionTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowStorageGroupTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowTTLTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowTriggersTask;
+import org.apache.iotdb.db.mpp.plan.execution.config.metadata.ShowVariablesTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.template.ShowNodesInSchemaTemplateTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.template.ShowPathSetTemplateTask;
import org.apache.iotdb.db.mpp.plan.execution.config.metadata.template.ShowSchemaTemplateTask;
@@ -794,16 +794,16 @@ public class ClusterConfigTaskExecutor implements IConfigTaskExecutor {
@Override
public SettableFuture<ConfigTaskResult> showClusterParameters() {
SettableFuture<ConfigTaskResult> future = SettableFuture.create();
- TShowClusterParametersResp showClusterParametersResp = new TShowClusterParametersResp();
+ TShowVariablesResp showVariablesResp = new TShowVariablesResp();
try (ConfigNodeClient client =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.configNodeRegionId)) {
- showClusterParametersResp = client.showClusterParameters();
+ showVariablesResp = client.showVariables();
} catch (ClientManagerException | TException e) {
future.setException(e);
}
// build TSBlock
- ShowClusterParametersTask.buildTSBlock(showClusterParametersResp, future);
+ ShowVariablesTask.buildTSBlock(showVariablesResp, future);
return future;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowClusterParametersTask.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowVariablesTask.java
similarity index 92%
rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowClusterParametersTask.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowVariablesTask.java
index 6a95a83522..794d3aa84c 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowClusterParametersTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowVariablesTask.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.mpp.plan.execution.config.metadata;
import org.apache.iotdb.confignode.rpc.thrift.TClusterParameters;
-import org.apache.iotdb.confignode.rpc.thrift.TShowClusterParametersResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowVariablesResp;
import org.apache.iotdb.db.mpp.common.header.ColumnHeader;
import org.apache.iotdb.db.mpp.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.mpp.common.header.DatasetHeader;
@@ -39,9 +39,9 @@ import com.google.common.util.concurrent.SettableFuture;
import java.util.List;
import java.util.stream.Collectors;
-public class ShowClusterParametersTask implements IConfigTask {
+public class ShowVariablesTask implements IConfigTask {
- public ShowClusterParametersTask() {
+ public ShowVariablesTask() {
// Empty constructor
}
@@ -53,15 +53,14 @@ public class ShowClusterParametersTask implements IConfigTask {
}
public static void buildTSBlock(
- TShowClusterParametersResp showClusterParametersResp,
- SettableFuture<ConfigTaskResult> future) {
+ TShowVariablesResp showVariablesResp, SettableFuture<ConfigTaskResult> future) {
List<TSDataType> outputDataTypes =
- ColumnHeaderConstant.showClusterParametersColumnHeaders.stream()
+ ColumnHeaderConstant.showVariablesColumnHeaders.stream()
.map(ColumnHeader::getColumnType)
.collect(Collectors.toList());
TsBlockBuilder builder = new TsBlockBuilder(outputDataTypes);
- TClusterParameters clusterParameters = showClusterParametersResp.getClusterParameters();
+ TClusterParameters clusterParameters = showVariablesResp.getClusterParameters();
buildTSBlock(
builder,
new Binary(ColumnHeaderConstant.COLUMN_CLUSTER_NAME),
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
index 9d868a23a8..d3eab1de63 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
@@ -126,6 +126,7 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStorageGroupStatement
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTriggersStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowVariablesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.UnSetTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.ActivateTemplateStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.CreateSchemaTemplateStatement;
@@ -1979,13 +1980,16 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
return showTTLStatement;
}
+ @Override
+ public Statement visitShowVariables(IoTDBSqlParser.ShowVariablesContext ctx) {
+ return new ShowVariablesStatement();
+ }
+
@Override
public Statement visitShowCluster(IoTDBSqlParser.ShowClusterContext ctx) {
ShowClusterStatement showClusterStatement = new ShowClusterStatement();
if (ctx.DETAILS() != null) {
showClusterStatement.setDetails(true);
- } else if (ctx.PARAMETERS() != null) {
- showClusterStatement.setParameters(true);
}
return showClusterStatement;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/StatementVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/StatementVisitor.java
index cfc7ce8e26..33a3b28057 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/StatementVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/StatementVisitor.java
@@ -66,6 +66,7 @@ import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowStorageGroupStatement
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTimeSeriesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTriggersStatement;
+import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowVariablesStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.UnSetTTLStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.ActivateTemplateStatement;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.CreateSchemaTemplateStatement;
@@ -172,6 +173,10 @@ public abstract class StatementVisitor<R, C> {
return visitStatement(showTTLStatement, context);
}
+ public R visitShowVariables(ShowVariablesStatement showVariablesStatement, C context) {
+ return visitStatement(showVariablesStatement, context);
+ }
+
public R visitShowCluster(ShowClusterStatement showClusterStatement, C context) {
return visitStatement(showClusterStatement, context);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowClusterStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowClusterStatement.java
index db716b0f0c..be001b932f 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowClusterStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowClusterStatement.java
@@ -25,7 +25,6 @@ import org.apache.iotdb.db.mpp.plan.statement.StatementVisitor;
public class ShowClusterStatement extends ShowStatement implements IConfigStatement {
private boolean isDetails = false;
- private boolean isParameters = false;
@Override
public QueryType getQueryType() {
@@ -44,12 +43,4 @@ public class ShowClusterStatement extends ShowStatement implements IConfigStatem
public void setDetails(boolean details) {
isDetails = details;
}
-
- public boolean isParameters() {
- return isParameters;
- }
-
- public void setParameters(boolean parameters) {
- isParameters = parameters;
- }
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowClusterStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowVariablesStatement.java
similarity index 71%
copy from server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowClusterStatement.java
copy to server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowVariablesStatement.java
index db716b0f0c..40b028012f 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowClusterStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/ShowVariablesStatement.java
@@ -22,10 +22,7 @@ import org.apache.iotdb.db.mpp.plan.analyze.QueryType;
import org.apache.iotdb.db.mpp.plan.statement.IConfigStatement;
import org.apache.iotdb.db.mpp.plan.statement.StatementVisitor;
-public class ShowClusterStatement extends ShowStatement implements IConfigStatement {
-
- private boolean isDetails = false;
- private boolean isParameters = false;
+public class ShowVariablesStatement extends ShowStatement implements IConfigStatement {
@Override
public QueryType getQueryType() {
@@ -34,22 +31,6 @@ public class ShowClusterStatement extends ShowStatement implements IConfigStatem
@Override
public <R, C> R accept(StatementVisitor<R, C> visitor, C context) {
- return visitor.visitShowCluster(this, context);
- }
-
- public boolean isDetails() {
- return isDetails;
- }
-
- public void setDetails(boolean details) {
- isDetails = details;
- }
-
- public boolean isParameters() {
- return isParameters;
- }
-
- public void setParameters(boolean parameters) {
- isParameters = parameters;
+ return visitor.visitShowVariables(this, context);
}
}
diff --git a/thrift-confignode/src/main/thrift/confignode.thrift b/thrift-confignode/src/main/thrift/confignode.thrift
index a247d8616b..79db50193c 100644
--- a/thrift-confignode/src/main/thrift/confignode.thrift
+++ b/thrift-confignode/src/main/thrift/confignode.thrift
@@ -451,7 +451,7 @@ struct TShowClusterResp {
4: required map<i32, string> nodeStatus
}
-struct TShowClusterParametersResp {
+struct TShowVariablesResp {
1: required common.TSStatus status
2: optional TClusterParameters clusterParameters
}
@@ -1067,8 +1067,8 @@ service IConfigNodeRPCService {
/** Show cluster ConfigNodes' and DataNodes' information */
TShowClusterResp showCluster()
- /** Show cluster parameters who should be consist in the same cluster */
- TShowClusterParametersResp showClusterParameters()
+ /** Show variables who should be consist in the same cluster */
+ TShowVariablesResp showVariables()
/** Show cluster DataNodes' information */
TShowDataNodesResp showDataNodes()