Skip to content

Commit e37ca5b

Browse files
gongxun0928avamingli
authored andcommitted
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//issues/1097
1 parent 9f9d297 commit e37ca5b

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

contrib/pax_storage/FindDependencies.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## protobuf
22
include(FindProtobuf)
3-
find_package(Protobuf 3.6.1 REQUIRED)
3+
find_package(Protobuf 3.5.0 REQUIRED)
44

55
# ztsd
66
# in our image snapshot, zstd is managed using pkg-config, so so the pkg-config method is used first here

contrib/pax_storage/src/cpp/storage/filter/pax_sparse_filter.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#pragma once
2929
#include "comm/cbdb_api.h"
3030

31+
#include <atomic>
3132
#include <map>
3233
#include <memory>
3334
#include <utility>
@@ -189,4 +190,5 @@ class PaxSparseFilter final {
189190
bool allow_fallback_to_pg_;
190191
}; // class PaxSparseFilter
191192

192-
} // namespace pax
193+
} // namespace pax
194+

0 commit comments

Comments
 (0)