This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch new_vector in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5c5bb200fdd3724fafae1a7e0d54c6b16a722536 Author: JackieTien97 <[email protected]> AuthorDate: Thu Nov 4 16:19:19 2021 +0800 change some --- .../iotdb/AlignedTimeseriesSessionExample.java | 40 +++++++++++----------- .../iotdb/db/query/reader/chunk/MemPageReader.java | 13 ++----- .../write/writer/RestorableTsFileIOWriter.java | 6 ++-- 3 files changed, 25 insertions(+), 34 deletions(-) diff --git a/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java b/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java index c7a7fa7..3e95a55 100644 --- a/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java +++ b/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java @@ -41,7 +41,7 @@ import java.util.Map; public class AlignedTimeseriesSessionExample { private static Session session; - private static final String ROOT_SG1_D1_VECTOR1 = "root.sg_1.d1.vector"; + private static final String ROOT_SG1_D1_VECTOR1 = "root.sg_1.d1"; private static final String ROOT_SG1_D1_VECTOR2 = "root.sg_1.d1.vector2"; private static final String ROOT_SG1_D1_VECTOR3 = "root.sg_1.d1.vector3"; private static final String ROOT_SG2_D1_VECTOR4 = "root.sg_2.d1.vector4"; @@ -58,42 +58,42 @@ public class AlignedTimeseriesSessionExample { // set session fetchSize session.setFetchSize(10000); - createTemplate(); + // createTemplate(); createAlignedTimeseries(); insertAlignedRecord(); - insertAlignedRecords(); - insertAlignedRecordsOfOneDevices(); + // insertAlignedRecords(); + // insertAlignedRecordsOfOneDevices(); - insertAlignedStringRecord(); - insertAlignedStringRecords(); + // insertAlignedStringRecord(); + // insertAlignedStringRecords(); - insertTabletWithAlignedTimeseriesMethod1(); - insertTabletWithAlignedTimeseriesMethod2(); - insertNullableTabletWithAlignedTimeseries(); - insertTabletsWithAlignedTimeseries(); + // insertTabletWithAlignedTimeseriesMethod1(); + // insertTabletWithAlignedTimeseriesMethod2(); + // insertNullableTabletWithAlignedTimeseries(); + // insertTabletsWithAlignedTimeseries(); selectTest(); - selectWithValueFilterTest(); - selectWithGroupByTest(); - selectWithLastTest(); + // selectWithValueFilterTest(); + // selectWithGroupByTest(); + // selectWithLastTest(); - selectWithAggregationTest(); + // selectWithAggregationTest(); - selectWithAlignByDeviceTest(); + // selectWithAlignByDeviceTest(); session.close(); } private static void selectTest() throws StatementExecutionException, IoTDBConnectionException { - SessionDataSet dataSet = session.executeQueryStatement("select s1 from root.sg_1.d1.vector"); + SessionDataSet dataSet = session.executeQueryStatement("select s1 from root.sg_1.d1"); System.out.println(dataSet.getColumnNames()); while (dataSet.hasNext()) { System.out.println(dataSet.next()); } dataSet.closeOperationHandle(); - dataSet = session.executeQueryStatement("select * from root.sg_1.d1.vector"); + dataSet = session.executeQueryStatement("select * from root.sg_1.d1"); System.out.println(dataSet.getColumnNames()); while (dataSet.hasNext()) { System.out.println(dataSet.next()); @@ -218,7 +218,7 @@ public class AlignedTimeseriesSessionExample { encodings.add(TSEncoding.RLE); } session.createAlignedTimeseries( - ROOT_SG1_D1_VECTOR2, + ROOT_SG1_D1_VECTOR1, multiMeasurementComponents, dataTypes, encodings, @@ -404,12 +404,12 @@ public class AlignedTimeseriesSessionExample { types.add(TSDataType.INT64); types.add(TSDataType.INT32); - for (long time = 0; time < 1; time++) { + for (long time = 0; time < 10; time++) { List<Object> values = new ArrayList<>(); values.add(1L); values.add(2); session.insertAlignedRecord( - ROOT_SG2_D1_VECTOR4, time, multiMeasurementComponents, types, values); + ROOT_SG1_D1_VECTOR1, time, multiMeasurementComponents, types, values); } } diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/MemPageReader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/MemPageReader.java index 0070f94..fa3d256 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/MemPageReader.java +++ b/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/MemPageReader.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.query.reader.chunk; -import org.apache.iotdb.tsfile.file.metadata.AlignedChunkMetadata; +import java.io.IOException; import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; @@ -30,8 +30,6 @@ import org.apache.iotdb.tsfile.read.filter.operator.AndFilter; import org.apache.iotdb.tsfile.read.reader.IPageReader; import org.apache.iotdb.tsfile.read.reader.IPointReader; -import java.io.IOException; - public class MemPageReader implements IPageReader { private final IPointReader timeValuePairIterator; @@ -47,14 +45,7 @@ public class MemPageReader implements IPageReader { @Override public BatchData getAllSatisfiedPageData(boolean ascending) throws IOException { - TSDataType dataType; - if (chunkMetadata instanceof AlignedChunkMetadata - && ((AlignedChunkMetadata) chunkMetadata).getValueChunkMetadataList().size() == 1) { - dataType = - ((AlignedChunkMetadata) chunkMetadata).getValueChunkMetadataList().get(0).getDataType(); - } else { - dataType = chunkMetadata.getDataType(); - } + TSDataType dataType = chunkMetadata.getDataType(); BatchData batchData = BatchDataFactory.createBatchData(dataType, ascending, false); while (timeValuePairIterator.hasNextTimeValuePair()) { TimeValuePair timeValuePair = timeValuePairIterator.nextTimeValuePair(); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriter.java index f56c94d..2ea48fa 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriter.java @@ -68,7 +68,7 @@ public class RestorableTsFileIOWriter extends TsFileIOWriter { private long maxPlanIndex = Long.MIN_VALUE; /** all chunk group metadata which have been serialized on disk. */ - private Map<String, Map<String, List<ChunkMetadata>>> metadatasForQuery = new HashMap<>(); + private final Map<String, Map<String, List<ChunkMetadata>>> metadatasForQuery = new HashMap<>(); /** * @param file a given tsfile path you want to (continue to) write @@ -235,7 +235,7 @@ public class RestorableTsFileIOWriter extends TsFileIOWriter { List<ChunkMetadata> rowMetaDataList = chunkGroupMetadata.getChunkMetadataList(); String device = chunkGroupMetadata.getDevice(); - for (IChunkMetadata chunkMetaData : rowMetaDataList) { + for (ChunkMetadata chunkMetaData : rowMetaDataList) { String measurementId = chunkMetaData.getMeasurementUid(); if (!metadatasForQuery.containsKey(device)) { metadatasForQuery.put(device, new HashMap<>()); @@ -243,7 +243,7 @@ public class RestorableTsFileIOWriter extends TsFileIOWriter { if (!metadatasForQuery.get(device).containsKey(measurementId)) { metadatasForQuery.get(device).put(measurementId, new ArrayList<>()); } - metadatasForQuery.get(device).get(measurementId).add((ChunkMetadata) chunkMetaData); + metadatasForQuery.get(device).get(measurementId).add(chunkMetaData); } } }
