You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/01/07 08:15:50 UTC
[incubator-iotdb] branch master updated: add_compression (#708)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 1b66c8a add_compression (#708)
1b66c8a is described below
commit 1b66c8a5960265dfcede1328b73dc1202a2d2b67
Author: Boris <zh...@gmail.com>
AuthorDate: Tue Jan 7 16:15:41 2020 +0800
add_compression (#708)
---
.../main/java/org/apache/iotdb/db/conf/IoTDBConstant.java | 1 +
.../src/main/java/org/apache/iotdb/db/metadata/MTree.java | 3 ++-
.../iotdb/db/qp/executor/AbstractQueryProcessExecutor.java | 6 ++++--
.../main/java/org/apache/iotdb/db/service/StaticResps.java | 9 +++++++--
.../apache/iotdb/db/integration/IoTDBMetadataFetchIT.java | 14 +++++++-------
5 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
index 056d760..2975fe9 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
@@ -62,6 +62,7 @@ public class IoTDBConstant {
public static final String COLUMN_TIMESERIES = "timeseries";
public static final String COLUMN_TIMESERIES_DATATYPE = "dataType";
public static final String COLUMN_TIMESERIES_ENCODING = "encoding";
+ public static final String COLUMN_TIMESERIES_COMPRESSION = "compression";
public static final String COLUMN_CHILD_PATHS = "child paths";
public static final String COLUMN_DEVICES = "devices";
public static final String COLUMN_COLUMN = "column";
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java b/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
index 2c5e2ef..d84e735 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MTree.java
@@ -997,12 +997,13 @@ public class MTree implements Serializable {
if (node.isLeaf()) {
if (nodes.length <= idx) {
String nodePath = parent + node;
- List<String> tsRow = new ArrayList<>(4);// get [name,storage group,resultDataType,encoding]
+ List<String> tsRow = new ArrayList<>(5);// get [name,storage group,resultDataType,encoding]
tsRow.add(nodePath);
MeasurementSchema measurementSchema = node.getSchema();
tsRow.add(node.getDataFileName());
tsRow.add(measurementSchema.getType().toString());
tsRow.add(measurementSchema.getEncodingType().toString());
+ tsRow.add(measurementSchema.getCompressor().toString());
res.add(tsRow);
}
return;
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java b/server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
index 8c4890c..30359cc 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
@@ -27,6 +27,7 @@ import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_ITEM;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_PARAMETER;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_STORAGE_GROUP;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES;
+import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES_COMPRESSION;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES_DATATYPE;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES_ENCODING;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TTL;
@@ -226,8 +227,9 @@ public abstract class AbstractQueryProcessExecutor implements IQueryProcessExecu
new Path(COLUMN_TIMESERIES),
new Path(COLUMN_STORAGE_GROUP),
new Path(COLUMN_TIMESERIES_DATATYPE),
- new Path(COLUMN_TIMESERIES_ENCODING)),
- Arrays.asList(TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT));
+ new Path(COLUMN_TIMESERIES_ENCODING),
+ new Path(COLUMN_TIMESERIES_COMPRESSION)),
+ Arrays.asList(TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT));
List<List<String>> timeseriesList = MManager.getInstance()
.getShowTimeseriesPath(timeSeriesPlan.getPath().toString());
for(List<String> list : timeseriesList) {
diff --git a/server/src/main/java/org/apache/iotdb/db/service/StaticResps.java b/server/src/main/java/org/apache/iotdb/db/service/StaticResps.java
index 12b886e..c600551 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/StaticResps.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/StaticResps.java
@@ -29,6 +29,7 @@ import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_PRIVILEGE;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_ROLE;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_STORAGE_GROUP;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES;
+import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES_COMPRESSION;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES_DATATYPE;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TIMESERIES_ENCODING;
import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_TTL;
@@ -70,8 +71,12 @@ class StaticResps {
static final TSExecuteStatementResp SHOW_TIMESERIES_RESP = getNoTimeExecuteResp(
Arrays.asList(COLUMN_TIMESERIES, COLUMN_STORAGE_GROUP, COLUMN_TIMESERIES_DATATYPE,
- COLUMN_TIMESERIES_ENCODING),
- Arrays.asList(TSDataType.TEXT.toString(), TSDataType.TEXT.toString(), TSDataType.TEXT.toString(), TSDataType.TEXT.toString()));
+ COLUMN_TIMESERIES_ENCODING, COLUMN_TIMESERIES_COMPRESSION),
+ Arrays.asList(TSDataType.TEXT.toString(),
+ TSDataType.TEXT.toString(),
+ TSDataType.TEXT.toString(),
+ TSDataType.TEXT.toString(),
+ TSDataType.TEXT.toString()));
static final TSExecuteStatementResp SHOW_DEVICES = getNoTimeExecuteResp(
Collections.singletonList(COLUMN_DEVICES),
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
index 9a15850..c7a38f6 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
@@ -93,16 +93,16 @@ public class IoTDBMetadataFetchIT {
"show timeseries root.a.b", // nonexistent timeseries, thus returning ""
};
String[] standards = new String[]{
- "root.ln.wf01.wt01.status,root.ln.wf01.wt01,BOOLEAN,PLAIN,\n",
+ "root.ln.wf01.wt01.status,root.ln.wf01.wt01,BOOLEAN,PLAIN,UNCOMPRESSED,\n",
- "root.ln.wf01.wt01.status,root.ln.wf01.wt01,BOOLEAN,PLAIN,\n"
- + "root.ln.wf01.wt01.temperature,root.ln.wf01.wt01,FLOAT,RLE,\n",
+ "root.ln.wf01.wt01.status,root.ln.wf01.wt01,BOOLEAN,PLAIN,UNCOMPRESSED,\n"
+ + "root.ln.wf01.wt01.temperature,root.ln.wf01.wt01,FLOAT,RLE,SNAPPY,\n",
- "root.ln.wf01.wt01.status,root.ln.wf01.wt01,BOOLEAN,PLAIN,\n"
- + "root.ln.wf01.wt01.temperature,root.ln.wf01.wt01,FLOAT,RLE,\n",
+ "root.ln.wf01.wt01.status,root.ln.wf01.wt01,BOOLEAN,PLAIN,UNCOMPRESSED,\n"
+ + "root.ln.wf01.wt01.temperature,root.ln.wf01.wt01,FLOAT,RLE,SNAPPY,\n",
- "root.ln.wf01.wt01.status,root.ln.wf01.wt01,BOOLEAN,PLAIN,\n"
- + "root.ln.wf01.wt01.temperature,root.ln.wf01.wt01,FLOAT,RLE,\n",
+ "root.ln.wf01.wt01.status,root.ln.wf01.wt01,BOOLEAN,PLAIN,UNCOMPRESSED,\n"
+ + "root.ln.wf01.wt01.temperature,root.ln.wf01.wt01,FLOAT,RLE,SNAPPY,\n",
"",