Merge branch 'apache:main' into main

Jinchul81 · web-flow · commit 973954e4abd4 · 2025-11-24T20:22:32.000+01:00
diff --git a/.asf.yaml b/.asf.yaml
@@ -55,4 +55,5 @@ notifications:
   commits:      commits@iceberg.apache.org
   issues:       issues@iceberg.apache.org
   pullrequests: issues@iceberg.apache.org
+  jobs:         ci-jobs@iceberg.apache.org
   jira_options: link label link label
diff --git a/.github/workflows/cpp-linter.yml b/.github/workflows/cpp-linter.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout iceberg-cpp
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Install dependencies
         shell: bash
         run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
         with:
           fetch-depth: 1
 
diff --git a/.github/workflows/license_check.yml b/.github/workflows/license_check.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Check license header
         uses: apache/skywalking-eyes@main
         env:
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -28,6 +28,6 @@ jobs:
   pre-commit:
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - uses: actions/setup-python@v6
     - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd  # v3.0.1
diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
@@ -34,7 +34,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Checkout
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Prepare for tag
         if: github.ref_type == 'tag'
@@ -79,7 +79,7 @@ jobs:
           # - windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - uses: actions/download-artifact@v6
         with:
@@ -114,7 +114,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - uses: actions/download-artifact@v6
         with:
diff --git a/.github/workflows/sanitizer_test.yml b/.github/workflows/sanitizer_test.yml
@@ -41,7 +41,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout iceberg-cpp
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Install dependencies
         shell: bash
         run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -45,7 +45,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout iceberg-cpp
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Install dependencies
         shell: bash
         run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
@@ -63,7 +63,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout iceberg-cpp
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Build Iceberg
         shell: bash
         run: ci/scripts/build_iceberg.sh $(pwd)
@@ -78,7 +78,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout iceberg-cpp
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Install dependencies
         shell: cmd
         run: |
@@ -112,7 +112,7 @@ jobs:
         with:
           python-version: '3.x'
       - name: Checkout iceberg-cpp
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Install build dependencies
         run: |
           python3 -m pip install --upgrade pip
diff --git a/cmake_modules/IcebergBuildUtils.cmake b/cmake_modules/IcebergBuildUtils.cmake
@@ -152,6 +152,10 @@ function(add_iceberg_lib LIB_NAME)
 
     string(TOUPPER ${LIB_NAME} VISIBILITY_NAME)
     target_compile_definitions(${LIB_NAME}_shared PRIVATE ${VISIBILITY_NAME}_EXPORTING)
+    set_target_properties(${LIB_NAME}_shared
+                          PROPERTIES C_VISIBILITY_PRESET hidden CXX_VISIBILITY_PRESET
+                                                                hidden
+                                     VISIBILITY_INLINES_HIDDEN 1)
 
     install(TARGETS ${LIB_NAME}_shared
             EXPORT iceberg_targets
@@ -211,8 +215,10 @@ function(add_iceberg_lib LIB_NAME)
     target_link_libraries(${LIB_NAME}_static
                           PUBLIC "$<BUILD_INTERFACE:iceberg_sanitizer_flags>")
 
-    string(TOUPPER ${LIB_NAME} VISIBILITY_NAME)
-    target_compile_definitions(${LIB_NAME}_static PUBLIC ${VISIBILITY_NAME}_STATIC)
+    if(WIN32)
+      string(TOUPPER ${LIB_NAME} VISIBILITY_NAME)
+      target_compile_definitions(${LIB_NAME}_static PUBLIC ${VISIBILITY_NAME}_STATIC)
+    endif()
 
     install(TARGETS ${LIB_NAME}_static
             EXPORT iceberg_targets
diff --git a/src/iceberg/CMakeLists.txt b/src/iceberg/CMakeLists.txt
@@ -21,6 +21,7 @@ set(ICEBERG_SOURCES
     arrow_c_data_guard_internal.cc
     catalog/memory/in_memory_catalog.cc
     expression/binder.cc
+    expression/evaluator.cc
     expression/expression.cc
     expression/expressions.cc
     expression/literal.cc
diff --git a/src/iceberg/expression/evaluator.cc b/src/iceberg/expression/evaluator.cc
@@ -0,0 +1,152 @@
+/*
+ * 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/evaluator.h"
+
+#include "iceberg/expression/binder.h"
+#include "iceberg/expression/expression_visitor.h"
+#include "iceberg/schema.h"
+#include "iceberg/util/macros.h"
+
+namespace iceberg {
+
+class EvalVisitor : public BoundVisitor<bool> {
+ public:
+  explicit EvalVisitor(const StructLike& row) : row_(row) {}
+
+  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<BoundTerm>& term) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto value, term->Evaluate(row_));
+    return value.IsNull();
+  }
+
+  Result<bool> NotNull(const std::shared_ptr<BoundTerm>& term) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto value, IsNull(term));
+    return !value;
+  }
+
+  Result<bool> IsNaN(const std::shared_ptr<BoundTerm>& term) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto value, term->Evaluate(row_));
+    return value.IsNaN();
+  }
+
+  Result<bool> NotNaN(const std::shared_ptr<BoundTerm>& term) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto value, IsNaN(term));
+    return !value;
+  }
+
+  Result<bool> Lt(const std::shared_ptr<BoundTerm>& term, const Literal& lit) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto value, term->Evaluate(row_));
+    return value < lit;
+  }
+
+  Result<bool> LtEq(const std::shared_ptr<BoundTerm>& term, const Literal& lit) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto value, term->Evaluate(row_));
+    return value <= lit;
+  }
+
+  Result<bool> Gt(const std::shared_ptr<BoundTerm>& term, const Literal& lit) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto value, term->Evaluate(row_));
+    return value > lit;
+  }
+
+  Result<bool> GtEq(const std::shared_ptr<BoundTerm>& term, const Literal& lit) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto value, term->Evaluate(row_));
+    return value >= lit;
+  }
+
+  Result<bool> Eq(const std::shared_ptr<BoundTerm>& term, const Literal& lit) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto value, term->Evaluate(row_));
+    return value == lit;
+  }
+
+  Result<bool> NotEq(const std::shared_ptr<BoundTerm>& term,
+                     const Literal& lit) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto eq_result, Eq(term, lit));
+    return !eq_result;
+  }
+
+  Result<bool> In(const std::shared_ptr<BoundTerm>& term,
+                  const BoundSetPredicate::LiteralSet& literal_set) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto value, term->Evaluate(row_));
+    return literal_set.contains(value);
+  }
+
+  Result<bool> NotIn(const std::shared_ptr<BoundTerm>& term,
+                     const BoundSetPredicate::LiteralSet& literal_set) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto in_result, In(term, literal_set));
+    return !in_result;
+  }
+
+  Result<bool> StartsWith(const std::shared_ptr<BoundTerm>& term,
+                          const Literal& lit) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto value, term->Evaluate(row_));
+
+    // Both value and literal should be strings
+    if (!std::holds_alternative<std::string>(value.value()) ||
+        !std::holds_alternative<std::string>(lit.value())) {
+      return false;
+    }
+
+    const auto& str_value = std::get<std::string>(value.value());
+    const auto& str_prefix = std::get<std::string>(lit.value());
+    return str_value.starts_with(str_prefix);
+  }
+
+  Result<bool> NotStartsWith(const std::shared_ptr<BoundTerm>& term,
+                             const Literal& lit) override {
+    ICEBERG_ASSIGN_OR_RAISE(auto starts_result, StartsWith(term, lit));
+    return !starts_result;
+  }
+
+ private:
+  const StructLike& row_;
+};
+
+Evaluator::Evaluator(std::shared_ptr<Expression> bound_expr)
+    : bound_expr_(std::move(bound_expr)) {}
+
+Evaluator::~Evaluator() = default;
+
+Result<std::unique_ptr<Evaluator>> Evaluator::Make(const Schema& schema,
+                                                   std::shared_ptr<Expression> unbound,
+                                                   bool case_sensitive) {
+  ICEBERG_ASSIGN_OR_RAISE(auto bound_expr, Binder::Bind(schema, unbound, case_sensitive));
+  return std::unique_ptr<Evaluator>(new Evaluator(std::move(bound_expr)));
+}
+
+Result<bool> Evaluator::Eval(const StructLike& row) const {
+  EvalVisitor visitor(row);
+  return Visit<bool, EvalVisitor>(bound_expr_, visitor);
+}
+
+}  // namespace iceberg
diff --git a/src/iceberg/expression/evaluator.h b/src/iceberg/expression/evaluator.h
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+/// \file iceberg/expression/evaluator.h
+/// Evaluator for checking if a data row matches a bound expression.
+
+#include <memory>
+
+#include "iceberg/iceberg_export.h"
+#include "iceberg/result.h"
+#include "iceberg/type_fwd.h"
+
+namespace iceberg {
+
+/// \brief Evaluates an Expression against data rows.
+///
+/// This class evaluates bound expressions against StructLike data rows to determine
+/// if the row matches the expression criteria. The evaluator binds unbound expressions
+/// to a schema on construction and then can be used to evaluate multiple data rows.
+///
+/// \note: The evaluator is thread-safe.
+class ICEBERG_EXPORT Evaluator {
+ public:
+  /// \brief Make an evaluator for an unbound expression.
+  ///
+  /// \param schema The schema to bind against
+  /// \param unbound The unbound expression to evaluate
+  /// \param case_sensitive Whether field name matching is case-sensitive
+  static Result<std::unique_ptr<Evaluator>> Make(const Schema& schema,
+                                                 std::shared_ptr<Expression> unbound,
+                                                 bool case_sensitive = true);
+
+  ~Evaluator();
+
+  /// \brief Evaluate the expression against a data row.
+  ///
+  /// \param row The data row to evaluate
+  /// \return true if the row matches the expression, false otherwise, or error
+  Result<bool> Eval(const StructLike& row) const;
+
+ private:
+  explicit Evaluator(std::shared_ptr<Expression> bound_expr);
+
+  std::shared_ptr<Expression> bound_expr_;
+};
+
+}  // namespace iceberg
diff --git a/src/iceberg/expression/literal.cc b/src/iceberg/expression/literal.cc
@@ -505,6 +505,11 @@ bool Literal::IsAboveMax() const { return std::holds_alternative<AboveMax>(value
 
 bool Literal::IsNull() const { return std::holds_alternative<std::monostate>(value_); }
 
+bool Literal::IsNaN() const {
+  return std::holds_alternative<float>(value_) && std::isnan(std::get<float>(value_)) ||
+         std::holds_alternative<double>(value_) && std::isnan(std::get<double>(value_));
+}
+
 // LiteralCaster implementation
 
 Result<Literal> LiteralCaster::CastTo(const Literal& literal,
diff --git a/src/iceberg/expression/literal.h b/src/iceberg/expression/literal.h
@@ -154,6 +154,10 @@ class ICEBERG_EXPORT Literal : public util::Formattable {
   /// \return true if this literal is null, false otherwise
   bool IsNull() const;
 
+  /// Check if this literal is NaN.
+  /// \return true if this literal is NaN, false otherwise
+  bool IsNaN() const;
+
   std::string ToString() const override;
 
  private:
diff --git a/src/iceberg/expression/predicate.cc b/src/iceberg/expression/predicate.cc
diff --git a/src/iceberg/expression/predicate.h b/src/iceberg/expression/predicate.h
diff --git a/src/iceberg/expression/term.cc b/src/iceberg/expression/term.cc
diff --git a/src/iceberg/meson.build b/src/iceberg/meson.build
diff --git a/src/iceberg/test/CMakeLists.txt b/src/iceberg/test/CMakeLists.txt
diff --git a/src/iceberg/test/evaluator_test.cc b/src/iceberg/test/evaluator_test.cc

-Original file line number
+Diff line change
   commits:      [email protected]
   issues:       [email protected]
   pullrequests: [email protected]
 +  jobs:         [email protected]
   jira_options: link label link label