This is an automated email from the ASF dual-hosted git repository. jiangtian pushed a commit to branch test_v4_CI in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 808acefc92c8624c83fed21aef3cba65a865a61e Merge: 2a9362e6 2025ee20 Author: Tian Jiang <[email protected]> AuthorDate: Fri Aug 2 15:36:01 2024 +0800 Merge branch 'develop' into test_v4_CI # Conflicts: # cpp/bench_mark/bench_mark_src/bench_conf.h # cpp/common/include/common.hpp # cpp/common/src/common.cpp # cpp/examples/c_examples/c_examples.h # cpp/src/reader/query_data_set.h # cpp/tsfile/include/tsfile.hpp # cpp/tsfile/src/tsfile.cpp # java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileConfig.java # java/tsfile/src/main/java/org/apache/tsfile/exception/read/NoColumnException.java # java/tsfile/src/main/java/org/apache/tsfile/exception/read/UnsupportedOrderingException.java # java/tsfile/src/main/java/org/apache/tsfile/exception/write/NoTableException.java # java/tsfile/src/main/java/org/apache/tsfile/read/expression/ExpressionTree.java # java/tsfile/src/main/java/org/apache/tsfile/read/reader/chunk/ChunkReaderWithoutStatistics.java # java/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java # java/tsfile/src/main/java/org/apache/tsfile/write/record/TSRecord.java # java/tsfile/src/test/java/org/apache/tsfile/read/reader/AlignedChunkReaderWithoutStatisticsTest.java cpp/bench_mark/bench_mark_src/bench_conf.h | 12 +----------- cpp/examples/c_examples/c_examples.h | 14 +------------- cpp/src/reader/query_data_set.h | 11 +---------- .../apache/tsfile/exception/read/NoColumnException.java | 3 ++- .../exception/read/UnsupportedOrderingException.java | 2 +- .../apache/tsfile/exception/write/NoTableException.java | 3 ++- .../org/apache/tsfile/read/expression/ExpressionTree.java | 2 +- 7 files changed, 9 insertions(+), 38 deletions(-) diff --cc cpp/bench_mark/bench_mark_src/bench_conf.h index 248822a1,9d961d72..f2a4de75 --- a/cpp/bench_mark/bench_mark_src/bench_conf.h +++ b/cpp/bench_mark/bench_mark_src/bench_conf.h @@@ -16,17 -16,6 +16,7 @@@ * specific language governing permissions and limitations * under the License. */ - <<<<<<<< HEAD:java/tsfile/src/main/java/org/apache/tsfile/exception/IllegalDeviceIDException.java + - package org.apache.tsfile.exception; - - public class IllegalDeviceIDException extends RuntimeException { - - public IllegalDeviceIDException(String message) { - super(message); - } - } - ======== #include <vector> namespace bench { @@@ -34,5 -23,4 +24,5 @@@ int LOOP_NUM = 100000 int THREAD_NUM = 1; int TIMESERIES_NUM = 50; std::vector<int> TYPE_LIST = {0, 0, 1, 0, 1}; -} // namespace bench +} // namespace bench - >>>>>>>> develop:cpp/bench_mark/bench_mark_src/bench_conf.h ++ diff --cc cpp/examples/c_examples/c_examples.h index 71f5654d,d29090cb..a0405138 --- a/cpp/examples/c_examples/c_examples.h +++ b/cpp/examples/c_examples/c_examples.h @@@ -17,18 -17,7 +17,6 @@@ * under the License. */ - <<<<<<<< HEAD:java/tsfile/src/main/java/org/apache/tsfile/read/common/type/AbstractType.java - package org.apache.tsfile.read.common.type; - - public abstract class AbstractType implements Type { - - @Override - public String toString() { - return getDisplayName(); - } - } - ======== -- #include "cwrapper/TsFile-cwrapper.h" #ifdef __cplusplus @@@ -40,5 -29,4 +28,5 @@@ ErrorCode read_tsfile() #ifdef __cplusplus } -#endif +#endif - >>>>>>>> develop:cpp/examples/c_examples/c_examples.h ++ diff --cc cpp/src/reader/query_data_set.h index 8ea18d36,85842766..abea04af --- a/cpp/src/reader/query_data_set.h +++ b/cpp/src/reader/query_data_set.h @@@ -43,4 -34,3 +34,4 @@@ class QueryDataSet } // namespace storage #endif // READER_QUERY_DATA_SET_H - >>>>>>>> develop:cpp/src/reader/query_data_set.h ++ diff --cc java/tsfile/src/main/java/org/apache/tsfile/exception/read/NoColumnException.java index 5aca86ab,d29090cb..5736c2b3 --- a/java/tsfile/src/main/java/org/apache/tsfile/exception/read/NoColumnException.java +++ b/java/tsfile/src/main/java/org/apache/tsfile/exception/read/NoColumnException.java @@@ -17,11 -17,16 +17,12 @@@ * under the License. */ +package org.apache.tsfile.exception.read; -#include "cwrapper/TsFile-cwrapper.h" +public class NoColumnException extends ReadProcessException { -#ifdef __cplusplus -extern "C" { -#endif - -ErrorCode write_tsfile(); -ErrorCode read_tsfile(); - -#ifdef __cplusplus + public NoColumnException(String columnName) { + super(String.format("No column: %s", columnName)); + } } -#endif ++ diff --cc java/tsfile/src/main/java/org/apache/tsfile/exception/read/UnsupportedOrderingException.java index 6b7120c7,5a4489de..d882a575 --- a/java/tsfile/src/main/java/org/apache/tsfile/exception/read/UnsupportedOrderingException.java +++ b/java/tsfile/src/main/java/org/apache/tsfile/exception/read/UnsupportedOrderingException.java @@@ -17,11 -17,18 +17,11 @@@ * under the License. */ -package org.apache.tsfile.read.common.type; +package org.apache.tsfile.exception.read; -public enum TypeEnum { - INT32, +public class UnsupportedOrderingException extends ReadProcessException { - INT64, - - FLOAT, - - DOUBLE, - - BOOLEAN, - - BINARY + public UnsupportedOrderingException(String ordering) { + super(String.format("Unsupported ordering: %s", ordering)); - } ++ } } diff --cc java/tsfile/src/main/java/org/apache/tsfile/exception/write/NoTableException.java index 1c209c3c,d29090cb..2f3426d8 --- a/java/tsfile/src/main/java/org/apache/tsfile/exception/write/NoTableException.java +++ b/java/tsfile/src/main/java/org/apache/tsfile/exception/write/NoTableException.java @@@ -17,11 -17,16 +17,12 @@@ * under the License. */ +package org.apache.tsfile.exception.write; -#include "cwrapper/TsFile-cwrapper.h" +public class NoTableException extends WriteProcessException { -#ifdef __cplusplus -extern "C" { -#endif - -ErrorCode write_tsfile(); -ErrorCode read_tsfile(); - -#ifdef __cplusplus + public NoTableException(String tableName) { + super(String.format("Table %s not found", tableName)); + } } -#endif ++
