Skip to content

Commit

Permalink
Cherry pick some release issue fixes from rc/1.1 (#296)
Browse files Browse the repository at this point in the history
* update release note for 1.1.0

* fix release problem

* Fix 1.1.0 rc1 issues (#283)

* update license info
  • Loading branch information
HTHou authored Nov 8, 2024
1 parent 972d23d commit d50399a
Show file tree
Hide file tree
Showing 17 changed files with 272 additions and 118 deletions.
95 changes: 49 additions & 46 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -204,90 +204,93 @@
APACHE TSFILE SUBCOMPONENTS
--------------------------------------------------------------------------------

The following class is copied from maven-wrapper (https://github.com/takari/maven-wrapper),
which is under Apache License 2.0:

mvnw files from https://github.com/apache/maven-wrapper Apache 2.0

--------------------------------------------------------------------------------

The following class is modified from Apache commons-collections

./tsfile/src/main/java/org/apache/tsfile/utils/Murmur128Hash.java
./java/tsfile/src/main/java/org/apache/tsfile/utils/Murmur128Hash.java
Relevant pr is: https://github.com/apache/commons-collections/pull/83/

--------------------------------------------------------------------------------

The following files include code modified from Michael Burman's gorilla-tsc project.

./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/GorillaEncoderV2.java
./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntGorillaEncoder.java
./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongGorillaEncoder.java
./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java
./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java
./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV2.java
./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntGorillaDecoder.java
./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongGorillaDecoder.java
./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java
./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/GorillaEncoderV2.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntGorillaEncoder.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongGorillaEncoder.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/GorillaDecoderV2.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntGorillaDecoder.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongGorillaDecoder.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java

Copyright: 2016-2018 Michael Burman and/or other contributors
Project page: https://github.com/burmanm/gorilla-tsc
License: http://www.apache.org/licenses/LICENSE-2.0
License: https://github.com/burmanm/gorilla-tsc/blob/master/LICENSE

--------------------------------------------------------------------------------

The following files include code modified from Panagiotis Liakos, Katia Papakonstantinopoulou and Yannis Kotidis chimp project.

./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionChimpDecoder.java
./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntChimpDecoder.java
./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongChimpDecoder.java
./tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionChimpDecoder.java
./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionChimpEncoder.java
./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntChimpEncoder.java
./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongChimpEncoder.java
./tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionChimpEncoder.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/DoublePrecisionChimpDecoder.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/IntChimpDecoder.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/LongChimpDecoder.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/decoder/SinglePrecisionChimpDecoder.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/DoublePrecisionChimpEncoder.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/IntChimpEncoder.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/LongChimpEncoder.java
./java/tsfile/src/main/java/org/apache/tsfile/encoding/encoder/SinglePrecisionChimpEncoder.java

Copyright: 2022- Panagiotis Liakos, Katia Papakonstantinopoulou and Yannis Kotidis
Project page: https://github.com/panagiotisl/chimp
License: http://www.apache.org/licenses/LICENSE-2.0
License: https://github.com/panagiotisl/chimp/blob/main/LICENCE.md

--------------------------------------------------------------------------------

The following files include code modified from Snappy project.
The following files include code modified from Trino project.

./tsfile/cpp/third_party/google_snappy/snappy.h
./tsfile/cpp/third_party/google_snappy/snappy.cc
./tsfile/cpp/third_party/google_snappy/snappy-internal.h
./tsfile/cpp/third_party/google_snappy/snappy-sinksource.cc
./tsfile/cpp/third_party/google_snappy/snappy-sinksource.h
./tsfile/cpp/third_party/google_snappy/snappy-stubs-internal.cc
./tsfile/cpp/third_party/google_snappy/snappy-stubs-internal.h
./tsfile/cpp/third_party/google_snappy/snappy-stubs-public.h.in
./tsfile/cpp/third_party/google_snappy/CMakeLists.txt
./java/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/*

Copyright: 2011, Google Inc.
Project page: https://github.com/google/snappy
License: https://github.com/google/snappy/blob/main/COPYING
Trino is open source software licensed under the Apache License 2.0 and supported by the Trino Software Foundation.
Project page: https://github.com/trinodb/trino
License: https://github.com/trinodb/trino/blob/master/LICENSE

--------------------------------------------------------------------------------

The following files include code is copied from lz4 project.

./tsfile/cpp/third_party/lz4/lz4.c
./tsfile/cpp/third_party/lz4/lz4.h
./cpp/src/compress/lz4.c
./cpp/src/compress/lz4.h

Copyright: (C) 2011-2020, Yann Collet.
Project page: http://www.lz4.org
License: https://github.com/lz4/lz4/blob/dev/LICENSE

--------------------------------------------------------------------------------

The following files include code modified from Snappy project.

./cpp/third_party/google_snappy/snappy.h
./cpp/third_party/google_snappy/snappy.cc
./cpp/third_party/google_snappy/snappy-internal.h
./cpp/third_party/google_snappy/snappy-sinksource.cc
./cpp/third_party/google_snappy/snappy-sinksource.h
./cpp/third_party/google_snappy/snappy-stubs-internal.cc
./cpp/third_party/google_snappy/snappy-stubs-internal.h
./cpp/third_party/google_snappy/snappy-stubs-public.h.in
./cpp/third_party/google_snappy/CMakeLists.txt

Copyright: 2011, Google Inc.
Project page: https://github.com/google/snappy
License: https://github.com/google/snappy/blob/main/COPYING

--------------------------------------------------------------------------------

The following files include code is copied from lzokay project.

./tsfile/cpp/third_party/lzokay/lzokay.cpp
./tsfile/cpp/third_party/lzokay/lzokay.hpp
./tsfile/cpp/third_party/lzokay/LICENSE
./cpp/third_party/lzokay/lzokay.cpp
./cpp/third_party/lzokay/lzokay.hpp
./cpp/third_party/lzokay/LICENSE

Copyright: (c) 2018 Jack Andersen
Project page: https://github.com/AxioDL/lzokay
Expand Down
24 changes: 24 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,30 @@
-->

# Apache TsFile 1.1.0

## New Feature
- Support new data types: STRING, BLOB, TIMESTAMP, DATE by @Cpaulyz in #76
- Add an equivalent .getLongs() method to .getTimes() in TimeColumn. by @Sh-Zh-7 in #61
- Return all columns in TsBlock class by @Sh-Zh-7 in #80

## Improvement/Bugfix

- Fix value filter allSatisfy bug by @liuminghui233 in #41
- Fix error log caused by ClosedByInterruptException by @shuwenwei in #47
- Fix the mistaken argument in LZ4 Uncompressor by @jt2594838 in #57
- Remove duplicate lookups in dictionary encoder by @MrQuansy in #54
- Optimize SeriesScanUtil by memorizing the order time and satisfied information for each Seq and Unseq Resource by @JackieTien97 in #58
- Fix TsBlockBuilder bug in AlignedPageReader and PageReader. by @JackieTien97 in #77
- Fix ZstdUncompressor by @lancelly in #132
- fix RLBE Encoding for float and double by @gzh23 in #143
- Fix uncompress page data by @shuwenwei in #161
- Fix encoder and decoder construction of RLBE by @jt2594838 in #162
- Fix aligned TimeValuePair npe by @shuwenwei in #173
- Fix StringStatistics data type by @shuwenwei in #177
- Fix bug in the conversion of int types to timestamp. by @FearfulTomcat27 in #224
- Fix error when write aligned tablet with null date by @HTHou in #251

# Apache TsFile 1.0.0

## New Features
Expand Down
5 changes: 0 additions & 5 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@ add_subdirectory(third_party)

add_subdirectory(src)

configure_file(
"${PROJECT_SOURCE_DIR}/cmake/config.h.in"
"${PROJECT_BINARY_DIR}/cmake_config.h"
)

add_subdirectory(test)
if(TESTS_ENABLED)
add_dependencies(TsFile_Test tsfile)
Expand Down
34 changes: 0 additions & 34 deletions cpp/cmake/build_function.cmake

This file was deleted.

19 changes: 0 additions & 19 deletions cpp/cmake/cmake_config.h

This file was deleted.

1 change: 0 additions & 1 deletion cpp/cmake/config.h.in

This file was deleted.

1 change: 0 additions & 1 deletion cpp/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ specific language governing permissions and limitations
under the License.
]]
message("Running in src diectory")
include(${PROJECT_SOURCE_DIR}/cmake/build_function.cmake)
if (${COV_ENABLED})
add_compile_options(-fprofile-arcs -ftest-coverage)
endif ()
Expand Down
23 changes: 22 additions & 1 deletion docs/src/.vuepress/public/bg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 22 additions & 1 deletion docs/src/.vuepress/public/home_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d50399a

Please sign in to comment.