This is an automated email from the ASF dual-hosted git repository. colinlee pushed a commit to branch fix_cpp in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 082a6b796880c4fb27a2b2947fe38a6cc255ef30 Author: ColinLee <[email protected]> AuthorDate: Thu Dec 18 18:46:50 2025 +0800 tmp code. --- cpp/src/common/tsfile_common.h | 2 +- cpp/src/encoding/plain_decoder.h | 3 ++- cpp/src/reader/aligned_chunk_reader.cc | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cpp/src/common/tsfile_common.h b/cpp/src/common/tsfile_common.h index 39cd027e..12b30523 100644 --- a/cpp/src/common/tsfile_common.h +++ b/cpp/src/common/tsfile_common.h @@ -589,7 +589,7 @@ class AlignedTimeseriesIndex : public ITimeseriesIndex { return value_ts_idx_->get_measurement_name(); } virtual common::TSDataType get_data_type() const { - return time_ts_idx_->get_data_type(); + return value_ts_idx_->get_data_type(); } virtual Statistic* get_statistic() const { return value_ts_idx_->get_statistic(); diff --git a/cpp/src/encoding/plain_decoder.h b/cpp/src/encoding/plain_decoder.h index 27e8006f..c2627f71 100644 --- a/cpp/src/encoding/plain_decoder.h +++ b/cpp/src/encoding/plain_decoder.h @@ -27,7 +27,8 @@ namespace storage { class PlainDecoder : public Decoder { public: ~PlainDecoder() override = default; - FORCE_INLINE void reset() override { /* do nothing */ } + FORCE_INLINE void reset() override { /* do nothing */ + } FORCE_INLINE bool has_remaining(const common::ByteStream& buffer) override { return buffer.has_remaining(); } diff --git a/cpp/src/reader/aligned_chunk_reader.cc b/cpp/src/reader/aligned_chunk_reader.cc index e4779184..cf3ca832 100644 --- a/cpp/src/reader/aligned_chunk_reader.cc +++ b/cpp/src/reader/aligned_chunk_reader.cc @@ -673,7 +673,7 @@ int AlignedChunkReader::STRING_DECODE_TYPED_TV_INTO_TSBLOCK( int64_t time = 0; common::String value; uint32_t mask = 1 << 7; - while (time_decoder_->has_remaining(time_in)) { + while (time_decoder_->has_remaining(time_in) && value_decoder_->has_remaining(value_in)) { cur_value_index++; bool should_read_data = true; if (value_page_col_notnull_bitmap_.empty() ||
