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
from ff0e2be2 try win
new 724ad047 fix
add eaf93d22 Adding a CI for rc branching
add da9a7ce2 Add short-circuit evaluation and use Freemarker to generate
filters for different data types.
add 72011575 fix typo of Multi (#210)
add 12394f04 docs: fix error link (#212)
add b5ec1d9f Fixed testing bug (#201)
add d64ea9fd remove pnpm-lock (#216)
add cd8f9040 Optimize equals method in Binary (#217)
add 3244d9f5 Feature/support aligned ts (#192)
new c6dc7667 Merge branch 'develop' of github.com:apache/tsfile into
try_fix_python
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:
.github/workflows/code-coverage.yml | 2 +
.github/workflows/codeql.yml | 4 +-
.github/workflows/unit-test.yml | 2 +
.gitignore | 2 +
README.md | 2 +-
cpp/examples/c_examples/c_examples.c | 1 -
cpp/examples/cpp_examples/cpp_examples.h | 10 +-
cpp/examples/cpp_examples/demo_read.cpp | 80 +-
cpp/examples/cpp_examples/demo_write.cpp | 26 +-
cpp/examples/examples.cc | 2 +-
cpp/src/common/allocator/byte_stream.h | 19 +
cpp/src/common/allocator/my_string.h | 24 +
cpp/src/common/config/config.h | 2 +
cpp/src/common/global.cc | 5 +-
cpp/src/common/record.h | 7 +-
cpp/src/common/schema.h | 12 +-
cpp/src/common/statistic.h | 99 +-
cpp/src/common/tsfile_common.cc | 94 +-
cpp/src/common/tsfile_common.h | 68 +-
cpp/src/compress/compressor_factory.h | 3 +-
cpp/src/cwrapper/TsFile-cwrapper.cc | 1708 ++++-----
cpp/src/cwrapper/TsFile-cwrapper.h | 470 +--
cpp/src/encoding/bitpack_encoder.h | 3 +-
cpp/src/encoding/dictionary_encoder.h | 3 +-
cpp/src/encoding/plain_encoder.h | 6 +-
cpp/src/encoding/ts2diff_decoder.h | 4 +-
cpp/src/encoding/ts2diff_encoder.h | 4 +-
cpp/src/file/read_file.cc | 8 +-
cpp/src/file/tsfile_io_reader.cc | 63 +-
cpp/src/file/tsfile_io_reader.h | 4 +-
cpp/src/file/tsfile_io_writer.cc | 46 +-
cpp/src/file/tsfile_io_writer.h | 13 +-
cpp/src/file/write_file.cc | 7 +-
cpp/src/reader/aligned_chunk_reader.cc | 631 ++++
cpp/src/reader/aligned_chunk_reader.h | 174 +
cpp/src/reader/chunk_reader.cc | 13 +-
cpp/src/reader/chunk_reader.h | 20 +-
cpp/src/reader/ichunk_reader.h | 62 +
cpp/src/reader/tsfile_series_scan_iterator.cc | 87 +-
cpp/src/reader/tsfile_series_scan_iterator.h | 33 +-
cpp/src/writer/chunk_writer.cc | 10 +-
cpp/src/writer/page_writer.cc | 28 +-
cpp/src/writer/page_writer.h | 1 -
.../{chunk_writer.cc => time_chunk_writer.cc} | 83 +-
.../writer/{chunk_writer.h => time_chunk_writer.h} | 79 +-
.../writer/{page_writer.cc => time_page_writer.cc} | 98 +-
cpp/src/writer/time_page_writer.h | 127 +
cpp/src/writer/tsfile_writer.cc | 444 ++-
cpp/src/writer/tsfile_writer.h | 68 +-
.../{chunk_writer.cc => value_chunk_writer.cc} | 71 +-
.../{chunk_writer.h => value_chunk_writer.h} | 79 +-
.../{page_writer.cc => value_page_writer.cc} | 121 +-
.../writer/{page_writer.h => value_page_writer.h} | 143 +-
cpp/test/common/allocator/alloc_base_test.cc | 32 +
cpp/test/common/statistic_test.cc | 23 +
cpp/test/writer/chunk_writer_test.cc | 46 +-
cpp/test/writer/page_writer_test.cc | 2 -
cpp/test/writer/time_chunk_writer_test.cc | 82 +
cpp/test/writer/time_page_writer_test.cc | 84 +
cpp/test/writer/tsfile_writer_test.cc | 426 ++-
cpp/test/writer/value_chunk_writer_test.cc | 101 +
cpp/test/writer/value_page_writer_test.cc | 107 +
docs/pnpm-lock.yaml | 3737 --------------------
.../main/java/org/apache/tsfile/utils/Binary.java | 13 +-
java/examples/readme.md | 2 +-
java/tools/pom.xml | 18 +
.../assembly/resources/conf/logback-cvs2tsfile.xml | 5 +-
.../src/assembly/resources/tools/csv2tsfile.bat | 5 +-
java/tools/src/assembly/tools.xml | 3 +-
.../java/org/apache/tsfile/tools/SchemaParser.java | 38 +-
.../java/org/apache/tsfile/tools/TsFileTool.java | 140 +-
.../org/apache/tsfile/tools/TsfiletoolsTest.java | 75 +-
java/tsfile/pom.xml | 24 +-
java/tsfile/src/main/codegen/config.fmpp | 21 +
.../src/main/codegen/dataModel/AllFilter.tdd | 57 +
.../codegen/templates/FilterOperatorsTemplate.ftl | 1318 +++++++
.../src/main/codegen/templates/FilterTemplate.ftl | 92 +
.../tsfile/read/common/block/TsBlockUtil.java | 6 +-
.../read/filter/basic/CompareNullFilter.java | 48 +
.../filter/basic/DisableStatisticsTimeFilter.java | 33 -
.../filter/basic/DisableStatisticsValueFilter.java | 46 -
.../apache/tsfile/read/filter/basic/Filter.java | 61 +-
.../tsfile/read/filter/basic/TimeFilter.java | 85 +
.../tsfile/read/filter/basic/ValueFilter.java | 86 +-
.../tsfile/read/filter/factory/ValueFilterApi.java | 538 ++-
.../apache/tsfile/read/filter/operator/And.java | 77 +-
.../apache/tsfile/read/filter/operator/Not.java | 75 +-
.../org/apache/tsfile/read/filter/operator/Or.java | 83 +-
.../read/filter/operator/TimeFilterOperators.java | 3 +
.../read/filter/operator/ValueFilterOperators.java | 1059 ------
.../filter/operator/ValueIsNotNullOperator.java | 143 +
.../read/filter/operator/ValueIsNullOperator.java | 139 +
.../apache/tsfile/read/reader/page/PageReader.java | 35 +-
.../tsfile/read/reader/page/ValuePageReader.java | 16 +-
.../org/apache/tsfile/utils/FilterDeserialize.java | 344 ++
.../org/apache/tsfile/utils/ReadWriteIOUtils.java | 118 +-
.../java/org/apache/tsfile/compress/GZIPTest.java | 6 -
.../apache/tsfile/read/ReadInPartitionTest.java | 5 +-
.../test/java/org/apache/tsfile/read/ReadTest.java | 35 +-
.../tsfile/read/TimePlainEncodeReadTest.java | 45 +-
.../org/apache/tsfile/read/TsFileReaderTest.java | 64 +-
.../tsfile/read/filter/BinaryOperatorsTest.java | 148 +
.../tsfile/read/filter/BooleanOperatorsTest.java | 137 +
.../tsfile/read/filter/FilterSerializeTest.java | 297 +-
.../apache/tsfile/read/filter/FilterTestUtil.java | 2 +
.../read/filter/IExpressionOptimizerTest.java | 55 +-
.../read/filter/MinTimeMaxTimeFilterTest.java | 14 +-
.../tsfile/read/filter/NullOperatorsTest.java | 41 +
.../tsfile/read/filter/NumericalOperatorsTest.java | 127 +
.../apache/tsfile/read/filter/OperatorTest.java | 125 +-
.../filter/PredicateRemoveNotRewriterTest.java | 78 +-
.../tsfile/read/filter/StatisticsFilterTest.java | 205 +-
.../tsfile/read/filter/TsBlockFilterTest.java | 185 +
.../read/query/executor/QueryExecutorTest.java | 9 +-
.../read/query/timegenerator/ReadWriteTest.java | 10 +-
.../timegenerator/TimeGeneratorReadEmptyTest.java | 10 +-
.../timegenerator/TimeGeneratorReadWriteTest.java | 10 +-
.../query/timegenerator/TimeGeneratorTest.java | 9 +-
.../read/reader/AlignedPageReaderPushDownTest.java | 74 +-
.../tsfile/read/reader/PageReaderPushDownTest.java | 6 +-
.../org/apache/tsfile/read/reader/ReaderTest.java | 7 +-
pom.xml | 6 +
122 files changed, 9122 insertions(+), 7209 deletions(-)
create mode 100644 cpp/src/reader/aligned_chunk_reader.cc
create mode 100644 cpp/src/reader/aligned_chunk_reader.h
create mode 100644 cpp/src/reader/ichunk_reader.h
copy cpp/src/writer/{chunk_writer.cc => time_chunk_writer.cc} (60%)
copy cpp/src/writer/{chunk_writer.h => time_chunk_writer.h} (53%)
copy cpp/src/writer/{page_writer.cc => time_page_writer.cc} (58%)
create mode 100644 cpp/src/writer/time_page_writer.h
copy cpp/src/writer/{chunk_writer.cc => value_chunk_writer.cc} (67%)
copy cpp/src/writer/{chunk_writer.h => value_chunk_writer.h} (57%)
copy cpp/src/writer/{page_writer.cc => value_page_writer.cc} (57%)
copy cpp/src/writer/{page_writer.h => value_page_writer.h} (54%)
create mode 100644 cpp/test/writer/time_chunk_writer_test.cc
create mode 100644 cpp/test/writer/time_page_writer_test.cc
create mode 100644 cpp/test/writer/value_chunk_writer_test.cc
create mode 100644 cpp/test/writer/value_page_writer_test.cc
delete mode 100644 docs/pnpm-lock.yaml
create mode 100644 java/tsfile/src/main/codegen/config.fmpp
create mode 100644 java/tsfile/src/main/codegen/dataModel/AllFilter.tdd
create mode 100644
java/tsfile/src/main/codegen/templates/FilterOperatorsTemplate.ftl
create mode 100644 java/tsfile/src/main/codegen/templates/FilterTemplate.ftl
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/CompareNullFilter.java
delete mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/DisableStatisticsTimeFilter.java
delete mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/filter/basic/DisableStatisticsValueFilter.java
delete mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/ValueFilterOperators.java
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/ValueIsNotNullOperator.java
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/read/filter/operator/ValueIsNullOperator.java
create mode 100644
java/tsfile/src/main/java/org/apache/tsfile/utils/FilterDeserialize.java
create mode 100644
java/tsfile/src/test/java/org/apache/tsfile/read/filter/BinaryOperatorsTest.java
create mode 100644
java/tsfile/src/test/java/org/apache/tsfile/read/filter/BooleanOperatorsTest.java
create mode 100644
java/tsfile/src/test/java/org/apache/tsfile/read/filter/NullOperatorsTest.java
create mode 100644
java/tsfile/src/test/java/org/apache/tsfile/read/filter/NumericalOperatorsTest.java
create mode 100644
java/tsfile/src/test/java/org/apache/tsfile/read/filter/TsBlockFilterTest.java
