This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch try_fix_python
in repository https://gitbox.apache.org/repos/asf/tsfile.git
discard cb8cf044 try
new 88f60da7 better code
add 149b6212 TsFile V4 for Table Model
add 8ee83b05 Fix log when closing TsFile. Allow to close TsFile even if no
device is written. Fix tablet generation in test.
new 5a0ede4d Merge branch 'develop' of github.com:apache/tsfile into
try_fix_python
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (cb8cf044)
\
N -- N -- N refs/heads/try_fix_python (5a0ede4d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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} | 10 +-
.../tsfile/exception/IllegalDeviceIDException.java | 15 +-
.../tsfile/exception/TsFileRuntimeException.java | 4 +
.../FileVersionTooOldException.java} | 11 +-
.../tsfile/exception/read/NoColumnException.java | 15 +-
.../ReadProcessException.java} | 16 +-
.../UnsupportedOrderingException.java} | 10 +-
...ception.java => ConflictDataTypeException.java} | 9 +-
...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 -
.../read/common/block/column/ColumnFactory.java} | 38 +-
.../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 +-
.../{IUnaryExpression.java => ExpressionTree.java} | 9 +-
.../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 ++++++++++++
.../TsBlockReader.java} | 31 +-
.../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 +-
python/setup.py | 19 +-
python/test.py | 8 +-
python/tsfile/tsfile.pxd | 2 +-
167 files changed, 8419 insertions(+), 1147 deletions(-)
create mode 100644 java/tools/README-zh.md
create mode 100644 java/tools/README.md
create mode 100644 java/tools/pom.xml
create mode 100644
java/tools/src/assembly/resources/conf/logback-cvs2tsfile.xml
create mode 100644 java/tools/src/assembly/resources/tools/csv2tsfile.bat
create mode 100644 java/tools/src/assembly/resources/tools/csv2tsfile.sh
create mode 100644 java/tools/src/assembly/tools.xml
create mode 100644
java/tools/src/main/java/org/apache/tsfile/tools/DateTimeUtils.java
create mode 100644
java/tools/src/main/java/org/apache/tsfile/tools/SchemaParser.java
create mode 100644
java/tools/src/main/java/org/apache/tsfile/tools/TsFileTool.java
create mode 100644
java/tools/src/test/java/org/apache/tsfile/tools/TsfiletoolsTest.java
copy cpp/examples/c_examples/c_examples.h =>
java/tsfile/src/main/java/org/apache/tsfile/compatibility/BufferDeserializer.java
(82%)
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/compatibility/CompatibilityUtils.java
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/compatibility/DeserializeConfig.java
copy
java/tsfile/src/main/java/org/apache/tsfile/{exception/write/TsFileNotCompleteException.java
=> compatibility/StreamDeserializer.java} (80%)
copy cpp/examples/c_examples/c_examples.h =>
java/tsfile/src/main/java/org/apache/tsfile/exception/IllegalDeviceIDException.java
(82%)
copy
java/tsfile/src/main/java/org/apache/tsfile/exception/{write/TsFileNotCompleteException.java
=> read/FileVersionTooOldException.java} (71%)
copy cpp/examples/c_examples/c_examples.h =>
java/tsfile/src/main/java/org/apache/tsfile/exception/read/NoColumnException.java
(79%)
copy
java/tsfile/src/main/java/org/apache/tsfile/exception/{NotImplementedException.java
=> read/ReadProcessException.java} (73%)
copy
java/tsfile/src/main/java/org/apache/tsfile/exception/{filter/UnSupportFilterDataTypeException.java
=> read/UnsupportedOrderingException.java} (78%)
copy
java/tsfile/src/main/java/org/apache/tsfile/exception/write/{TsFileNotCompleteException.java
=> ConflictDataTypeException.java} (73%)
copy
java/tsfile/src/main/java/org/apache/tsfile/exception/write/{NoMeasurementException.java
=> NoDeviceException.java} (85%)
copy cpp/examples/c_examples/c_examples.h =>
java/tsfile/src/main/java/org/apache/tsfile/exception/write/NoTableException.java
(79%)
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/file/metadata/LogicalTableSchema.java
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/file/metadata/StringArrayDeviceID.java
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/file/metadata/TableSchema.java
copy java/{examples/src/main/java/org/apache/tsfile/DataGenerator.java =>
tsfile/src/main/java/org/apache/tsfile/read/common/block/column/ColumnFactory.java}
(61%)
copy
java/tsfile/src/main/java/org/apache/tsfile/read/common/type/{IntType.java =>
AbstractIntType.java} (86%)
copy
java/tsfile/src/main/java/org/apache/tsfile/read/common/type/{LongType.java =>
AbstractLongType.java} (86%)
copy cpp/examples/c_examples/c_examples.h =>
java/tsfile/src/main/java/org/apache/tsfile/read/common/type/AbstractType.java
(82%)
copy
java/tsfile/src/main/java/org/apache/tsfile/read/common/type/{BinaryType.java
=> AbstractVarcharType.java} (81%)
copy
java/tsfile/src/main/java/org/apache/tsfile/read/common/type/{BinaryType.java
=> BlobType.java} (72%)
copy
java/tsfile/src/main/java/org/apache/tsfile/read/common/type/{TypeEnum.java =>
DateType.java} (72%)
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/common/type/RowType.java
copy
java/tsfile/src/main/java/org/apache/tsfile/read/common/type/{TypeEnum.java =>
StringType.java} (70%)
copy
java/tsfile/src/main/java/org/apache/tsfile/read/common/type/{TypeEnum.java =>
TimestampType.java} (69%)
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/common/type/UnknownType.java
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/controller/DeviceMetaIterator.java
copy
java/tsfile/src/main/java/org/apache/tsfile/read/expression/{IUnaryExpression.java
=> ExpressionTree.java} (82%)
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/query/executor/TableQueryExecutor.java
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/query/executor/task/DeviceQueryTask.java
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/query/executor/task/DeviceTaskIterator.java
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/reader/block/DeviceOrderedTsBlockReader.java
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/reader/block/SingleDeviceTsBlockReader.java
copy
java/tsfile/src/main/java/org/apache/tsfile/read/reader/{chunk/ChunkReaderWithoutStatistics.java
=> block/TsBlockReader.java} (62%)
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/utils/TsFileSketchTool.java
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/utils/WriteUtils.java
create mode 100644
java/tsfile/src/test/java/org/apache/tsfile/compatibility/CompatibilityTest.java
create mode 100644
java/tsfile/src/test/java/org/apache/tsfile/file/metadata/IDeviceIDTest.java
create mode 100644
java/tsfile/src/test/java/org/apache/tsfile/tableview/PerformanceTest.java
create mode 100644
java/tsfile/src/test/java/org/apache/tsfile/tableview/TableSchemaTest.java
create mode 100644
java/tsfile/src/test/java/org/apache/tsfile/tableview/TableViewTest.java
create mode 100644 java/tsfile/src/test/resources/v3TsFile
