diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 4f6a933d..c5faf186 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -548,6 +548,10 @@ macro(build_avro)
 
     get_target_property(AVRO_ZSTD_INCLUDE_DIR zstd INTERFACE_INCLUDE_DIRECTORIES)
     get_filename_component(AVRO_ZSTD_ROOT "${AVRO_ZSTD_INCLUDE_DIR}" DIRECTORY)
+
+    get_target_property(AVRO_ZLIB_INCLUDE_DIR zlib INTERFACE_INCLUDE_DIRECTORIES)
+    get_filename_component(AVRO_ZLIB_ROOT "${AVRO_ZLIB_INCLUDE_DIR}" DIRECTORY)
+
     set(AVRO_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} -Wno-error")
     set(AVRO_CMAKE_C_FLAGS "${EP_C_FLAGS} -Wno-error")
 
@@ -558,7 +562,7 @@ macro(build_avro)
         "-DCMAKE_C_FLAGS=${AVRO_CMAKE_C_FLAGS}"
         "-DAVRO_BUILD_TESTS=OFF"
         "-DAVRO_BUILD_EXECUTABLES=OFF"
-        "-DZLIB_ROOT=${THIRDPARTY_ZLIB_ROOT}"
+        "-DZLIB_ROOT=${AVRO_ZLIB_ROOT}"
         "-Dzstd_ROOT=${AVRO_ZSTD_ROOT}"
         "-DSnappy_ROOT=${AVRO_SNAPPY_ROOT}")
     externalproject_add(avro_ep
diff --git a/src/paimon/core/operation/file_store_scan.h b/src/paimon/core/operation/file_store_scan.h
index 631bf98b..48432160 100644
--- a/src/paimon/core/operation/file_store_scan.h
+++ b/src/paimon/core/operation/file_store_scan.h
@@ -135,6 +135,11 @@ class FileStoreScan {
         return partition_filter_;
     }
 
+    static Result<std::shared_ptr<PredicateFilter>> CreatePartitionPredicate(
+        const std::vector<std::string>& partition_keys, const std::string& partition_default_name,
+        const std::shared_ptr<arrow::Schema>& arrow_schema,
+        const std::vector<std::map<std::string, std::string>>& partition_filters);
+
     class RawPlan {
      public:
         RawPlan(const ScanMode& scan_mode, const std::optional<Snapshot>& snapshot,
@@ -203,11 +208,6 @@ class FileStoreScan {
                              const std::shared_ptr<arrow::Schema>& arrow_schema,
                              const std::shared_ptr<ScanFilter>& scan_filters);
 
-    static Result<std::shared_ptr<PredicateFilter>> CreatePartitionPredicate(
-        const std::vector<std::string>& partition_keys, const std::string& partition_default_name,
-        const std::shared_ptr<arrow::Schema>& arrow_schema,
-        const std::vector<std::map<std::string, std::string>>& partition_filters);
-
  private:
     Status ReadManifests(std::optional<Snapshot>* snapshot_ptr,
                          std::vector<ManifestFileMeta>* manifests_ptr) const;