This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch vectorMemTable in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 991d839b7c3f0d3e132dcda768ff93b008ead7fe Merge: 2662024 96f29bb Author: HTHou <[email protected]> AuthorDate: Fri Mar 12 19:49:26 2021 +0800 merge .../db/engine/cache/TimeSeriesMetadataCache.java | 5 +- .../iotdb/db/engine/merge/task/MergeFileTask.java | 3 +- .../db/engine/storagegroup/TsFileResource.java | 3 +- .../apache/iotdb/db/metadata/MLogTxtWriter.java | 32 ++ .../org/apache/iotdb/db/metadata/MManager.java | 8 + .../iotdb/db/metadata/MetadataOperationType.java | 1 + .../org/apache/iotdb/db/metadata/PartialPath.java | 6 +- .../iotdb/db/metadata/VectorPartialPath.java | 58 ++++ .../iotdb/db/metadata/logfile/MLogWriter.java | 8 + .../apache/iotdb/db/qp/executor/PlanExecutor.java | 13 + .../org/apache/iotdb/db/qp/logical/Operator.java | 1 + .../apache/iotdb/db/qp/physical/PhysicalPlan.java | 5 + .../physical/sys/CreateAlignedTimeSeriesPlan.java | 249 ++++++++++++++++ .../db/query/executor/fill/LastPointReader.java | 9 +- .../chunk/metadata/DiskChunkMetadataLoader.java | 12 +- .../chunk/metadata/MemChunkMetadataLoader.java | 10 +- .../iotdb/db/query/reader/series/SeriesReader.java | 19 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 54 ++++ .../org/apache/iotdb/db/tools/mlog/MLogParser.java | 4 + .../org/apache/iotdb/db/utils/FileLoaderUtils.java | 37 ++- .../java/org/apache/iotdb/db/utils/QueryUtils.java | 8 +- .../db/engine/memtable/PrimitiveMemTableTest.java | 2 +- .../db/qp/physical/PhysicalPlanSerializeTest.java | 32 ++ .../iotdb/db/qp/physical/PhysicalPlanTest.java | 14 + .../writelog/recover/UnseqTsFileRecoverTest.java | 5 +- .../java/org/apache/iotdb/session/Session.java | 33 +++ .../apache/iotdb/session/SessionConnection.java | 20 ++ thrift/src/main/thrift/rpc.thrift | 12 + .../iotdb/tsfile/encoding/decoder/Decoder.java | 4 + .../iotdb/tsfile/file/metadata/ChunkMetadata.java | 10 +- .../iotdb/tsfile/file/metadata/IChunkMetadata.java | 71 +++++ .../metadata/ITimeSeriesMetadata.java} | 23 +- .../tsfile/file/metadata/TimeseriesMetadata.java | 16 +- .../tsfile/file/metadata/VectorChunkMetadata.java | 163 ++++++++++ .../file/metadata/VectorTimeSeriesMetadata.java | 88 ++++++ .../iotdb/tsfile/read/TsFileSequenceReader.java | 21 +- .../apache/iotdb/tsfile/read/common/BatchData.java | 59 ++++ .../read/controller/IChunkMetadataLoader.java | 6 +- .../tsfile/read/controller/IMetadataQuerier.java | 6 +- .../read/controller/MetadataQuerierByFileImpl.java | 13 +- .../query/executor/ExecutorWithTimeGenerator.java | 4 +- .../tsfile/read/query/executor/TsFileExecutor.java | 4 +- .../query/timegenerator/TsFileTimeGenerator.java | 4 +- .../tsfile/read/reader/chunk/ChunkReader.java | 6 +- .../read/reader/chunk/VectorChunkReader.java | 262 ++++++++++++++++ .../tsfile/read/reader/page/TimePageReader.java | 92 ++++++ .../tsfile/read/reader/page/ValuePageReader.java | 160 ++++++++++ .../page/VectorChunkReader.java} | 15 +- .../tsfile/read/reader/page/VectorPageReader.java | 116 ++++++++ .../reader/series/AbstractFileSeriesReader.java | 14 +- .../read/reader/series/EmptyFileSeriesReader.java | 6 +- .../read/reader/series/FileSeriesReader.java | 9 +- .../reader/series/FileSeriesReaderByTimestamp.java | 13 +- .../tsfile/write/schema/IMeasurementSchema.java | 1 - .../tsfile/write/schema/MeasurementSchema.java | 11 +- .../write/schema/VectorMeasurementSchema.java | 329 +++++++++++++++++++++ .../write/writer/RestorableTsFileIOWriter.java | 9 +- .../iotdb/tsfile/write/writer/TsFileIOWriter.java | 13 +- ...easurementChunkMetadataListMapIteratorTest.java | 13 +- .../tsfile/read/controller/ChunkLoaderTest.java | 7 +- .../query/timegenerator/ReaderByTimestampTest.java | 4 +- .../iotdb/tsfile/read/reader/ReaderTest.java | 6 +- .../write/writer/VectorMeasurementSchemaStub.java | 35 +-- 63 files changed, 2100 insertions(+), 176 deletions(-) diff --cc server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java index 1494658,907beb2..0aaef22 --- a/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java @@@ -31,8 -31,8 +31,8 @@@ import org.apache.iotdb.tsfile.read.Tim import org.apache.iotdb.tsfile.read.reader.IPointReader; import org.apache.iotdb.tsfile.utils.Binary; import org.apache.iotdb.tsfile.utils.TsPrimitiveType; - import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; - ++import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema; import org.junit.Assert; import org.junit.Before; import org.junit.Test;
