This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch rel/1.1
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.1 by this push:
new 3a38145ef5b [IOTDB-5919]show variables add a variable
timestamp_precision (#9936) (#9956)
3a38145ef5b is described below
commit 3a38145ef5bdfaf7a6ddb793da78c175d3d3b83a
Author: YuFengLiu <[email protected]>
AuthorDate: Mon May 29 15:56:37 2023 +0800
[IOTDB-5919]show variables add a variable timestamp_precision (#9936)
(#9956)
---
.../org/apache/iotdb/confignode/manager/ConfigManager.java | 1 +
.../apache/iotdb/confignode/it/utils/ConfigNodeTestUtils.java | 1 +
.../main/java/org/apache/iotdb/commons/conf/CommonConfig.java | 10 ++++++++++
.../java/org/apache/iotdb/commons/conf/CommonDescriptor.java | 3 +++
.../iotdb/db/mpp/common/header/ColumnHeaderConstant.java | 2 ++
.../mpp/plan/execution/config/metadata/ShowVariablesTask.java | 4 ++++
thrift-confignode/src/main/thrift/confignode.thrift | 1 +
7 files changed, 22 insertions(+)
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 0041f38db4d..b9a44d11502 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
@@ -462,6 +462,7 @@ public class ConfigManager implements IManager {
clusterParameters.setSchemaRegionPerDataNode(CONF.getSchemaRegionPerDataNode());
clusterParameters.setDiskSpaceWarningThreshold(COMMON_CONF.getDiskSpaceWarningThreshold());
clusterParameters.setReadConsistencyLevel(CONF.getReadConsistencyLevel());
+
clusterParameters.setTimestampPrecision(COMMON_CONF.getTimestampPrecision());
return clusterParameters;
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/utils/ConfigNodeTestUtils.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/utils/ConfigNodeTestUtils.java
index 2bca1e15cd1..b3123838fcf 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/utils/ConfigNodeTestUtils.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/utils/ConfigNodeTestUtils.java
@@ -212,6 +212,7 @@ public class ConfigNodeTestUtils {
clusterParameters.setSchemaRegionPerDataNode(1.0);
clusterParameters.setDiskSpaceWarningThreshold(0.05);
clusterParameters.setReadConsistencyLevel("strong");
+ clusterParameters.setTimestampPrecision("ms");
return clusterParameters;
}
diff --git
a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
index dc985ec877a..b3a65b9152d 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
@@ -128,6 +128,8 @@ public class CommonConfig {
/** Ip and port of target ML node. */
private TEndPoint targetMLNodeEndPoint = new TEndPoint("127.0.0.1", 10810);
+ private String timestampPrecision = "ms";
+
CommonConfig() {}
public void updatePath(String homeDir) {
@@ -376,4 +378,12 @@ public class CommonConfig {
public void setStopping(boolean stopping) {
isStopping = stopping;
}
+
+ public void setTimestampPrecision(String timestampPrecision) {
+ this.timestampPrecision = timestampPrecision;
+ }
+
+ public String getTimestampPrecision() {
+ return timestampPrecision;
+ }
}
diff --git
a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
index 5aa42bbe5f0..c860af5d593 100644
---
a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
+++
b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
@@ -188,6 +188,9 @@ public class CommonDescriptor {
String.valueOf(config.getDiskSpaceWarningThreshold()))
.trim()));
+ config.setTimestampPrecision(
+ properties.getProperty("timestamp_precision",
config.getTimestampPrecision()).trim());
+
String endPointUrl =
properties.getProperty(
"target_ml_node_endpoint",
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 4a11b2dd99f..5c5eb88554b 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
@@ -114,6 +114,8 @@ public class ColumnHeaderConstant {
public static final String READ_CONSISTENCY_LEVEL = "ReadConsistencyLevel";
public static final String DISK_SPACE_WARNING_THRESHOLD =
"DiskSpaceWarningThreshold";
+ public static final String TIMESTAMP_PRECISION = "TimestampPrecision";
+
// column names for show region statement
public static final String REGION_ID = "RegionId";
public static final String TYPE = "Type";
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowVariablesTask.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowVariablesTask.java
index a43715fe9c5..71815aa9203 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowVariablesTask.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowVariablesTask.java
@@ -117,6 +117,10 @@ public class ShowVariablesTask implements IConfigTask {
builder,
new Binary(ColumnHeaderConstant.DISK_SPACE_WARNING_THRESHOLD),
new
Binary(String.valueOf(clusterParameters.getDiskSpaceWarningThreshold())));
+ buildTSBlock(
+ builder,
+ new Binary(ColumnHeaderConstant.TIMESTAMP_PRECISION),
+ new Binary(String.valueOf(clusterParameters.getTimestampPrecision())));
DatasetHeader datasetHeader =
DatasetHeaderFactory.getShowClusterParametersHeader();
future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS,
builder.build(), datasetHeader));
diff --git a/thrift-confignode/src/main/thrift/confignode.thrift
b/thrift-confignode/src/main/thrift/confignode.thrift
index 41f67a9c55d..cac6a905c94 100644
--- a/thrift-confignode/src/main/thrift/confignode.thrift
+++ b/thrift-confignode/src/main/thrift/confignode.thrift
@@ -339,6 +339,7 @@ struct TClusterParameters {
12: required i32 seriesPartitionSlotNum
13: required string seriesPartitionExecutorClass
14: required double diskSpaceWarningThreshold
+ 15: required string timestampPrecision
}
struct TConfigNodeRegisterReq {
