This is an automated email from the ASF dual-hosted git repository. colinlee pushed a commit to branch fix_overflow in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 8eaeab019076a9b46beafce805d5d7e42fbdc1e7 Author: ColinLee <[email protected]> AuthorDate: Mon Feb 23 20:34:14 2026 +0800 remove warning. --- cpp/examples/c_examples/demo_read.c | 6 +++--- cpp/src/encoding/float_sprintz_decoder.h | 10 +++++----- cpp/src/encoding/gorilla_decoder.h | 2 +- cpp/src/encoding/int32_sprintz_decoder.h | 4 ++-- cpp/src/encoding/int64_sprintz_decoder.h | 2 +- cpp/src/encoding/ts2diff_decoder.h | 16 ++++++++-------- cpp/src/reader/filter/tag_filter.cc | 2 +- cpp/src/reader/filter/tag_filter.h | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cpp/examples/c_examples/demo_read.c b/cpp/examples/c_examples/demo_read.c index 05cc8620..1d5a1199 100644 --- a/cpp/examples/c_examples/demo_read.c +++ b/cpp/examples/c_examples/demo_read.c @@ -55,7 +55,7 @@ ERRNO read_tsfile() { // Timestamp at column 1 and column index begin from 1. Timestamp timestamp = tsfile_result_set_get_value_by_index_int64_t(ret, 1); - printf("%ld\n", timestamp); + printf("%lld\n", (long long)timestamp); for (int i = 1; i <= column_num; i++) { if (tsfile_result_set_is_null_by_index(ret, i)) { printf(" null "); @@ -72,8 +72,8 @@ ERRNO read_tsfile() { i)); break; case TS_DATATYPE_INT64: - printf("%ld\n", - tsfile_result_set_get_value_by_index_int64_t(ret, + printf("%lld\n", + (long long)tsfile_result_set_get_value_by_index_int64_t(ret, i)); break; case TS_DATATYPE_FLOAT: diff --git a/cpp/src/encoding/float_sprintz_decoder.h b/cpp/src/encoding/float_sprintz_decoder.h index 55801734..e3842eaa 100644 --- a/cpp/src/encoding/float_sprintz_decoder.h +++ b/cpp/src/encoding/float_sprintz_decoder.h @@ -56,20 +56,20 @@ class FloatSprintzDecoder : public SprintzDecoder { predict_scheme_ = method; } - int read_boolean(bool& ret_value, common::ByteStream& in) { + int read_boolean(bool& ret_value, common::ByteStream& in) override { return common::E_TYPE_NOT_MATCH; } - int read_int32(int32_t& ret_value, common::ByteStream& in) { + int read_int32(int32_t& ret_value, common::ByteStream& in) override { return common::E_TYPE_NOT_MATCH; } - int read_int64(int64_t& ret_value, common::ByteStream& in) { + int read_int64(int64_t& ret_value, common::ByteStream& in) override { return common::E_TYPE_NOT_MATCH; } - int read_double(double& ret_value, common::ByteStream& in) { + int read_double(double& ret_value, common::ByteStream& in) override { return common::E_TYPE_NOT_MATCH; } int read_String(common::String& ret_value, common::PageArena& pa, - common::ByteStream& in) { + common::ByteStream& in) override { return common::E_TYPE_NOT_MATCH; } diff --git a/cpp/src/encoding/gorilla_decoder.h b/cpp/src/encoding/gorilla_decoder.h index 4429f2b5..5684561a 100644 --- a/cpp/src/encoding/gorilla_decoder.h +++ b/cpp/src/encoding/gorilla_decoder.h @@ -37,7 +37,7 @@ class GorillaDecoder : public Decoder { ~GorillaDecoder() override = default; - void reset() { + void reset() override { type_ = common::GORILLA; stored_value_ = 0; stored_leading_zeros_ = INT32_MAX; diff --git a/cpp/src/encoding/int32_sprintz_decoder.h b/cpp/src/encoding/int32_sprintz_decoder.h index df9a7c8f..3d15597e 100644 --- a/cpp/src/encoding/int32_sprintz_decoder.h +++ b/cpp/src/encoding/int32_sprintz_decoder.h @@ -55,7 +55,7 @@ class Int32SprintzDecoder : public SprintzDecoder { predict_scheme_ = method; } - bool has_remaining(const common::ByteStream& in) { + bool has_remaining(const common::ByteStream& in) override { uint32_t min_len = sizeof(int32_t) + 1; return (is_block_read_ && current_count_ < block_size_) || in.remaining_size() >= min_len; @@ -79,7 +79,7 @@ class Int32SprintzDecoder : public SprintzDecoder { return common::E_TYPE_NOT_MATCH; } - int read_int32(int32_t& ret_value, common::ByteStream& in) { + int read_int32(int32_t& ret_value, common::ByteStream& in) override { int ret = common::E_OK; if (!is_block_read_) { if (RET_FAIL(decode_block(in))) { diff --git a/cpp/src/encoding/int64_sprintz_decoder.h b/cpp/src/encoding/int64_sprintz_decoder.h index 263ce769..a7e3fdd2 100644 --- a/cpp/src/encoding/int64_sprintz_decoder.h +++ b/cpp/src/encoding/int64_sprintz_decoder.h @@ -61,7 +61,7 @@ class Int64SprintzDecoder : public SprintzDecoder { std::fill(current_buffer_.begin(), current_buffer_.end(), 0); } - bool has_remaining(const common::ByteStream& in) { + bool has_remaining(const common::ByteStream& in) override { return (is_block_read_ && current_count_ < block_size_) || in.has_remaining(); } diff --git a/cpp/src/encoding/ts2diff_decoder.h b/cpp/src/encoding/ts2diff_decoder.h index c43dcf9d..32584546 100644 --- a/cpp/src/encoding/ts2diff_decoder.h +++ b/cpp/src/encoding/ts2diff_decoder.h @@ -36,7 +36,7 @@ class TS2DIFFDecoder : public Decoder { TS2DIFFDecoder() { reset(); } ~TS2DIFFDecoder() override {} - void reset() { + void reset() override { write_index_ = -1; bits_left_ = 0; stored_value_ = 0; @@ -48,7 +48,7 @@ class TS2DIFFDecoder : public Decoder { current_index_ = 0; } - FORCE_INLINE bool has_remaining(const common::ByteStream& buffer) { + FORCE_INLINE bool has_remaining(const common::ByteStream& buffer) override { if (buffer.has_remaining()) return true; return bits_left_ != 0 || (current_index_ <= write_index_ && write_index_ != -1 && current_index_ != 0); @@ -98,13 +98,13 @@ class TS2DIFFDecoder : public Decoder { } T decode(common::ByteStream& in); - int read_boolean(bool& ret_value, common::ByteStream& in); - int read_int32(int32_t& ret_value, common::ByteStream& in); - int read_int64(int64_t& ret_value, common::ByteStream& in); - int read_float(float& ret_value, common::ByteStream& in); - int read_double(double& ret_value, common::ByteStream& in); + int read_boolean(bool& ret_value, common::ByteStream& in) override; + int read_int32(int32_t& ret_value, common::ByteStream& in) override; + int read_int64(int64_t& ret_value, common::ByteStream& in) override; + int read_float(float& ret_value, common::ByteStream& in) override; + int read_double(double& ret_value, common::ByteStream& in) override; int read_String(common::String& ret_value, common::PageArena& pa, - common::ByteStream& in); + common::ByteStream& in) override; public: T first_value_; diff --git a/cpp/src/reader/filter/tag_filter.cc b/cpp/src/reader/filter/tag_filter.cc index c4c56a1d..f92c9ef8 100644 --- a/cpp/src/reader/filter/tag_filter.cc +++ b/cpp/src/reader/filter/tag_filter.cc @@ -26,7 +26,7 @@ namespace storage { // TagFilter base class implementation TagFilter::TagFilter(int col_idx, std::string tag_value) - : col_idx_(col_idx), value_(std::move(tag_value)), value2_("") {} + : value_(std::move(tag_value)), value2_(""), col_idx_(col_idx) {} TagFilter::~TagFilter() = default; diff --git a/cpp/src/reader/filter/tag_filter.h b/cpp/src/reader/filter/tag_filter.h index c7d8843f..b3b03d95 100644 --- a/cpp/src/reader/filter/tag_filter.h +++ b/cpp/src/reader/filter/tag_filter.h @@ -35,7 +35,7 @@ class TagFilter : public Filter { TagFilter(int col_idx, std::string tag_value); ~TagFilter() override; - virtual bool satisfyRow(int time, std::vector<std::string*> segments) const; + bool satisfyRow(int time, std::vector<std::string*> segments) const override; virtual bool satisfyRow(std::vector<std::string*> segments) const; std::string value_;
