This is an automated email from the ASF dual-hosted git repository.
avamingli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/main by this push:
new e37ca5b734 Fix Pax build error in Rocky Linux 8
e37ca5b734 is described below
commit e37ca5b734fa508ba1e001344b30edfaa5c7d7ed
Author: GongXun <[email protected]>
AuthorDate: Fri May 16 23:46:29 2025 +0800
Fix Pax build error in Rocky Linux 8
Downgrade the protobuf version requirement from 3.6.1 to 3.5.0 so that
we can use the default protobuf version 3.5.0 in Rocky Linux 8 and avoid
building protobuf separately.
Also, add an explicit `#include <atomic>` to fix compilation error
realted to missing `std::atomic` definition caused by gcc-10.x.
See: github.com/apache/cloudberry/issues/1097
---
contrib/pax_storage/FindDependencies.cmake | 2 +-
contrib/pax_storage/src/cpp/storage/filter/pax_sparse_filter.h | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/contrib/pax_storage/FindDependencies.cmake
b/contrib/pax_storage/FindDependencies.cmake
index 024e7ebf3a..cf9758cb5b 100644
--- a/contrib/pax_storage/FindDependencies.cmake
+++ b/contrib/pax_storage/FindDependencies.cmake
@@ -1,6 +1,6 @@
## protobuf
include(FindProtobuf)
-find_package(Protobuf 3.6.1 REQUIRED)
+find_package(Protobuf 3.5.0 REQUIRED)
# ztsd
# in our image snapshot, zstd is managed using pkg-config, so so the
pkg-config method is used first here
diff --git a/contrib/pax_storage/src/cpp/storage/filter/pax_sparse_filter.h
b/contrib/pax_storage/src/cpp/storage/filter/pax_sparse_filter.h
index b0707e4c45..504878c4dd 100644
--- a/contrib/pax_storage/src/cpp/storage/filter/pax_sparse_filter.h
+++ b/contrib/pax_storage/src/cpp/storage/filter/pax_sparse_filter.h
@@ -28,6 +28,7 @@
#pragma once
#include "comm/cbdb_api.h"
+#include <atomic>
#include <map>
#include <memory>
#include <utility>
@@ -189,4 +190,5 @@ class PaxSparseFilter final {
bool allow_fallback_to_pg_;
}; // class PaxSparseFilter
-} // namespace pax
\ No newline at end of file
+} // namespace pax
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
