@@ -452,10 +452,28 @@ std::optional<format::LocalColumnId> file_column_id_by_block_position(
452452 return std::nullopt ;
453453}
454454
455- bool has_expr_zonemap_filter (const format::FileScanRequest& request, const RuntimeState*) {
456- // FileScannerV2 metadata pruning is a fixed part of its scan pipeline and must not inherit
457- // the legacy scanner's expression ZoneMap session gate.
458- for (const auto & conjunct : request.conjuncts ) {
455+ VExprContextSPtrs metadata_pruning_safe_conjunct_prefix (const VExprContextSPtrs& conjuncts) {
456+ VExprContextSPtrs safe_prefix;
457+ safe_prefix.reserve (conjuncts.size ());
458+ for (const auto & conjunct : conjuncts) {
459+ if (conjunct == nullptr || conjunct->root () == nullptr ) {
460+ break ;
461+ }
462+ const auto root = conjunct->root ();
463+ const auto impl = root->get_impl ();
464+ const auto predicate = impl != nullptr ? impl : root;
465+ // Metadata pruning must not skip an earlier error-preserving predicate and discard rows
466+ // with a later predicate before the earlier one reaches row-level evaluation.
467+ if (!predicate->is_safe_to_execute_on_selected_rows ()) {
468+ break ;
469+ }
470+ safe_prefix.push_back (conjunct);
471+ }
472+ return safe_prefix;
473+ }
474+
475+ bool has_expr_zonemap_filter (const VExprContextSPtrs& conjuncts) {
476+ for (const auto & conjunct : conjuncts) {
459477 if (conjunct != nullptr && conjunct->root () != nullptr &&
460478 conjunct->root ()->can_evaluate_zonemap_filter ()) {
461479 return true ;
@@ -531,9 +549,11 @@ void accumulate_zonemap_stats(const ZoneMapEvalContext& ctx, ParquetPruningStats
531549
532550} // namespace
533551
534- bool can_use_parquet_page_index (const format::FileScanRequest& request,
535- const RuntimeState* runtime_state) {
536- return config::enable_parquet_page_index && has_expr_zonemap_filter (request, runtime_state);
552+ bool can_use_parquet_page_index (const format::FileScanRequest& request, const RuntimeState*) {
553+ // FileScannerV2 metadata pruning is a fixed part of its scan pipeline and must not inherit
554+ // the legacy scanner's expression ZoneMap session gate.
555+ return config::enable_parquet_page_index &&
556+ has_expr_zonemap_filter (metadata_pruning_safe_conjunct_prefix (request.conjuncts ));
537557}
538558
539559std::shared_ptr<segment_v2::ZoneMap> ParquetStatisticsUtils::MakeZoneMap (
@@ -632,8 +652,9 @@ bool check_native_statistics(const tparquet::FileMetaData& metadata,
632652 const tparquet::RowGroup& row_group,
633653 const std::vector<std::unique_ptr<ParquetColumnSchema>>& file_schema,
634654 const format::FileScanRequest& request,
635- ParquetPruningStats* pruning_stats, const cctz::time_zone* timezone) {
636- const auto slot_indexes = collect_expr_zonemap_slot_indexes (request.conjuncts );
655+ const VExprContextSPtrs& conjuncts, ParquetPruningStats* pruning_stats,
656+ const cctz::time_zone* timezone) {
657+ const auto slot_indexes = collect_expr_zonemap_slot_indexes (conjuncts);
637658 if (slot_indexes.empty ()) {
638659 return false ;
639660 }
@@ -668,7 +689,7 @@ bool check_native_statistics(const tparquet::FileMetaData& metadata,
668689 }
669690 add_slot_zonemap (&ctx, slot_index, column_schema->type , std::move (zone_map));
670691 }
671- const auto result = VExprContext::evaluate_zonemap_filter (request. conjuncts , ctx);
692+ const auto result = VExprContext::evaluate_zonemap_filter (conjuncts, ctx);
672693 accumulate_zonemap_stats (ctx, pruning_stats);
673694 return result == ZoneMapFilterResult::kNoMatch ;
674695}
@@ -881,9 +902,8 @@ Status select_row_groups_by_metadata(
881902 const std::vector<std::unique_ptr<ParquetColumnSchema>>& file_schema,
882903 const format::FileScanRequest& request, const std::vector<int >* candidate_row_groups,
883904 std::vector<int >* selected_row_groups, bool enable_bloom_filter,
884- ParquetPruningStats* pruning_stats, const cctz::time_zone* timezone,
885- const RuntimeState* runtime_state, ParquetFileContext* file_context,
886- const ParquetColumnReaderProfile& column_reader_profile,
905+ ParquetPruningStats* pruning_stats, const cctz::time_zone* timezone, const RuntimeState*,
906+ ParquetFileContext* file_context, const ParquetColumnReaderProfile& column_reader_profile,
887907 ParquetMetadataProbeMode probe_mode) {
888908 int64_t timer_sink = 0 ;
889909 SCOPED_RAW_TIMER (pruning_stats == nullptr ? &timer_sink
@@ -897,6 +917,7 @@ Status select_row_groups_by_metadata(
897917 if (pruning_stats != nullptr ) {
898918 pruning_stats->total_row_groups = cast_set<int64_t >(candidate_size);
899919 }
920+ const auto zonemap_conjuncts = metadata_pruning_safe_conjunct_prefix (request.conjuncts );
900921 selected_row_groups->reserve (candidate_size);
901922 for (size_t candidate_idx = 0 ; candidate_idx < candidate_size; ++candidate_idx) {
902923 const int row_group_idx = candidate_row_groups == nullptr
@@ -920,9 +941,9 @@ Status select_row_groups_by_metadata(
920941 }
921942 ParquetRowGroupPruneReason prune_reason = ParquetRowGroupPruneReason::NONE ;
922943 if (probe_mode != ParquetMetadataProbeMode::EXPENSIVE_ONLY &&
923- has_expr_zonemap_filter (request, runtime_state ) &&
924- check_native_statistics (metadata, row_group, file_schema, request, pruning_stats ,
925- timezone)) {
944+ has_expr_zonemap_filter (zonemap_conjuncts ) &&
945+ check_native_statistics (metadata, row_group, file_schema, request, zonemap_conjuncts ,
946+ pruning_stats, timezone)) {
926947 prune_reason = ParquetRowGroupPruneReason::STATISTICS ;
927948 }
928949 if (probe_mode != ParquetMetadataProbeMode::FOOTER_ONLY &&
@@ -1241,8 +1262,7 @@ Status select_row_group_ranges_by_native_page_index(
12411262 const std::vector<std::unique_ptr<ParquetColumnSchema>>& file_schema,
12421263 const format::FileScanRequest& request, int64_t row_group_rows,
12431264 std::vector<RowRange>* selected_ranges, std::map<int , ParquetPageSkipPlan>* page_skip_plans,
1244- ParquetPruningStats* pruning_stats, const cctz::time_zone* timezone,
1245- const RuntimeState* runtime_state) {
1265+ ParquetPruningStats* pruning_stats, const cctz::time_zone* timezone, const RuntimeState*) {
12461266 int64_t filter_time_sink = 0 ;
12471267 SCOPED_RAW_TIMER (pruning_stats == nullptr ? &filter_time_sink
12481268 : &pruning_stats->page_index_filter_time );
@@ -1252,16 +1272,17 @@ Status select_row_group_ranges_by_native_page_index(
12521272 if (page_skip_plans != nullptr ) {
12531273 page_skip_plans->clear ();
12541274 }
1275+ const auto zonemap_conjuncts = metadata_pruning_safe_conjunct_prefix (request.conjuncts );
12551276 if (row_group_rows <= 0 || !config::enable_parquet_page_index ||
1256- !has_expr_zonemap_filter (request, runtime_state ) || page_indexes.empty ()) {
1277+ !has_expr_zonemap_filter (zonemap_conjuncts ) || page_indexes.empty ()) {
12571278 return Status::OK ();
12581279 }
12591280 if (pruning_stats != nullptr ) {
12601281 ++pruning_stats->page_index_read_calls ;
12611282 }
12621283
12631284 std::map<int , VExprContextSPtrs> conjuncts_by_slot;
1264- for (const auto & conjunct : request. conjuncts ) {
1285+ for (const auto & conjunct : zonemap_conjuncts ) {
12651286 const auto slot_index = expr_zonemap::single_slot_zonemap_index (conjunct);
12661287 if (slot_index >= 0 ) {
12671288 conjuncts_by_slot[slot_index].push_back (conjunct);
0 commit comments