This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch fix_1.1.0_rc1_issue in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 7e7a57aefea358a6a97a0761c09fe30afb722e5b Author: HTHou <[email protected]> AuthorDate: Mon Nov 4 18:11:43 2024 +0800 Fix 1.1.0 rc1 issues --- LICENSE | 49 +++++++++++++++++++++------------- cpp/cmake/build_function.cmake | 34 ----------------------- cpp/cmake/cmake_config.h | 19 ------------- cpp/cmake/config.h.in | 1 - docs/src/.vuepress/styles/config.scss | 19 +++++++++++++ docs/src/.vuepress/styles/index.scss | 25 ++++++++++++++--- docs/src/.vuepress/styles/palette.scss | 21 ++++++++++++++- pom.xml | 1 + 8 files changed, 92 insertions(+), 77 deletions(-) diff --git a/LICENSE b/LICENSE index d2cf035c..d62de86c 100644 --- a/LICENSE +++ b/LICENSE @@ -213,23 +213,23 @@ 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 @@ -239,16 +239,27 @@ License: http://www.apache.org/licenses/LICENSE-2.0 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 +-------------------------------------------------------------------------------- + +The following files include code is copied from lz4 project. + +./cpp/third_party/lz4/lz4.c +./cpp/third_party/lz4/lz4.h + +Copyright: (C) 2011-2020, Yann Collet. +Project page: http://www.lz4.org +License: https://github.com/lz4/lz4/blob/dev/LICENSE + diff --git a/cpp/cmake/build_function.cmake b/cpp/cmake/build_function.cmake deleted file mode 100644 index a1161690..00000000 --- a/cpp/cmake/build_function.cmake +++ /dev/null @@ -1,34 +0,0 @@ - -function(unittest_binary_link target_test target_src_files) - set(LOGGER_SRC_DIR ${PROJECT_SOURCE_DIR}/src/common/logger) - include_directories(${LOGGER_SRC_DIR}) - aux_source_directory(${LOGGER_SRC_DIR} logger_src_files) - set(target_files ${target_src_files} ${logger_src_files}) - - add_executable(${target_test} ${target_files}) - - # add_executable(${target_test} ${target_src_files}) - target_link_libraries(${target_test} gtest) - target_link_libraries(${target_test} z) - target_link_libraries(${target_test} lz4) - set_target_properties(${target_test} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${UNITTEST_BIN_DIR}) - set_target_properties(${target_test} PROPERTIES COMPILE_FLAGS "-pthread" LINK_FLAGS "-pthread") -endfunction(unittest_binary_link) - -function(add_statis_objtarget target_name target_src_list target_inc_list target_defile_list target_compile_list target_link_list) - message("add_statis_objtarget(target_name=${target_name}, target_src_list=${${target_src_list}})") - add_library(${target_name} OBJECT ${${target_src_list}}) - # # redefine_file_macro(${target_name}) - # if (target_inc_list) - # target_include_directories(${target_name} PUBLIC ${${target_inc_list}} ${PROJECT_INCLUDE_DIR}) - # endif() - if (target_defile_list) - target_compile_definitions(${target_name} PRIVATE ${target_defile_list}) - endif() - if (target_compile_list) - target_compile_options(${target_name} PRIVATE ${target_compile_list}) - endif() - if (target_link_list) - target_link_options(${target_name} PRIVATE ${target_link_list}) - endif() -endfunction(add_statis_objtarget) diff --git a/cpp/cmake/cmake_config.h b/cpp/cmake/cmake_config.h deleted file mode 100644 index d92824c6..00000000 --- a/cpp/cmake/cmake_config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * License); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* #undef ENABLE_TEST */ diff --git a/cpp/cmake/config.h.in b/cpp/cmake/config.h.in deleted file mode 100644 index 3e07b4e6..00000000 --- a/cpp/cmake/config.h.in +++ /dev/null @@ -1 +0,0 @@ -#cmakedefine ENABLE_TEST diff --git a/docs/src/.vuepress/styles/config.scss b/docs/src/.vuepress/styles/config.scss index f91061d7..434e53e0 100644 --- a/docs/src/.vuepress/styles/config.scss +++ b/docs/src/.vuepress/styles/config.scss @@ -1,3 +1,22 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + // you can change config here $colors: #c0392b, #d35400, #f39c12, #27ae60, #16a085, #2980b9, #8e44ad, #2c3e50, #7f8c8d !default; diff --git a/docs/src/.vuepress/styles/index.scss b/docs/src/.vuepress/styles/index.scss index 27aa8329..0796469e 100644 --- a/docs/src/.vuepress/styles/index.scss +++ b/docs/src/.vuepress/styles/index.scss @@ -1,3 +1,22 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + // place your custom styles here #main-description { max-width: 55rem; @@ -5,14 +24,14 @@ .vp-site-name{ display: none; -} +} // .vp-hero-info { // padding-inline: 10.5rem; // } .vp-feature-header, .vp-feature-title { color: var(--theme-color-light); } -.home.project +.home.project .theme-hope-content { max-width: unset; } @@ -26,4 +45,4 @@ .theme-hope-content:not(.custom)>p, .theme-hope-content:not(.custom)>ul p, .theme-hope-content:not(.custom)>ol p { text-align: start !important; -} \ No newline at end of file +} diff --git a/docs/src/.vuepress/styles/palette.scss b/docs/src/.vuepress/styles/palette.scss index 006c76b6..d1b4079e 100644 --- a/docs/src/.vuepress/styles/palette.scss +++ b/docs/src/.vuepress/styles/palette.scss @@ -1,3 +1,22 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + // you can change colors here $theme-color: #6738BD; -$home-page-width: 1280px; \ No newline at end of file +$home-page-width: 1280px; diff --git a/pom.xml b/pom.xml index f28f7c5e..a0af6813 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,7 @@ <exclude>**/.png</exclude> <exclude>**/.jpg</exclude> <exclude>**/.jpeg</exclude> + <exclude>**/.svg</exclude> <!--Generated by Apache Release --> <exclude>local-snapshots-dir/**</exclude> <!-- visualization plans -->
