You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by ga...@apache.org on 2026/06/16 06:13:18 UTC
(iceberg-cpp) branch main updated: fix: Handle unknown record_count better (#747)
This is an automated email from the ASF dual-hosted git repository.
wgtmac pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new f71f4853 fix: Handle unknown record_count better (#747)
f71f4853 is described below
commit f71f485394caf75b7f3db2f705882c3e8341d825
Author: Rahul Goel <go...@gmail.com>
AuthorDate: Tue Jun 16 02:13:14 2026 -0400
fix: Handle unknown record_count better (#747)
Fixes #732 Only special-case ```record_count == 0;```
Let negative/unknown counts fall through
to normal strict metrics evaluation.
---
src/iceberg/expression/strict_metrics_evaluator.cc | 9 +++++-
src/iceberg/test/strict_metrics_evaluator_test.cc | 35 ++++++++++++++++++++++
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/src/iceberg/expression/strict_metrics_evaluator.cc b/src/iceberg/expression/strict_metrics_evaluator.cc
index a9b5ded4..8f6d2787 100644
--- a/src/iceberg/expression/strict_metrics_evaluator.cc
+++ b/src/iceberg/expression/strict_metrics_evaluator.cc
@@ -532,9 +532,16 @@ Result<std::unique_ptr<StrictMetricsEvaluator>> StrictMetricsEvaluator::Make(
}
Result<bool> StrictMetricsEvaluator::Evaluate(const DataFile& data_file) const {
- if (data_file.record_count <= 0) {
+ if (data_file.record_count == 0) {
return kRowsMustMatch;
}
+ // Only -1 is a valid sentinel for an unknown row count (set when writer metrics omit
+ // the count); any value below -1 is invalid metadata.
+ if (data_file.record_count < -1) {
+ return InvalidArgument("Invalid record count: {}", data_file.record_count);
+ }
+ // For -1, fall through to normal strict metrics evaluation rather than
+ // assuming all rows must match.
StrictMetricsVisitor visitor(data_file, *schema_);
return Visit<bool, StrictMetricsVisitor>(expr_, visitor);
}
diff --git a/src/iceberg/test/strict_metrics_evaluator_test.cc b/src/iceberg/test/strict_metrics_evaluator_test.cc
index fcb99792..f9a28566 100644
--- a/src/iceberg/test/strict_metrics_evaluator_test.cc
+++ b/src/iceberg/test/strict_metrics_evaluator_test.cc
@@ -536,6 +536,24 @@ class StrictMetricsEvaluatorMigratedTest : public StrictMetricsEvaluatorTest {
return data_file;
}
+ std::shared_ptr<DataFile> MakeUnknownRecordCountFile() {
+ auto data_file = std::make_shared<DataFile>();
+ data_file->file_path = "unknown.parquet";
+ data_file->file_format = FileFormatType::kParquet;
+ // -1 is the sentinel for an unknown row count.
+ data_file->record_count = -1;
+ return data_file;
+ }
+
+ std::shared_ptr<DataFile> MakeInvalidRecordCountFile() {
+ auto data_file = std::make_shared<DataFile>();
+ data_file->file_path = "invalid.parquet";
+ data_file->file_format = FileFormatType::kParquet;
+ // Anything below the -1 sentinel is invalid metadata.
+ data_file->record_count = -2;
+ return data_file;
+ }
+
void ExpectShouldRead(const std::shared_ptr<Expression>& expr, bool expected,
std::shared_ptr<DataFile> file = nullptr,
bool case_sensitive = true) {
@@ -650,6 +668,23 @@ TEST_F(StrictMetricsEvaluatorMigratedTest, ZeroRecordFile) {
}
}
+TEST_F(StrictMetricsEvaluatorMigratedTest, UnknownRecordCountFile) {
+ // A file with an unknown row count (record_count == -1) must not be treated as if
+ // every row matches the predicate. AlwaysFalse can never match all rows.
+ auto unknown_record_count_file = MakeUnknownRecordCountFile();
+ ExpectShouldRead(Expressions::AlwaysFalse(), false, unknown_record_count_file);
+}
+
+TEST_F(StrictMetricsEvaluatorMigratedTest, InvalidRecordCountFile) {
+ // A record count below the -1 unknown sentinel is invalid and must error out.
+ auto invalid_record_count_file = MakeInvalidRecordCountFile();
+ ICEBERG_UNWRAP_OR_FAIL(auto evaluator, StrictMetricsEvaluator::Make(
+ Expressions::AlwaysFalse(), schema_, true));
+ auto result = evaluator->Evaluate(*invalid_record_count_file);
+ ASSERT_FALSE(result.has_value());
+ EXPECT_EQ(result.error().kind, ErrorKind::kInvalidArgument);
+}
+
TEST_F(StrictMetricsEvaluatorMigratedTest, Not) {
ExpectShouldRead(
Expressions::Not(Expressions::LessThan("id", Literal::Long(kIntMinValue - 25))),