From c2eeed150796c5d31569b47e699574fb39aa5c3d Mon Sep 17 00:00:00 2001 From: zy-kkk Date: Wed, 4 Jun 2025 14:10:41 +0800 Subject: [PATCH 1/3] [fix](build) fix macOS build --- be/src/vec/exec/format/parquet/vparquet_group_reader.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/be/src/vec/exec/format/parquet/vparquet_group_reader.cpp b/be/src/vec/exec/format/parquet/vparquet_group_reader.cpp index 4f06f0e1fe6141..06fc637e15d5d7 100644 --- a/be/src/vec/exec/format/parquet/vparquet_group_reader.cpp +++ b/be/src/vec/exec/format/parquet/vparquet_group_reader.cpp @@ -779,8 +779,10 @@ Status RowGroupReader::_get_current_batch_row_id(size_t read_rows) { break; } if (read_range_rows + (range.last_row - range.first_row) > _total_read_rows) { - auto fi = std::max(_total_read_rows - read_range_rows, 0L) + range.first_row; - auto len = std::min(read_rows, (size_t)std::max(range.last_row - fi, 0L)); + int64_t offset = std::max(_total_read_rows - read_range_rows, static_cast(0)); + auto fi = offset + range.first_row; + auto len = std::min(read_rows, static_cast(std::max(range.last_row - fi, + static_cast(0)))); read_rows -= len; for (auto i = 0; i < len; i++) { From ba8b81791cc3fe27777871aebcb0f8cc7eb1a813 Mon Sep 17 00:00:00 2001 From: zy-kkk Date: Mon, 9 Jun 2025 14:39:56 +0800 Subject: [PATCH 2/3] [fix](build) fix macOS build --- be/src/vec/exec/format/parquet/vparquet_group_reader.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/be/src/vec/exec/format/parquet/vparquet_group_reader.cpp b/be/src/vec/exec/format/parquet/vparquet_group_reader.cpp index 06fc637e15d5d7..109b48caea4f8a 100644 --- a/be/src/vec/exec/format/parquet/vparquet_group_reader.cpp +++ b/be/src/vec/exec/format/parquet/vparquet_group_reader.cpp @@ -779,10 +779,9 @@ Status RowGroupReader::_get_current_batch_row_id(size_t read_rows) { break; } if (read_range_rows + (range.last_row - range.first_row) > _total_read_rows) { - int64_t offset = std::max(_total_read_rows - read_range_rows, static_cast(0)); - auto fi = offset + range.first_row; - auto len = std::min(read_rows, static_cast(std::max(range.last_row - fi, - static_cast(0)))); + int64_t fi = std::max(_total_read_rows , read_range_rows) - read_range_rows + range.first_row; + size_t len = std::min(read_rows, (size_t)(std::max(range.last_row, fi) -fi)); + read_rows -= len; for (auto i = 0; i < len; i++) { From 7cecb7466e327eaee3b1ac18da5dae91cda47590 Mon Sep 17 00:00:00 2001 From: zy-kkk Date: Tue, 10 Jun 2025 11:15:26 +0800 Subject: [PATCH 3/3] [fix](build) fix macOS build --- be/src/vec/exec/format/parquet/vparquet_group_reader.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/be/src/vec/exec/format/parquet/vparquet_group_reader.cpp b/be/src/vec/exec/format/parquet/vparquet_group_reader.cpp index 109b48caea4f8a..70ac862ba58183 100644 --- a/be/src/vec/exec/format/parquet/vparquet_group_reader.cpp +++ b/be/src/vec/exec/format/parquet/vparquet_group_reader.cpp @@ -779,8 +779,9 @@ Status RowGroupReader::_get_current_batch_row_id(size_t read_rows) { break; } if (read_range_rows + (range.last_row - range.first_row) > _total_read_rows) { - int64_t fi = std::max(_total_read_rows , read_range_rows) - read_range_rows + range.first_row; - size_t len = std::min(read_rows, (size_t)(std::max(range.last_row, fi) -fi)); + int64_t fi = + std::max(_total_read_rows, read_range_rows) - read_range_rows + range.first_row; + size_t len = std::min(read_rows, (size_t)(std::max(range.last_row, fi) - fi)); read_rows -= len;