Skip to content

Commit 1392e03

Browse files
authored
[IOTDB-5919]show variables add a variable timestamp_precision (#9936)
1 parent 12d67e0 commit 1392e03

File tree

6 files changed

+21
-0
lines changed

6 files changed

+21
-0
lines changed

confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java

+1
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ public TClusterParameters getClusterParameters() {
480480
clusterParameters.setSchemaRegionPerDataNode(CONF.getSchemaRegionPerDataNode());
481481
clusterParameters.setDiskSpaceWarningThreshold(COMMON_CONF.getDiskSpaceWarningThreshold());
482482
clusterParameters.setReadConsistencyLevel(CONF.getReadConsistencyLevel());
483+
clusterParameters.setTimestampPrecision(COMMON_CONF.getTimestampPrecision());
483484
return clusterParameters;
484485
}
485486

node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java

+10
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ public class CommonConfig {
128128
/** Ip and port of target ML node. */
129129
private TEndPoint targetMLNodeEndPoint = new TEndPoint("127.0.0.1", 10810);
130130

131+
private String timestampPrecision = "ms";
132+
131133
CommonConfig() {}
132134

133135
public void updatePath(String homeDir) {
@@ -376,4 +378,12 @@ public boolean isStopping() {
376378
public void setStopping(boolean stopping) {
377379
isStopping = stopping;
378380
}
381+
382+
public void setTimestampPrecision(String timestampPrecision) {
383+
this.timestampPrecision = timestampPrecision;
384+
}
385+
386+
public String getTimestampPrecision() {
387+
return timestampPrecision;
388+
}
379389
}

node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java

+3
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,9 @@ public void loadCommonProps(Properties properties) {
188188
String.valueOf(config.getDiskSpaceWarningThreshold()))
189189
.trim()));
190190

191+
config.setTimestampPrecision(
192+
properties.getProperty("timestamp_precision", config.getTimestampPrecision()).trim());
193+
191194
String endPointUrl =
192195
properties.getProperty(
193196
"target_ml_node_endpoint",

server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java

+2
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ public class ColumnHeaderConstant {
119119
public static final String READ_CONSISTENCY_LEVEL = "ReadConsistencyLevel";
120120
public static final String DISK_SPACE_WARNING_THRESHOLD = "DiskSpaceWarningThreshold";
121121

122+
public static final String TIMESTAMP_PRECISION = "TimestampPrecision";
123+
122124
// column names for show region statement
123125
public static final String REGION_ID = "RegionId";
124126
public static final String TYPE = "Type";

server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowVariablesTask.java

+4
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ public static void buildTSBlock(
117117
builder,
118118
new Binary(ColumnHeaderConstant.DISK_SPACE_WARNING_THRESHOLD),
119119
new Binary(String.valueOf(clusterParameters.getDiskSpaceWarningThreshold())));
120+
buildTSBlock(
121+
builder,
122+
new Binary(ColumnHeaderConstant.TIMESTAMP_PRECISION),
123+
new Binary(String.valueOf(clusterParameters.getTimestampPrecision())));
120124

121125
DatasetHeader datasetHeader = DatasetHeaderFactory.getShowClusterParametersHeader();
122126
future.set(new ConfigTaskResult(TSStatusCode.SUCCESS_STATUS, builder.build(), datasetHeader));

thrift-confignode/src/main/thrift/confignode.thrift

+1
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ struct TClusterParameters {
352352
12: required i32 seriesPartitionSlotNum
353353
13: required string seriesPartitionExecutorClass
354354
14: required double diskSpaceWarningThreshold
355+
15: required string timestampPrecision
355356
}
356357

357358
struct TConfigNodeRegisterReq {

0 commit comments

Comments
 (0)