This is an automated email from the ASF dual-hosted git repository.
xingtanzjr 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 eb9b204475 update show ttl and show storage group. (#6040)
eb9b204475 is described below
commit eb9b2044752e0bc2f61a393c282fb219424a4193
Author: ZhangHongYin <[email protected]>
AuthorDate: Sat May 28 10:49:59 2022 +0800
update show ttl and show storage group. (#6040)
---
.../main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java | 1 +
.../org/apache/iotdb/db/mpp/common/header/HeaderConstant.java | 4 ++--
.../db/mpp/plan/execution/config/ShowStorageGroupTask.java | 9 ++++++++-
.../apache/iotdb/db/mpp/plan/execution/config/ShowTTLTask.java | 10 +++++++---
4 files changed, 18 insertions(+), 6 deletions(-)
diff --git
a/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
b/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
index 10e335f910..3d0afc8d00 100644
---
a/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
+++
b/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
@@ -84,6 +84,7 @@ public class IoTDBConstant {
public static final String COLUMN_IS_ALIGNED = "isAligned";
public static final String QUERY_ID = "queryId";
public static final String STATEMENT = "statement";
+ public static final String TLL_NOT_SET = "not set";
public static final String COLUMN_ROLE = "role";
public static final String COLUMN_USER = "user";
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/HeaderConstant.java
b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/HeaderConstant.java
index e9951b13ca..708c4b1242 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/HeaderConstant.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/HeaderConstant.java
@@ -132,7 +132,7 @@ public class HeaderConstant {
new DatasetHeader(
Arrays.asList(
new ColumnHeader(COLUMN_STORAGE_GROUP, TSDataType.TEXT),
- new ColumnHeader(COLUMN_TTL, TSDataType.INT64),
+ new ColumnHeader(COLUMN_TTL, TSDataType.TEXT),
new ColumnHeader(COLUMN_SCHEMA_REPLICATION_FACTOR,
TSDataType.INT32),
new ColumnHeader(COLUMN_DATA_REPLICATION_FACTOR,
TSDataType.INT32),
new ColumnHeader(COLUMN_TIME_PARTITION_INTERVAL,
TSDataType.INT64)),
@@ -141,7 +141,7 @@ public class HeaderConstant {
new DatasetHeader(
Arrays.asList(
new ColumnHeader(COLUMN_STORAGE_GROUP, TSDataType.TEXT),
- new ColumnHeader(COLUMN_TTL, TSDataType.INT64)),
+ new ColumnHeader(COLUMN_TTL, TSDataType.TEXT)),
true);
showChildPathsHeader =
new DatasetHeader(
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ShowStorageGroupTask.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ShowStorageGroupTask.java
index f066287187..9aa47c74d8 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ShowStorageGroupTask.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ShowStorageGroupTask.java
@@ -20,6 +20,7 @@
package org.apache.iotdb.db.mpp.plan.execution.config;
import org.apache.iotdb.commons.client.IClientManager;
+import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.consensus.PartitionRegionId;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.PartialPath;
@@ -104,7 +105,13 @@ public class ShowStorageGroupTask implements IConfigTask {
TStorageGroupSchema storageGroupSchema = entry.getValue();
builder.getTimeColumnBuilder().writeLong(0L);
builder.getColumnBuilder(0).writeBinary(new Binary(storageGroup));
- builder.getColumnBuilder(1).writeLong(storageGroupSchema.getTTL());
+ if (Long.MAX_VALUE == storageGroupSchema.getTTL()) {
+ builder.getColumnBuilder(1).writeBinary(new
Binary(IoTDBConstant.TLL_NOT_SET));
+ } else {
+ builder
+ .getColumnBuilder(1)
+ .writeBinary(new
Binary(String.valueOf(storageGroupSchema.getTTL())));
+ }
builder.getColumnBuilder(2).writeInt(storageGroupSchema.getSchemaReplicationFactor());
builder.getColumnBuilder(3).writeInt(storageGroupSchema.getDataReplicationFactor());
builder.getColumnBuilder(4).writeLong(storageGroupSchema.getTimePartitionInterval());
diff --git
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ShowTTLTask.java
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ShowTTLTask.java
index f30978ebe1..7f0062329d 100644
---
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ShowTTLTask.java
+++
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ShowTTLTask.java
@@ -20,6 +20,7 @@
package org.apache.iotdb.db.mpp.plan.execution.config;
import org.apache.iotdb.commons.client.IClientManager;
+import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.consensus.PartitionRegionId;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.PartialPath;
@@ -34,7 +35,6 @@ import org.apache.iotdb.db.mpp.common.header.DatasetHeader;
import org.apache.iotdb.db.mpp.common.header.HeaderConstant;
import org.apache.iotdb.db.mpp.plan.statement.metadata.ShowTTLStatement;
import org.apache.iotdb.rpc.TSStatusCode;
-import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.block.TsBlockBuilder;
import org.apache.iotdb.tsfile.utils.Binary;
@@ -119,11 +119,15 @@ public class ShowTTLTask implements IConfigTask {
}
}
// build TSBlock
- TsBlockBuilder builder = new TsBlockBuilder(Arrays.asList(TSDataType.TEXT,
TSDataType.INT64));
+ TsBlockBuilder builder = new
TsBlockBuilder(HeaderConstant.showTTLHeader.getRespDataTypes());
for (Map.Entry<String, Long> entry : storageGroupToTTL.entrySet()) {
builder.getTimeColumnBuilder().writeLong(0);
builder.getColumnBuilder(0).writeBinary(new Binary(entry.getKey()));
- builder.getColumnBuilder(1).writeLong(entry.getValue());
+ if (Long.MAX_VALUE == entry.getValue()) {
+ builder.getColumnBuilder(1).writeBinary(new
Binary(IoTDBConstant.TLL_NOT_SET));
+ } else {
+ builder.getColumnBuilder(1).writeBinary(new
Binary(entry.getValue().toString()));
+ }
builder.declarePosition();
}
DatasetHeader datasetHeader = HeaderConstant.showTTLHeader;
