Skip to content

Commit

Permalink
Fix 1.1.0 rc1 issues (#283)
Browse files Browse the repository at this point in the history
  • Loading branch information
HTHou authored Nov 6, 2024
1 parent 483819a commit fc54374
Show file tree
Hide file tree
Showing 16 changed files with 229 additions and 99 deletions.
60 changes: 32 additions & 28 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -204,51 +204,55 @@
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 is copied from lz4 project.

./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

5 changes: 0 additions & 5 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@ include_directories(${PROJECT_INCLUDE_DIR})

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 fc54374

Please sign in to comment.