You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/11/20 07:49:05 UTC
[iotdb] 01/01: Revert "[IOTDB-4939] Remove unsupported compression type (#8009)"
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch revert-8009-IOTDB-4939
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 753e1f358f65f22827e63ade136c83ffe1ef96f2
Author: Haonan <hh...@outlook.com>
AuthorDate: Sun Nov 20 15:48:58 2022 +0800
Revert "[IOTDB-4939] Remove unsupported compression type (#8009)"
This reverts commit 9170255e07bdb21d8f2a069527b2338dcca4875f.
---
.../db/mpp/plan/parser/StatementGenerator.java | 7 +++----
.../apache/iotdb/db/metadata/SchemaBasicTest.java | 4 ++--
.../plan/SchemaRegionPlanCompatibilityTest.java | 2 +-
.../tsfile/file/metadata/enums/CompressionType.java | 21 ++++++++++++++++++++-
4 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/StatementGenerator.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/StatementGenerator.java
index ab74714580..88884584bd 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/StatementGenerator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/StatementGenerator.java
@@ -546,10 +546,9 @@ public class StatementGenerator {
String prefix = ReadWriteIOUtils.readString(buffer);
isAlign = ReadWriteIOUtils.readBool(buffer);
String measurementName = ReadWriteIOUtils.readString(buffer);
- TSDataType dataType = TSDataType.deserialize(ReadWriteIOUtils.readByte(buffer));
- TSEncoding encoding = TSEncoding.deserialize(ReadWriteIOUtils.readByte(buffer));
- CompressionType compressionType =
- CompressionType.deserialize(ReadWriteIOUtils.readByte(buffer));
+ TSDataType dataType = TSDataType.values()[ReadWriteIOUtils.readByte(buffer)];
+ TSEncoding encoding = TSEncoding.values()[ReadWriteIOUtils.readByte(buffer)];
+ CompressionType compressionType = CompressionType.values()[ReadWriteIOUtils.readByte(buffer)];
if (alignedPrefix.containsKey(prefix) && !isAlign) {
throw new MetadataException("Align designation incorrect at: " + prefix);
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/SchemaBasicTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/SchemaBasicTest.java
index 5e77bf4c8a..69dccf75e2 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/SchemaBasicTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/SchemaBasicTest.java
@@ -963,7 +963,7 @@ public abstract class SchemaBasicTest {
encodingList.add(Arrays.asList(TSEncoding.RLE, TSEncoding.RLE));
List<List<CompressionType>> compressionTypes = new ArrayList<>();
- compressionTypes.add(Collections.singletonList(CompressionType.GZIP));
+ compressionTypes.add(Collections.singletonList(CompressionType.SDT));
compressionTypes.add(Collections.singletonList(CompressionType.SNAPPY));
compressionTypes.add(Arrays.asList(CompressionType.SNAPPY, CompressionType.SNAPPY));
@@ -1095,7 +1095,7 @@ public abstract class SchemaBasicTest {
encodingList.add(Arrays.asList(TSEncoding.RLE, TSEncoding.RLE));
List<List<CompressionType>> compressionTypes = new ArrayList<>();
- compressionTypes.add(Collections.singletonList(CompressionType.GZIP));
+ compressionTypes.add(Collections.singletonList(CompressionType.SDT));
compressionTypes.add(Collections.singletonList(CompressionType.SNAPPY));
compressionTypes.add(Arrays.asList(CompressionType.SNAPPY, CompressionType.SNAPPY));
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/plan/SchemaRegionPlanCompatibilityTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/plan/SchemaRegionPlanCompatibilityTest.java
index 45472776e7..ee917b240b 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/plan/SchemaRegionPlanCompatibilityTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/plan/SchemaRegionPlanCompatibilityTest.java
@@ -197,7 +197,7 @@ public class SchemaRegionPlanCompatibilityTest {
oldPlan.setMeasurements(Arrays.asList("s1", "s2"));
oldPlan.setDataTypes(Arrays.asList(TSDataType.INT32, TSDataType.FLOAT));
oldPlan.setEncodings(Arrays.asList(TSEncoding.GORILLA, TSEncoding.BITMAP));
- oldPlan.setCompressors(Arrays.asList(CompressionType.SNAPPY, CompressionType.GZIP));
+ oldPlan.setCompressors(Arrays.asList(CompressionType.PLA, CompressionType.GZIP));
oldPlan.setAliasList(Arrays.asList("status", "temperature"));
Map<String, String> tagMap = new HashMap<>();
tagMap.put("tag-key", "tag-value");
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/CompressionType.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/CompressionType.java
index 1187d0376d..85893e7bd1 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/CompressionType.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/enums/CompressionType.java
@@ -28,8 +28,19 @@ public enum CompressionType {
/** GZIP */
GZIP(".gzip", (byte) 2),
+ /** LZO */
+ LZO(".lzo", (byte) 3),
+
+ /** SDT */
+ SDT(".sdt", (byte) 4),
+
+ /** PAA */
+ PAA(".paa", (byte) 5),
+
+ /** PLA */
+ PLA(".pla", (byte) 6),
+
/** LZ4 */
- // NOTICE: To ensure the compatibility of existing files, do not change the byte LZ4 binds to.
LZ4(".lz4", (byte) 7);
private final String extensionName;
@@ -54,6 +65,14 @@ public enum CompressionType {
return CompressionType.SNAPPY;
case 2:
return CompressionType.GZIP;
+ case 3:
+ return CompressionType.LZO;
+ case 4:
+ return CompressionType.SDT;
+ case 5:
+ return CompressionType.PAA;
+ case 6:
+ return CompressionType.PLA;
case 7:
return CompressionType.LZ4;
default: