Skip to content

Commit 00d24fb

Browse files
committed
fix
1 parent 15a8ac4 commit 00d24fb

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

be/src/vec/exec/format/table/iceberg_reader.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ IcebergTableReader::IcebergTableReader(std::unique_ptr<GenericReader> file_forma
101101
}
102102

103103
Status IcebergTableReader::get_next_block(Block* block, size_t* read_rows, bool* eof) {
104+
// already get rows from fe
104105
if (_push_down_agg_type == TPushAggOp::type::COUNT && _remaining_table_level_row_count > 0) {
105106
auto rows = std::min(_remaining_table_level_row_count,
106107
(int64_t)_state->query_options().batch_size);

be/src/vec/exec/format/table/paimon_jni_reader.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,13 @@
1818
#include "paimon_jni_reader.h"
1919

2020
#include <map>
21-
#include <ostream>
2221

2322
#include "runtime/descriptors.h"
23+
#include "runtime/runtime_state.h"
2424
#include "runtime/types.h"
2525
#include "vec/core/types.h"
26-
2726
namespace doris {
2827
class RuntimeProfile;
29-
class RuntimeState;
30-
3128
namespace vectorized {
3229
class Block;
3330
} // namespace vectorized

be/src/vec/exec/format/table/paimon_reader.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <vector>
2121

2222
#include "common/status.h"
23+
#include "runtime/runtime_state.h"
2324
#include "util/deletion_vector.h"
2425

2526
namespace doris::vectorized {
@@ -37,8 +38,8 @@ PaimonReader::PaimonReader(std::unique_ptr<GenericReader> file_format_reader,
3738
ADD_CHILD_COUNTER(_profile, "NumDeleteRows", TUnit::UNIT, paimon_profile);
3839
_paimon_profile.delete_files_read_time =
3940
ADD_CHILD_TIMER(_profile, "DeleteFileReadTime", paimon_profile);
40-
if (range.__isset.row_count) {
41-
_remaining_table_level_row_count = range.row_count;
41+
if (range.table_format_params.paimon_params.__isset.row_count) {
42+
_remaining_table_level_row_count = range.table_format_params.paimon_params.row_count;
4243
} else {
4344
_remaining_table_level_row_count = -1;
4445
}

be/src/vec/exec/scan/vfile_scanner.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ Status VFileScanner::_get_next_reader() {
858858
&_slot_id_to_filter_conjuncts);
859859
std::unique_ptr<PaimonParquetReader> paimon_reader =
860860
PaimonParquetReader::create_unique(std::move(parquet_reader), _profile,
861-
*_params);
861+
_state, *_params, range);
862862
RETURN_IF_ERROR(paimon_reader->init_row_filters(range, _io_ctx.get()));
863863
_cur_reader = std::move(paimon_reader);
864864
} else {
@@ -920,8 +920,8 @@ Status VFileScanner::_get_next_reader() {
920920
&_file_col_names, _colname_to_value_range, _push_down_conjuncts, false,
921921
_real_tuple_desc, _default_val_row_desc.get(),
922922
&_not_single_slot_filter_conjuncts, &_slot_id_to_filter_conjuncts);
923-
std::unique_ptr<PaimonOrcReader> paimon_reader =
924-
PaimonOrcReader::create_unique(std::move(orc_reader), _profile, *_params);
923+
std::unique_ptr<PaimonOrcReader> paimon_reader = PaimonOrcReader::create_unique(
924+
std::move(orc_reader), _profile, _state, *_params, range);
925925
RETURN_IF_ERROR(paimon_reader->init_row_filters(range, _io_ctx.get()));
926926
_cur_reader = std::move(paimon_reader);
927927
} else {

0 commit comments

Comments
 (0)