revert

index
apache · Mar 3, 2025 · e9db8cd · e9db8cd
1 parent 49edd00
commit e9db8cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cpp/src/reader/aligned_chunk_reader.cc b/cpp/src/reader/aligned_chunk_reader.cc
@@ -531,6 +531,7 @@ int AlignedChunkReader::decode_time_value_buf_into_tsblock(
         while ((time_decoder_->has_remaining() || time_in.has_remaining())     \
                 && (value_decoder_->has_remaining() ||                         \
                 value_in.has_remaining())){                                    \
+            cur_value_index++;                                                 \
             if (((value_page_col_notnull_bitmap_[cur_value_index / 8] &        \
                   0xFF) &                                                      \
                  (mask >> (cur_value_index % 8))) == 0) {                      \
@@ -543,8 +544,8 @@ int AlignedChunkReader::decode_time_value_buf_into_tsblock(
                 if (ret != E_OK) {                                             \
                     break;                                                     \
                 }                                                              \
+                continue;                             \
             }                                                                  \
-            cur_value_index++;                                                 \
             if (UNLIKELY(!row_appender.add_row())) {                           \
                 ret = E_OVERFLOW;                                              \
                 break;                                                         \
@@ -574,7 +575,6 @@ int AlignedChunkReader::i32_DECODE_TYPED_TV_INTO_TSBLOCK(
         while ((time_decoder_->has_remaining() &&
                 value_decoder_->has_remaining()) ||
                (time_in.has_remaining() && value_in.has_remaining())) {
-            cur_value_index++;
             if (((value_page_col_notnull_bitmap_[cur_value_index / 8] & 0xFF) &
                  (mask >> (cur_value_index % 8))) == 0) {
                 RET_FAIL(time_decoder_->read_int64(time, time_in));

diff --git a/cpp/src/reader/qds_without_timegenerator.cc b/cpp/src/reader/qds_without_timegenerator.cc
@@ -68,7 +68,8 @@ int QDSWithoutTimeGenerator::init(TsFileIOReader *io_reader,
 
     for (size_t i = 0; i < path_count; i++) {
         get_next_tsblock(i, true);
-        data_types.push_back(value_iters_[i]->get_data_type());
+        data_types.push_back(value_iters_[i] != nullptr ?
+            value_iters_[i]->get_data_type() : TSDataType::NULL_TYPE);
     }
     result_set_metadata_ =
         std::make_shared<ResultSetMetadata>(column_names, data_types);