You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ma...@apache.org on 2022/11/16 08:10:29 UTC
[iotdb] branch IOTDB-4939 created (now 5d6a2db6c1)
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a change to branch IOTDB-4939
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 5d6a2db6c1 remove unsupport compression type
This branch includes the following new commits:
new 5d6a2db6c1 remove unsupport compression type
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: remove unsupport compression type
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a commit to branch IOTDB-4939
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5d6a2db6c12bf2006923d510ba69c50d722e9631
Author: LiuXuxin <li...@outlook.com>
AuthorDate: Wed Nov 16 16:10:11 2022 +0800
remove unsupport compression type
---
.../apache/iotdb/db/metadata/SchemaBasicTest.java | 4 ++--
.../plan/SchemaRegionPlanCompatibilityTest.java | 2 +-
.../tsfile/file/metadata/enums/CompressionType.java | 21 +--------------------
3 files changed, 4 insertions(+), 23 deletions(-)
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 69dccf75e2..5e77bf4c8a 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.SDT));
+ compressionTypes.add(Collections.singletonList(CompressionType.GZIP));
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.SDT));
+ compressionTypes.add(Collections.singletonList(CompressionType.GZIP));
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 ee917b240b..45472776e7 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.PLA, CompressionType.GZIP));
+ oldPlan.setCompressors(Arrays.asList(CompressionType.SNAPPY, 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 85893e7bd1..1187d0376d 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,19 +28,8 @@ 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;
@@ -65,14 +54,6 @@ 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: