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 31e5893900 [IOTDB-3315] Make unset of ttl in cluster mode same as
0.13.0 version. (#6061)
31e5893900 is described below
commit 31e5893900e736b1032d2129b4bc96fd2aee3350
Author: ZhangHongYin <[email protected]>
AuthorDate: Mon May 30 11:55:08 2022 +0800
[IOTDB-3315] Make unset of ttl in cluster mode same as 0.13.0 version.
(#6061)
---
.../src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java | 1 -
.../java/org/apache/iotdb/db/mpp/common/header/HeaderConstant.java | 4 ++--
.../iotdb/db/mpp/plan/execution/config/ShowStorageGroupTask.java | 7 ++-----
.../org/apache/iotdb/db/mpp/plan/execution/config/ShowTTLTask.java | 5 ++---
4 files changed, 6 insertions(+), 11 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 7e6190111f..d7e08bcadb 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
@@ -95,7 +95,6 @@ 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 708c4b1242..e9951b13ca 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.TEXT),
+ new ColumnHeader(COLUMN_TTL, TSDataType.INT64),
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.TEXT)),
+ new ColumnHeader(COLUMN_TTL, TSDataType.INT64)),
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 9aa47c74d8..79894f4824 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,7 +20,6 @@
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;
@@ -106,11 +105,9 @@ public class ShowStorageGroupTask implements IConfigTask {
builder.getTimeColumnBuilder().writeLong(0L);
builder.getColumnBuilder(0).writeBinary(new Binary(storageGroup));
if (Long.MAX_VALUE == storageGroupSchema.getTTL()) {
- builder.getColumnBuilder(1).writeBinary(new
Binary(IoTDBConstant.TLL_NOT_SET));
+ builder.getColumnBuilder(1).appendNull();
} else {
- builder
- .getColumnBuilder(1)
- .writeBinary(new
Binary(String.valueOf(storageGroupSchema.getTTL())));
+ builder.getColumnBuilder(1).writeLong(storageGroupSchema.getTTL());
}
builder.getColumnBuilder(2).writeInt(storageGroupSchema.getSchemaReplicationFactor());
builder.getColumnBuilder(3).writeInt(storageGroupSchema.getDataReplicationFactor());
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 7f0062329d..02f348d970 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,7 +20,6 @@
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;
@@ -124,9 +123,9 @@ public class ShowTTLTask implements IConfigTask {
builder.getTimeColumnBuilder().writeLong(0);
builder.getColumnBuilder(0).writeBinary(new Binary(entry.getKey()));
if (Long.MAX_VALUE == entry.getValue()) {
- builder.getColumnBuilder(1).writeBinary(new
Binary(IoTDBConstant.TLL_NOT_SET));
+ builder.getColumnBuilder(1).appendNull();
} else {
- builder.getColumnBuilder(1).writeBinary(new
Binary(entry.getValue().toString()));
+ builder.getColumnBuilder(1).writeLong(entry.getValue());
}
builder.declarePosition();
}
