This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch try_fix_python in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 5a0ede4ded29e6e297cbb1a714b7610f3bfdda92 Merge: 88f60da7 8ee83b05 Author: HTHou <[email protected]> AuthorDate: Wed Aug 7 21:19:10 2024 +0800 Merge branch 'develop' of github.com:apache/tsfile into try_fix_python .gitignore | 1 + cpp/bench_mark/bench_mark_src/bench_conf.h | 4 +- cpp/examples/c_examples/c_examples.h | 4 +- cpp/pom.xml | 2 +- cpp/src/file/write_file.cc | 8 +- cpp/src/reader/query_data_set.h | 1 + cpp/test/writer/tsfile_writer_test.cc | 12 +- java/common/pom.xml | 2 +- .../org/apache/tsfile/block/column/Column.java | 20 + java/examples/pom.xml | 4 +- .../tsfile/TsFileWriteAlignedWithTSRecord.java | 4 +- .../tsfile/TsFileWriteAlignedWithTablet.java | 8 +- .../org/apache/tsfile/TsFileWriteWithTSRecord.java | 4 +- .../org/apache/tsfile/TsFileWriteWithTablet.java | 4 +- java/pom.xml | 5 +- java/tools/README-zh.md | 126 ++++ java/tools/README.md | 127 ++++ java/tools/pom.xml | 92 +++ .../assembly/resources/conf/logback-cvs2tsfile.xml | 49 ++ .../src/assembly/resources/tools/csv2tsfile.bat | 50 ++ .../src/assembly/resources/tools/csv2tsfile.sh | 53 ++ java/tools/src/assembly/tools.xml | 54 ++ .../org/apache/tsfile/tools/DateTimeUtils.java | 514 +++++++++++++++ .../java/org/apache/tsfile/tools/SchemaParser.java | 264 ++++++++ .../java/org/apache/tsfile/tools/TsFileTool.java | 498 ++++++++++++++ .../org/apache/tsfile/tools/TsfiletoolsTest.java | 158 +++++ java/tsfile/pom.xml | 12 +- .../org/apache/tsfile/common/cache/LRUCache.java | 4 + .../apache/tsfile/common/conf/TSFileConfig.java | 7 +- .../tsfile/compatibility/BufferDeserializer.java | 14 +- .../tsfile/compatibility/CompatibilityUtils.java | 74 +++ .../tsfile/compatibility/DeserializeConfig.java | 103 +++ .../StreamDeserializer.java} | 17 +- .../tsfile/exception/IllegalDeviceIDException.java | 15 +- .../tsfile/exception/TsFileRuntimeException.java | 4 + .../read/FileVersionTooOldException.java} | 20 +- .../tsfile/exception/read/NoColumnException.java | 15 +- .../ReadProcessException.java} | 17 +- .../read/UnsupportedOrderingException.java} | 17 +- ...ception.java => ConflictDataTypeException.java} | 10 +- ...rementException.java => NoDeviceException.java} | 6 +- .../exception/write/NoMeasurementException.java | 4 +- .../tsfile/exception/write/NoTableException.java | 15 +- .../apache/tsfile/file/IMetadataIndexEntry.java | 2 + .../tsfile/file/header/ChunkGroupHeader.java | 25 +- .../org/apache/tsfile/file/header/PageHeader.java | 6 + .../apache/tsfile/file/metadata/ChunkMetadata.java | 26 + .../file/metadata/DeviceMetadataIndexEntry.java | 18 +- .../org/apache/tsfile/file/metadata/IDeviceID.java | 134 +++- .../tsfile/file/metadata/LogicalTableSchema.java | 82 +++ .../metadata/MeasurementMetadataIndexEntry.java | 6 + .../file/metadata/MetadataIndexConstructor.java | 11 + .../tsfile/file/metadata/MetadataIndexNode.java | 20 +- .../apache/tsfile/file/metadata/PlainDeviceID.java | 93 ++- .../tsfile/file/metadata/StringArrayDeviceID.java | 304 +++++++++ .../apache/tsfile/file/metadata/TableSchema.java | 197 ++++++ .../tsfile/file/metadata/TimeseriesMetadata.java | 16 + .../tsfile/file/metadata/TsFileMetadata.java | 120 +++- .../apache/tsfile/read/TsFileSequenceReader.java | 568 +++++++++++----- ...leSequenceReaderTimeseriesMetadataIterator.java | 23 +- .../java/org/apache/tsfile/read/common/Path.java | 75 +-- .../apache/tsfile/read/common/block/TsBlock.java | 73 ++- .../tsfile/read/common/block/TsBlockBuilder.java | 4 + .../tsfile/read/common/block/TsBlockUtil.java | 10 +- .../read/common/block/column/BinaryColumn.java | 21 +- .../read/common/block/column/BooleanColumn.java | 21 +- .../read/common/block/column/ColumnEncoder.java | 5 - .../column/ColumnFactory.java} | 39 +- .../read/common/block/column/DoubleColumn.java | 21 +- .../read/common/block/column/FloatColumn.java | 21 +- .../block/column/Int64ArrayColumnEncoder.java | 22 - .../tsfile/read/common/block/column/IntColumn.java | 21 +- .../read/common/block/column/LongColumn.java | 21 +- .../read/common/block/column/NullColumn.java | 10 +- .../block/column/RunLengthEncodedColumn.java | 12 +- .../read/common/block/column/TimeColumn.java | 20 +- .../read/common/block/column/TsBlockSerde.java | 6 +- .../read/common/parser/PathNodesGenerator.java | 3 + .../type/{IntType.java => AbstractIntType.java} | 21 +- .../type/{LongType.java => AbstractLongType.java} | 21 +- .../tsfile/read/common/type/AbstractType.java | 16 +- .../{BinaryType.java => AbstractVarcharType.java} | 21 +- .../apache/tsfile/read/common/type/BinaryType.java | 29 +- .../common/type/{BinaryType.java => BlobType.java} | 36 +- .../tsfile/read/common/type/BooleanType.java | 29 +- .../common/type/{TypeEnum.java => DateType.java} | 21 +- .../apache/tsfile/read/common/type/DoubleType.java | 29 +- .../apache/tsfile/read/common/type/FloatType.java | 29 +- .../apache/tsfile/read/common/type/IntType.java | 58 +- .../apache/tsfile/read/common/type/LongType.java | 58 +- .../apache/tsfile/read/common/type/RowType.java | 168 +++++ .../common/type/{TypeEnum.java => StringType.java} | 21 +- .../type/{TypeEnum.java => TimestampType.java} | 21 +- .../org/apache/tsfile/read/common/type/Type.java | 14 + .../apache/tsfile/read/common/type/TypeEnum.java | 10 +- .../tsfile/read/common/type/TypeFactory.java | 40 +- .../tsfile/read/common/type/UnknownType.java | 87 +++ .../tsfile/read/controller/DeviceMetaIterator.java | 133 ++++ .../tsfile/read/controller/IMetadataQuerier.java | 20 + .../read/controller/MetadataQuerierByFileImpl.java | 65 +- .../tsfile/read/expression/ExpressionTree.java | 14 +- .../tsfile/read/filter/factory/FilterFactory.java | 18 + .../read/query/executor/TableQueryExecutor.java | 163 +++++ .../read/query/executor/task/DeviceQueryTask.java | 73 +++ .../query/executor/task/DeviceTaskIterator.java | 62 ++ .../reader/block/DeviceOrderedTsBlockReader.java | 96 +++ .../reader/block/SingleDeviceTsBlockReader.java | 408 ++++++++++++ .../reader/block/TsBlockReader.java} | 28 +- .../reader/series/AbstractFileSeriesReader.java | 6 + .../read/reader/series/FileSeriesReader.java | 3 + .../org/apache/tsfile/utils/MeasurementGroup.java | 14 +- .../tsfile/utils/ReadWriteForEncodingUtils.java | 12 + .../org/apache/tsfile/utils/ReadWriteIOUtils.java | 6 +- .../apache/tsfile/utils/TsFileGeneratorUtils.java | 16 +- .../org/apache/tsfile/utils/TsFileSketchTool.java | 730 +++++++++++++++++++++ .../java/org/apache/tsfile/utils/WriteUtils.java | 64 ++ .../java/org/apache/tsfile/write/TsFileWriter.java | 358 +++++----- .../write/chunk/AlignedChunkGroupWriterImpl.java | 52 +- .../tsfile/write/chunk/IChunkGroupWriter.java | 16 +- .../chunk/NonAlignedChunkGroupWriterImpl.java | 28 +- .../org/apache/tsfile/write/record/TSRecord.java | 8 +- .../org/apache/tsfile/write/record/Tablet.java | 268 ++++++-- .../org/apache/tsfile/write/schema/Schema.java | 80 ++- .../write/writer/RestorableTsFileIOWriter.java | 13 +- .../apache/tsfile/write/writer/TsFileIOWriter.java | 72 +- .../write/writer/TsFileIOWriterEndFileTest.java | 4 +- .../write/writer/tsmiterator/DiskTSMIterator.java | 6 +- .../write/writer/tsmiterator/TSMIterator.java | 11 +- .../tsfile/common/block/TsBlockSerdeTest.java | 2 - .../tsfile/compatibility/CompatibilityTest.java | 74 +++ .../tsfile/exception/TsFileExceptionTest.java | 2 +- .../apache/tsfile/file/metadata/IDeviceIDTest.java | 143 ++++ .../tsfile/file/metadata/TsFileMetadataTest.java | 4 +- .../tsfile/file/metadata/utils/TestHelper.java | 14 +- .../apache/tsfile/file/metadata/utils/Utils.java | 10 +- .../org/apache/tsfile/read/GetAllDevicesTest.java | 14 +- ...easurementChunkMetadataListMapIteratorTest.java | 7 +- .../tsfile/read/TimePlainEncodeReadTest.java | 3 + .../org/apache/tsfile/read/TsFileReaderTest.java | 9 +- .../tsfile/read/TsFileSequenceReaderTest.java | 61 +- .../org/apache/tsfile/read/common/PathTest.java | 64 +- .../AlignedChunkReaderWithoutStatisticsTest.java | 4 +- .../apache/tsfile/tableview/PerformanceTest.java | 372 +++++++++++ .../apache/tsfile/tableview/TableSchemaTest.java | 123 ++++ .../org/apache/tsfile/tableview/TableViewTest.java | 402 ++++++++++++ .../org/apache/tsfile/utils/FileGenerator.java | 6 +- .../utils/ReadWriteForEncodingUtilsTest.java | 8 +- .../java/org/apache/tsfile/utils/RecordUtils.java | 5 +- .../org/apache/tsfile/utils/RecordUtilsTest.java | 9 +- .../tsfile/utils/TsFileGeneratorForTest.java | 5 +- .../tsfile/write/DefaultSchemaTemplateTest.java | 5 +- .../tsfile/write/MetadataIndexConstructorTest.java | 31 +- .../apache/tsfile/write/TsFileIOWriterTest.java | 24 +- .../apache/tsfile/write/TsFileReadWriteTest.java | 18 +- .../apache/tsfile/write/TsFileWriteApiTest.java | 36 +- .../org/apache/tsfile/write/TsFileWriterTest.java | 11 +- .../java/org/apache/tsfile/write/WriteTest.java | 11 +- .../org/apache/tsfile/write/record/TabletTest.java | 5 +- .../write/schema/converter/SchemaBuilderTest.java | 4 +- .../write/writer/RestorableTsFileIOWriterTest.java | 8 +- .../writer/TsFileIOWriterMemoryControlTest.java | 13 +- java/tsfile/src/test/resources/v3TsFile | Bin 0 -> 378 bytes pom.xml | 2 +- python/pom.xml | 2 +- 164 files changed, 8407 insertions(+), 1158 deletions(-)
