This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/dev/1.3 by this push:
new edb1f085a82 Bump TsFile version to 1.1.2-250725 to introduce
compression type seperated by data type (#16032)
edb1f085a82 is described below
commit edb1f085a82f154a513489bce89b6f0ea1f7b8ed
Author: Jiang Tian <[email protected]>
AuthorDate: Mon Jul 28 14:19:05 2025 +0800
Bump TsFile version to 1.1.2-250725 to introduce compression type seperated
by data type (#16032)
* Bump TsFile version to 1.1.2-250725 to introduce compression type
separated by data type
* Fix tests
---
.../mtree/schemafile/WrappedSegmentTest.java | 4 +-
.../logical/RegionScanLogicalPlannerTest.java | 73 +++++++++++++++++++---
pom.xml | 2 +-
3 files changed, 68 insertions(+), 11 deletions(-)
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/WrappedSegmentTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/WrappedSegmentTest.java
index 856aa2294de..307e57d37c2 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/WrappedSegmentTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/WrappedSegmentTest.java
@@ -87,7 +87,7 @@ public class WrappedSegmentTest {
ByteBuffer recMid01 = sf.getRecord("mid1");
Assert.assertEquals(
- "[measurementNode, alias: mid1als, type: FLOAT, encoding: PLAIN,
compressor: LZ4]",
+ "[measurementNode, alias: mid1als, type: FLOAT, encoding: GORILLA,
compressor: LZ4]",
RecordUtils.buffer2String(recMid01));
int resInsertNode = sf.insertRecord(rNode.getName(),
RecordUtils.node2Buffer(rNode));
@@ -101,7 +101,7 @@ public class WrappedSegmentTest {
System.out.println(nsf);
ByteBuffer nrec = nsf.getRecord("mid1");
Assert.assertEquals(
- "[measurementNode, alias: mid1als, type: FLOAT, encoding: PLAIN,
compressor: LZ4]",
+ "[measurementNode, alias: mid1als, type: FLOAT, encoding: GORILLA,
compressor: LZ4]",
RecordUtils.buffer2String(nsf.getRecord("mid1")));
Assert.assertEquals(
"[entityNode, not aligned, not using template.]",
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java
index 4bee7e70c27..437cad010e9 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java
@@ -35,6 +35,7 @@ import
org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode
import
org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.DeviceRegionScanNode;
import
org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.TimeseriesRegionScanNode;
+import org.apache.tsfile.common.conf.TSFileDescriptor;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.PlainDeviceID;
import org.junit.Assert;
@@ -67,17 +68,38 @@ public class RegionScanLogicalPlannerTest {
new MeasurementPath("root.sg.d1.s1", TSDataType.INT32),
Collections.singletonList(
new TimeseriesContext(
- "INT32", null, "PLAIN", "LZ4", "{\"key1\":\"value1\"}", null,
null, null)));
+ "INT32",
+ null,
+
TSFileDescriptor.getInstance().getConfig().getValueEncoder(TSDataType.INT32),
+ "LZ4",
+ "{\"key1\":\"value1\"}",
+ null,
+ null,
+ null)));
timeseriesSchemaInfoMap.put(
new MeasurementPath("root.sg.d1.s2", TSDataType.DOUBLE),
Collections.singletonList(
new TimeseriesContext(
- "DOUBLE", "status", "PLAIN", "LZ4", "{\"key1\":\"value1\"}",
null, null, null)));
+ "DOUBLE",
+ "status",
+
TSFileDescriptor.getInstance().getConfig().getValueEncoder(TSDataType.DOUBLE),
+ "LZ4",
+ "{\"key1\":\"value1\"}",
+ null,
+ null,
+ null)));
timeseriesSchemaInfoMap.put(
new MeasurementPath("root.sg.d1.s3", TSDataType.BOOLEAN),
Collections.singletonList(
new TimeseriesContext(
- "BOOLEAN", null, "PLAIN", "LZ4", "{\"key1\":\"value2\"}",
null, null, null)));
+ "BOOLEAN",
+ null,
+
TSFileDescriptor.getInstance().getConfig().getValueEncoder(TSDataType.BOOLEAN),
+ "LZ4",
+ "{\"key1\":\"value2\"}",
+ null,
+ null,
+ null)));
deviceToTimeseriesSchemaInfoMap.put(
new PartialPath(new PlainDeviceID("root.sg.d1")),
timeseriesSchemaInfoMap);
@@ -86,17 +108,38 @@ public class RegionScanLogicalPlannerTest {
new MeasurementPath("root.sg.d2.s1", TSDataType.INT32),
Collections.singletonList(
new TimeseriesContext(
- "INT32", null, "PLAIN", "LZ4", "{\"key1\":\"value1\"}", null,
null, null)));
+ "INT32",
+ null,
+
TSFileDescriptor.getInstance().getConfig().getValueEncoder(TSDataType.INT32),
+ "LZ4",
+ "{\"key1\":\"value1\"}",
+ null,
+ null,
+ null)));
timeseriesSchemaInfoMap2.put(
new MeasurementPath("root.sg.d2.s2", TSDataType.DOUBLE),
Collections.singletonList(
new TimeseriesContext(
- "DOUBLE", "status", "PLAIN", "LZ4", "{\"key1\":\"value1\"}",
null, null, null)));
+ "DOUBLE",
+ "status",
+
TSFileDescriptor.getInstance().getConfig().getValueEncoder(TSDataType.DOUBLE),
+ "LZ4",
+ "{\"key1\":\"value1\"}",
+ null,
+ null,
+ null)));
timeseriesSchemaInfoMap2.put(
new MeasurementPath("root.sg.d2.s4", TSDataType.TEXT),
Collections.singletonList(
new TimeseriesContext(
- "TEXT", null, "PLAIN", "LZ4", "{\"key2\":\"value1\"}", null,
null, null)));
+ "TEXT",
+ null,
+
TSFileDescriptor.getInstance().getConfig().getValueEncoder(TSDataType.TEXT),
+ "LZ4",
+ "{\"key2\":\"value1\"}",
+ null,
+ null,
+ null)));
deviceToTimeseriesSchemaInfoMap.put(
new PartialPath(new PlainDeviceID("root.sg.d2")),
timeseriesSchemaInfoMap2);
@@ -107,10 +150,24 @@ public class RegionScanLogicalPlannerTest {
Map<PartialPath, List<TimeseriesContext>> timeseriesSchemaInfoMap3 = new
HashMap<>();
timeseriesContextList.add(
new TimeseriesContext(
- "INT32", null, "PLAIN", "LZ4", "{\"key1\":\"value1\"}", null,
null, null));
+ "INT32",
+ null,
+
TSFileDescriptor.getInstance().getConfig().getValueEncoder(TSDataType.INT32),
+ "LZ4",
+ "{\"key1\":\"value1\"}",
+ null,
+ null,
+ null));
timeseriesContextList.add(
new TimeseriesContext(
- "DOUBLE", "status", "PLAIN", "LZ4", "{\"key1\":\"value1\"}", null,
null, null));
+ "DOUBLE",
+ "status",
+
TSFileDescriptor.getInstance().getConfig().getValueEncoder(TSDataType.DOUBLE),
+ "LZ4",
+ "{\"key1\":\"value1\"}",
+ null,
+ null,
+ null));
timeseriesSchemaInfoMap3.put(
new AlignedPath("root.sg.d2.a", schemas, Collections.emptyList()),
timeseriesContextList);
deviceToTimeseriesSchemaInfoMap.put(
diff --git a/pom.xml b/pom.xml
index f4e94de7a97..2ae4f3a04e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@
<thrift.version>0.14.1</thrift.version>
<xz.version>1.9</xz.version>
<zstd-jni.version>1.5.6-3</zstd-jni.version>
- <tsfile.version>1.1.2-250703-SNAPSHOT</tsfile.version>
+ <tsfile.version>1.1.2-250725-SNAPSHOT</tsfile.version>
</properties>
<!--
if we claim dependencies in dependencyManagement, then we do not claim
