Skip to content

fix: fix compile issues #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zjw1111 merged 2 commits into from
Dec 23, 2025
Merged

fix: fix compile issues #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af7e54a
fix: fix compile issues
zjw1111 Dec 23, 2025
6d5d40e
Merge branch 'main' into fix_compile
lxy-9602 Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/paimon/core/operation/file_store_scan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down
Loading