You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2023/09/11 00:25:25 UTC
[iotdb] 01/01: Change default encoder of INT32 and INT64 from RLE to TS_2DIFF
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ChangeDefaultEncode
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4fe8f1c53ce44acc93f5751d3ab230c8c5128bef
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Mon Sep 11 08:25:09 2023 +0800
Change default encoder of INT32 and INT64 from RLE to TS_2DIFF
---
.../iotdb/db/it/schema/IoTDBMetadataFetchIT.java | 8 +++---
.../iotdb/db/it/schema/IoTDBSchemaTemplateIT.java | 29 ++++++++++++----------
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 4 +--
.../resources/conf/iotdb-common.properties | 4 +--
4 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBMetadataFetchIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBMetadataFetchIT.java
index 52eff89bf4b..07fb82076f2 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBMetadataFetchIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBMetadataFetchIT.java
@@ -131,7 +131,7 @@ public class IoTDBMetadataFetchIT extends AbstractSchemaIT {
Arrays.asList(
"root.ln.wf01.wt01.status,null,root.ln.wf01.wt01,BOOLEAN,PLAIN,LZ4,null,null,null,null,BASE,",
"root.ln.wf01.wt01.temperature,null,root.ln.wf01.wt01,FLOAT,RLE,SNAPPY,null,null,null,null,BASE,",
- "root.ln.wf01.wt02.s1,null,root.ln.wf01.wt02,INT32,RLE,LZ4,null,null,null,null,BASE,",
+ "root.ln.wf01.wt02.s1,null,root.ln.wf01.wt02,INT32,TS_2DIFF,LZ4,null,null,null,null,BASE,",
"root.ln.wf01.wt02.s2,null,root.ln.wf01.wt02,DOUBLE,GORILLA,LZ4,null,null,null,null,BASE,")),
new HashSet<>(
Arrays.asList(
@@ -141,7 +141,7 @@ public class IoTDBMetadataFetchIT extends AbstractSchemaIT {
Arrays.asList(
"root.ln.wf01.wt01.status,null,root.ln.wf01.wt01,BOOLEAN,PLAIN,LZ4,null,null,null,null,BASE,",
"root.ln.wf01.wt01.temperature,null,root.ln.wf01.wt01,FLOAT,RLE,SNAPPY,null,null,null,null,BASE,",
- "root.ln.wf01.wt02.s1,null,root.ln.wf01.wt02,INT32,RLE,LZ4,null,null,null,null,BASE,",
+ "root.ln.wf01.wt02.s1,null,root.ln.wf01.wt02,INT32,TS_2DIFF,LZ4,null,null,null,null,BASE,",
"root.ln.wf01.wt02.s2,null,root.ln.wf01.wt02,DOUBLE,GORILLA,LZ4,null,null,null,null,BASE,",
"root.ln1.wf01.wt01.status,null,root.ln1.wf01.wt01,BOOLEAN,PLAIN,LZ4,null,null,null,null,BASE,",
"root.ln1.wf01.wt01.temperature,null,root.ln1.wf01.wt01,FLOAT,RLE,SNAPPY,null,null,null,null,BASE,",
@@ -717,7 +717,7 @@ public class IoTDBMetadataFetchIT extends AbstractSchemaIT {
"create aligned timeseries root.sg.d(s1(alias1) int32 tags('tag1'='v1', 'tag2'='v2'), s2 double attributes('attr3'='v3'))");
String[] expected =
new String[] {
- "root.sg.d.s1,alias1,root.sg,INT32,RLE,LZ4,{\"tag1\":\"v1\",\"tag2\":\"v2\"},null,null,null,BASE,",
+ "root.sg.d.s1,alias1,root.sg,INT32,TS_2DIFF,LZ4,{\"tag1\":\"v1\",\"tag2\":\"v2\"},null,null,null,BASE,",
"root.sg.d.s2,null,root.sg,DOUBLE,GORILLA,LZ4,null,{\"attr3\":\"v3\"},null,null,BASE,"
};
@@ -785,7 +785,7 @@ public class IoTDBMetadataFetchIT extends AbstractSchemaIT {
Set<String> standard =
new HashSet<>(
Arrays.asList(
- "root.sg1.d0.s0,null,root.sg1,INT32,RLE,LZ4,null,null,null,null,BASE,\n",
+ "root.sg1.d0.s0,null,root.sg1,INT32,TS_2DIFF,LZ4,null,null,null,null,BASE,\n",
"root.sg1.d0.s1,null,root.sg1,INT32,PLAIN,LZ4,null,null,SDT,{compdev=2},BASE,\n",
"root.sg1.d0.s2,null,root.sg1,INT32,PLAIN,LZ4,null,null,SDT,{compdev=0.01, compmintime=2, compmaxtime=15},BASE,\n"));
try (ResultSet resultSet = statement.executeQuery("SHOW TIMESERIES root.sg1.d0.*")) {
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaTemplateIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaTemplateIT.java
index 2e91bad4af3..44612d8b552 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaTemplateIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaTemplateIT.java
@@ -147,11 +147,11 @@ public class IoTDBSchemaTemplateIT extends AbstractSchemaIT {
Set<String> expectedResult =
new HashSet<>(
Arrays.asList(
- "root.sg1.d1.s1,INT64,RLE,LZ4",
+ "root.sg1.d1.s1,INT64,TS_2DIFF,LZ4",
"root.sg1.d1.s2,DOUBLE,GORILLA,LZ4",
- "root.sg1.d2.s1,INT64,RLE,LZ4",
+ "root.sg1.d2.s1,INT64,TS_2DIFF,LZ4",
"root.sg1.d2.s2,DOUBLE,GORILLA,LZ4",
- "root.sg1.d3.s1,INT64,RLE,LZ4"));
+ "root.sg1.d3.s1,INT64,TS_2DIFF,LZ4"));
try (ResultSet resultSet = statement.executeQuery("SHOW TIMESERIES root.sg1.**"); ) {
while (resultSet.next()) {
@@ -230,9 +230,9 @@ public class IoTDBSchemaTemplateIT extends AbstractSchemaIT {
Set<String> expectedResult =
new HashSet<>(
Arrays.asList(
- "root.sg1.d1.s1,INT64,RLE,LZ4",
+ "root.sg1.d1.s1,INT64,TS_2DIFF,LZ4",
"root.sg1.d1.s2,DOUBLE,GORILLA,LZ4",
- "root.sg1.d2.s1,INT64,RLE,LZ4",
+ "root.sg1.d2.s1,INT64,TS_2DIFF,LZ4",
"root.sg1.d2.s2,DOUBLE,GORILLA,LZ4"));
try (ResultSet resultSet = statement.executeQuery("SHOW TIMESERIES root.sg1.**")) {
@@ -316,7 +316,7 @@ public class IoTDBSchemaTemplateIT extends AbstractSchemaIT {
public void testShowNodesInSchemaTemplate() throws SQLException {
// set schema template
Set<String> expectedResultSet =
- new HashSet<>(Arrays.asList("s1,INT64,RLE,LZ4", "s2,DOUBLE,GORILLA,LZ4"));
+ new HashSet<>(Arrays.asList("s1,INT64,TS_2DIFF,LZ4", "s2,DOUBLE,GORILLA,LZ4"));
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement();
ResultSet resultSet = statement.executeQuery("SHOW NODES IN SCHEMA TEMPLATE t1")) {
@@ -466,7 +466,8 @@ public class IoTDBSchemaTemplateIT extends AbstractSchemaIT {
expectedResult =
new HashSet<>(
- Arrays.asList("root.sg1.d1.s1,INT64,RLE,LZ4", "root.sg1.d2.s1,INT64,RLE,LZ4"));
+ Arrays.asList(
+ "root.sg1.d1.s1,INT64,TS_2DIFF,LZ4", "root.sg1.d2.s1,INT64,TS_2DIFF,LZ4"));
try (ResultSet resultSet = statement.executeQuery("SHOW TIMESERIES root.**.s1")) {
while (resultSet.next()) {
@@ -519,7 +520,8 @@ public class IoTDBSchemaTemplateIT extends AbstractSchemaIT {
}
Assert.assertTrue(expectedResult.isEmpty());
- expectedResult = new HashSet<>(Collections.singletonList("root.sg1.d1.s1,INT64,RLE,LZ4"));
+ expectedResult =
+ new HashSet<>(Collections.singletonList("root.sg1.d1.s1,INT64,TS_2DIFF,LZ4"));
try (ResultSet resultSet = statement.executeQuery("SHOW TIMESERIES root.**.s1")) {
while (resultSet.next()) {
@@ -683,11 +685,11 @@ public class IoTDBSchemaTemplateIT extends AbstractSchemaIT {
Set<String> expectedResult =
new HashSet<>(
Arrays.asList(
- "root.sg1.d1.s1,INT64,RLE,LZ4",
+ "root.sg1.d1.s1,INT64,TS_2DIFF,LZ4",
"root.sg1.d1.s2,DOUBLE,GORILLA,LZ4",
- "root.sg2.d2.s1,INT64,RLE,LZ4",
+ "root.sg2.d2.s1,INT64,TS_2DIFF,LZ4",
"root.sg2.d2.s2,DOUBLE,GORILLA,LZ4",
- "root.sg3.d3.s1,INT64,RLE,LZ4"));
+ "root.sg3.d3.s1,INT64,TS_2DIFF,LZ4"));
try (ResultSet resultSet = statement.executeQuery("SHOW TIMESERIES root.sg*.*.s*")) {
while (resultSet.next()) {
@@ -706,7 +708,8 @@ public class IoTDBSchemaTemplateIT extends AbstractSchemaIT {
Assert.assertTrue(expectedResult.isEmpty());
expectedResult =
new HashSet<>(
- Arrays.asList("root.sg1.d1.s1,INT64,RLE,LZ4", "root.sg1.d1.s2,DOUBLE,GORILLA,LZ4"));
+ Arrays.asList(
+ "root.sg1.d1.s1,INT64,TS_2DIFF,LZ4", "root.sg1.d1.s2,DOUBLE,GORILLA,LZ4"));
try (ResultSet resultSet = statement.executeQuery("SHOW TIMESERIES root.sg1.d1.s*")) {
while (resultSet.next()) {
@@ -749,7 +752,7 @@ public class IoTDBSchemaTemplateIT extends AbstractSchemaIT {
Set<String> expectedResult =
new HashSet<>(
Arrays.asList(
- "root.sg1.d.s1,INT32,RLE,LZ4",
+ "root.sg1.d.s1,INT32,TS_2DIFF,LZ4",
"root.sg1.d.s2,FLOAT,GORILLA,LZ4",
"root.sg1.d.s3,FLOAT,GORILLA,LZ4"));
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 38c2f61622f..6c9722ab1fd 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -636,10 +636,10 @@ public class IoTDBConfig {
private TSEncoding defaultBooleanEncoding = TSEncoding.RLE;
/** INT32 encoding when creating schema automatically is enabled */
- private TSEncoding defaultInt32Encoding = TSEncoding.RLE;
+ private TSEncoding defaultInt32Encoding = TSEncoding.TS_2DIFF;
/** INT64 encoding when creating schema automatically is enabled */
- private TSEncoding defaultInt64Encoding = TSEncoding.RLE;
+ private TSEncoding defaultInt64Encoding = TSEncoding.TS_2DIFF;
/** FLOAT encoding when creating schema automatically is enabled */
private TSEncoding defaultFloatEncoding = TSEncoding.GORILLA;
diff --git a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
index 277e7c3d17c..7df47be25aa 100644
--- a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
+++ b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
@@ -345,11 +345,11 @@ cluster_name=defaultCluster
# INT32 encoding when creating schema automatically is enabled
# Datatype: TSEncoding
-# default_int32_encoding=RLE
+# default_int32_encoding=TS_2DIFF
# INT64 encoding when creating schema automatically is enabled
# Datatype: TSEncoding
-# default_int64_encoding=RLE
+# default_int64_encoding=TS_2DIFF
# FLOAT encoding when creating schema automatically is enabled
# Datatype: TSEncoding