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 856aa2294de1..307e57d37c26 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 void flatTreeInsert() throws MetadataException { 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 void flatTreeInsert() throws MetadataException { 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 4bee7e70c27c..437cad010e9c 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.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> 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 f4e94de7a972..2ae4f3a04e44 100644 --- a/pom.xml +++ b/pom.xml @@ -175,7 +175,7 @@ 0.14.1 1.9 1.5.6-3 - 1.1.2-250703-SNAPSHOT + 1.1.2-250725-SNAPSHOT