HuaHuaY commented on code in PR #403:
URL: https://github.com/apache/iceberg-cpp/pull/403#discussion_r2597836881


##########
src/iceberg/expression/manifest_evaluator.cc:
##########
@@ -0,0 +1,391 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include "iceberg/expression/manifest_evaluator.h"
+
+#include "iceberg/expression/binder.h"
+#include "iceberg/expression/expression_visitor.h"
+#include "iceberg/expression/rewrite_not.h"
+#include "iceberg/manifest/manifest_list.h"
+#include "iceberg/row/struct_like.h"
+#include "iceberg/schema.h"
+#include "iceberg/util/macros.h"
+
+namespace iceberg {
+
+namespace {
+constexpr bool kRowsMightMatch = true;
+constexpr bool kRowCannotMatch = false;
+constexpr int32_t kInPredicateLimit = 200;
+}  // namespace
+
+class ManifestEvalVisitor : public BoundVisitor<bool> {
+ public:
+  explicit ManifestEvalVisitor(const ManifestFile& manifest)
+      : stats_(manifest.partitions) {}
+
+  Result<bool> AlwaysTrue() override { return true; }
+
+  Result<bool> AlwaysFalse() override { return false; }
+
+  Result<bool> Not(bool child_result) override { return !child_result; }
+
+  Result<bool> And(bool left_result, bool right_result) override {
+    return left_result && right_result;
+  }
+
+  Result<bool> Or(bool left_result, bool right_result) override {
+    return left_result || right_result;
+  }
+
+  Result<bool> IsNull(const std::shared_ptr<Bound>& expr) override {
+    // no need to check whether the field is required because binding 
evaluates that case
+    // if the column has no null values, the expression cannot match
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    if (!stats_.at(pos).contains_null) {
+      return kRowCannotMatch;
+    }
+
+    return kRowsMightMatch;
+  }
+
+  Result<bool> NotNull(const std::shared_ptr<Bound>& expr) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    if (AllValuesAreNull(stats_.at(pos), ref->type()->type_id())) {
+      return kRowCannotMatch;
+    }
+
+    return kRowsMightMatch;
+  }
+
+  Result<bool> IsNaN(const std::shared_ptr<Bound>& expr) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    if (stats_.at(pos).contains_nan.has_value() && 
!stats_.at(pos).contains_nan.value()) {
+      return kRowCannotMatch;
+    }
+    if (AllValuesAreNull(stats_.at(pos), ref->type()->type_id())) {
+      return kRowCannotMatch;
+    }
+
+    return kRowsMightMatch;
+  }
+
+  Result<bool> NotNaN(const std::shared_ptr<Bound>& expr) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    // if containsNaN is true, containsNull is false and lowerBound is null, 
all values
+    // are NaN
+    if (summary.contains_nan.has_value() && summary.contains_nan.value() &&
+        !summary.contains_null && !summary.lower_bound.has_value()) {
+      return kRowCannotMatch;
+    }
+
+    return kRowsMightMatch;
+  }
+
+  Result<bool> Lt(const std::shared_ptr<Bound>& expr, const Literal& lit) 
override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    if (!summary.lower_bound.has_value()) {
+      return kRowCannotMatch;  // values are all null
+    }
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto lower, DeserializeBoundLiteral(summary.lower_bound.value(), 
ref->type()));
+    if (lower >= lit) {
+      return kRowCannotMatch;
+    }
+    return kRowsMightMatch;
+  }
+
+  Result<bool> LtEq(const std::shared_ptr<Bound>& expr, const Literal& lit) 
override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    if (!summary.lower_bound.has_value()) {
+      return kRowCannotMatch;  // values are all null
+    }
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto lower, DeserializeBoundLiteral(summary.lower_bound.value(), 
ref->type()));
+    if (lower > lit) {
+      return kRowCannotMatch;
+    }
+    return kRowsMightMatch;
+  }
+
+  Result<bool> Gt(const std::shared_ptr<Bound>& expr, const Literal& lit) 
override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    if (!summary.upper_bound.has_value()) {
+      return kRowCannotMatch;  // values are all null
+    }
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto upper, DeserializeBoundLiteral(summary.upper_bound.value(), 
ref->type()));
+    if (upper <= lit) {
+      return kRowCannotMatch;
+    }
+    return kRowsMightMatch;
+  }
+
+  Result<bool> GtEq(const std::shared_ptr<Bound>& expr, const Literal& lit) 
override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    if (!summary.upper_bound.has_value()) {
+      return kRowCannotMatch;  // values are all null
+    }
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto upper, DeserializeBoundLiteral(summary.upper_bound.value(), 
ref->type()));
+    if (upper < lit) {
+      return kRowCannotMatch;
+    }
+    return kRowsMightMatch;
+  }
+
+  Result<bool> Eq(const std::shared_ptr<Bound>& expr, const Literal& lit) 
override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    if (!summary.lower_bound.has_value() || !summary.upper_bound.has_value()) {
+      return kRowCannotMatch;  // values are all null and literal cannot 
contain null
+    }
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto lower, DeserializeBoundLiteral(summary.lower_bound.value(), 
ref->type()));
+    if (lower > lit) {
+      return kRowCannotMatch;
+    }
+
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto upper, DeserializeBoundLiteral(summary.upper_bound.value(), 
ref->type()));
+    if (upper < lit) {
+      return kRowCannotMatch;
+    }
+
+    return kRowsMightMatch;
+  }
+
+  Result<bool> NotEq(const std::shared_ptr<Bound>& expr, const Literal& lit) 
override {
+    // because the bounds are not necessarily a min or max value, this cannot 
be answered
+    // using them. notEq(col, X) with (X, Y) doesn't guarantee that X is a 
value in col.
+    return kRowsMightMatch;
+  }
+
+  Result<bool> In(const std::shared_ptr<Bound>& expr,
+                  const BoundSetPredicate::LiteralSet& literal_set) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    if (!summary.lower_bound.has_value() || !summary.upper_bound.has_value()) {
+      // values are all null and literalSet cannot contain null.
+      return kRowCannotMatch;
+    }
+    if (literal_set.size() > kInPredicateLimit) {
+      // skip evaluating the predicate if the number of values is too big
+      return kRowsMightMatch;
+    }
+
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto lower, DeserializeBoundLiteral(summary.lower_bound.value(), 
ref->type()));
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto upper, DeserializeBoundLiteral(summary.upper_bound.value(), 
ref->type()));
+    auto literals_view = literal_set | std::views::filter([&](const Literal& 
lit) {
+                           return lower <= lit && lit <= upper;
+                         });
+
+    if (literals_view.empty()) {

Review Comment:
   Sorry I only noticed duplicate code in the previous round of reviews. I 
think it would be clearer to replace `.empty()` with `std::ranges::any_of`.
   ```cpp
       if (std::ranges::all_of(literal_set, [&](const Literal& lit) {
             return lit < lower || lit > upper;
           })) {
   ```
   And you need to add `#include <algorithm>`



##########
src/iceberg/expression/manifest_evaluator.cc:
##########
@@ -0,0 +1,391 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include "iceberg/expression/manifest_evaluator.h"
+
+#include "iceberg/expression/binder.h"
+#include "iceberg/expression/expression_visitor.h"
+#include "iceberg/expression/rewrite_not.h"
+#include "iceberg/manifest/manifest_list.h"
+#include "iceberg/row/struct_like.h"
+#include "iceberg/schema.h"
+#include "iceberg/util/macros.h"
+
+namespace iceberg {
+
+namespace {
+constexpr bool kRowsMightMatch = true;
+constexpr bool kRowCannotMatch = false;
+constexpr int32_t kInPredicateLimit = 200;
+}  // namespace
+
+class ManifestEvalVisitor : public BoundVisitor<bool> {
+ public:
+  explicit ManifestEvalVisitor(const ManifestFile& manifest)
+      : stats_(manifest.partitions) {}
+
+  Result<bool> AlwaysTrue() override { return true; }
+
+  Result<bool> AlwaysFalse() override { return false; }
+
+  Result<bool> Not(bool child_result) override { return !child_result; }
+
+  Result<bool> And(bool left_result, bool right_result) override {
+    return left_result && right_result;
+  }
+
+  Result<bool> Or(bool left_result, bool right_result) override {
+    return left_result || right_result;
+  }
+
+  Result<bool> IsNull(const std::shared_ptr<Bound>& expr) override {
+    // no need to check whether the field is required because binding 
evaluates that case
+    // if the column has no null values, the expression cannot match
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    if (!stats_.at(pos).contains_null) {
+      return kRowCannotMatch;
+    }
+
+    return kRowsMightMatch;
+  }
+
+  Result<bool> NotNull(const std::shared_ptr<Bound>& expr) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    if (AllValuesAreNull(stats_.at(pos), ref->type()->type_id())) {
+      return kRowCannotMatch;
+    }
+
+    return kRowsMightMatch;
+  }
+
+  Result<bool> IsNaN(const std::shared_ptr<Bound>& expr) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    if (stats_.at(pos).contains_nan.has_value() && 
!stats_.at(pos).contains_nan.value()) {
+      return kRowCannotMatch;
+    }
+    if (AllValuesAreNull(stats_.at(pos), ref->type()->type_id())) {
+      return kRowCannotMatch;
+    }
+
+    return kRowsMightMatch;
+  }
+
+  Result<bool> NotNaN(const std::shared_ptr<Bound>& expr) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    // if containsNaN is true, containsNull is false and lowerBound is null, 
all values
+    // are NaN
+    if (summary.contains_nan.has_value() && summary.contains_nan.value() &&
+        !summary.contains_null && !summary.lower_bound.has_value()) {
+      return kRowCannotMatch;
+    }
+
+    return kRowsMightMatch;
+  }
+
+  Result<bool> Lt(const std::shared_ptr<Bound>& expr, const Literal& lit) 
override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    if (!summary.lower_bound.has_value()) {
+      return kRowCannotMatch;  // values are all null
+    }
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto lower, DeserializeBoundLiteral(summary.lower_bound.value(), 
ref->type()));
+    if (lower >= lit) {
+      return kRowCannotMatch;
+    }
+    return kRowsMightMatch;
+  }
+
+  Result<bool> LtEq(const std::shared_ptr<Bound>& expr, const Literal& lit) 
override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    if (!summary.lower_bound.has_value()) {
+      return kRowCannotMatch;  // values are all null
+    }
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto lower, DeserializeBoundLiteral(summary.lower_bound.value(), 
ref->type()));
+    if (lower > lit) {
+      return kRowCannotMatch;
+    }
+    return kRowsMightMatch;
+  }
+
+  Result<bool> Gt(const std::shared_ptr<Bound>& expr, const Literal& lit) 
override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    if (!summary.upper_bound.has_value()) {
+      return kRowCannotMatch;  // values are all null
+    }
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto upper, DeserializeBoundLiteral(summary.upper_bound.value(), 
ref->type()));
+    if (upper <= lit) {
+      return kRowCannotMatch;
+    }
+    return kRowsMightMatch;
+  }
+
+  Result<bool> GtEq(const std::shared_ptr<Bound>& expr, const Literal& lit) 
override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    if (!summary.upper_bound.has_value()) {
+      return kRowCannotMatch;  // values are all null
+    }
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto upper, DeserializeBoundLiteral(summary.upper_bound.value(), 
ref->type()));
+    if (upper < lit) {
+      return kRowCannotMatch;
+    }
+    return kRowsMightMatch;
+  }
+
+  Result<bool> Eq(const std::shared_ptr<Bound>& expr, const Literal& lit) 
override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    if (!summary.lower_bound.has_value() || !summary.upper_bound.has_value()) {
+      return kRowCannotMatch;  // values are all null and literal cannot 
contain null
+    }
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto lower, DeserializeBoundLiteral(summary.lower_bound.value(), 
ref->type()));
+    if (lower > lit) {
+      return kRowCannotMatch;
+    }
+
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto upper, DeserializeBoundLiteral(summary.upper_bound.value(), 
ref->type()));
+    if (upper < lit) {
+      return kRowCannotMatch;
+    }
+
+    return kRowsMightMatch;
+  }
+
+  Result<bool> NotEq(const std::shared_ptr<Bound>& expr, const Literal& lit) 
override {
+    // because the bounds are not necessarily a min or max value, this cannot 
be answered
+    // using them. notEq(col, X) with (X, Y) doesn't guarantee that X is a 
value in col.
+    return kRowsMightMatch;
+  }
+
+  Result<bool> In(const std::shared_ptr<Bound>& expr,
+                  const BoundSetPredicate::LiteralSet& literal_set) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto ref, ParseBoundReference(expr));
+    ICEBERG_ASSIGN_OR_RAISE(auto pos, GetPosition(*ref));
+    const auto& summary = stats_.at(pos);
+    if (!summary.lower_bound.has_value() || !summary.upper_bound.has_value()) {
+      // values are all null and literalSet cannot contain null.
+      return kRowCannotMatch;
+    }
+    if (literal_set.size() > kInPredicateLimit) {
+      // skip evaluating the predicate if the number of values is too big
+      return kRowsMightMatch;
+    }
+
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto lower, DeserializeBoundLiteral(summary.lower_bound.value(), 
ref->type()));
+    ICEBERG_ASSIGN_OR_RAISE(
+        auto upper, DeserializeBoundLiteral(summary.upper_bound.value(), 
ref->type()));
+    auto literals_view = literal_set | std::views::filter([&](const Literal& 
lit) {
+                           return lower <= lit && lit <= upper;
+                         });
+
+    if (literals_view.empty()) {

Review Comment:
   Sorry I only noticed duplicate code in the previous round of reviews. I 
think it would be clearer to replace `.empty()` with `std::ranges::all_of`.
   ```cpp
       if (std::ranges::all_of(literal_set, [&](const Literal& lit) {
             return lit < lower || lit > upper;
           })) {
   ```
   And you need to add `#include <algorithm>`



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to