Skip to content

Commit 7678a47

Browse files
authored
fix: fix compile issues (#27)
1 parent 66a701e commit 7678a47

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,10 @@ macro(build_avro)
548548

549549
get_target_property(AVRO_ZSTD_INCLUDE_DIR zstd INTERFACE_INCLUDE_DIRECTORIES)
550550
get_filename_component(AVRO_ZSTD_ROOT "${AVRO_ZSTD_INCLUDE_DIR}" DIRECTORY)
551+
552+
get_target_property(AVRO_ZLIB_INCLUDE_DIR zlib INTERFACE_INCLUDE_DIRECTORIES)
553+
get_filename_component(AVRO_ZLIB_ROOT "${AVRO_ZLIB_INCLUDE_DIR}" DIRECTORY)
554+
551555
set(AVRO_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} -Wno-error")
552556
set(AVRO_CMAKE_C_FLAGS "${EP_C_FLAGS} -Wno-error")
553557

@@ -558,7 +562,7 @@ macro(build_avro)
558562
"-DCMAKE_C_FLAGS=${AVRO_CMAKE_C_FLAGS}"
559563
"-DAVRO_BUILD_TESTS=OFF"
560564
"-DAVRO_BUILD_EXECUTABLES=OFF"
561-
"-DZLIB_ROOT=${THIRDPARTY_ZLIB_ROOT}"
565+
"-DZLIB_ROOT=${AVRO_ZLIB_ROOT}"
562566
"-Dzstd_ROOT=${AVRO_ZSTD_ROOT}"
563567
"-DSnappy_ROOT=${AVRO_SNAPPY_ROOT}")
564568
externalproject_add(avro_ep

src/paimon/core/operation/file_store_scan.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,11 @@ class FileStoreScan {
135135
return partition_filter_;
136136
}
137137

138+
static Result<std::shared_ptr<PredicateFilter>> CreatePartitionPredicate(
139+
const std::vector<std::string>& partition_keys, const std::string& partition_default_name,
140+
const std::shared_ptr<arrow::Schema>& arrow_schema,
141+
const std::vector<std::map<std::string, std::string>>& partition_filters);
142+
138143
class RawPlan {
139144
public:
140145
RawPlan(const ScanMode& scan_mode, const std::optional<Snapshot>& snapshot,
@@ -203,11 +208,6 @@ class FileStoreScan {
203208
const std::shared_ptr<arrow::Schema>& arrow_schema,
204209
const std::shared_ptr<ScanFilter>& scan_filters);
205210

206-
static Result<std::shared_ptr<PredicateFilter>> CreatePartitionPredicate(
207-
const std::vector<std::string>& partition_keys, const std::string& partition_default_name,
208-
const std::shared_ptr<arrow::Schema>& arrow_schema,
209-
const std::vector<std::map<std::string, std::string>>& partition_filters);
210-
211211
private:
212212
Status ReadManifests(std::optional<Snapshot>* snapshot_ptr,
213213
std::vector<ManifestFileMeta>* manifests_ptr) const;

0 commit comments

Comments
 (0)