This is an automated email from the ASF dual-hosted git repository.
panxiaolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new a94183cb9f5 [Chore](build) fix some cloud build fail on gcc15 (#53306)
a94183cb9f5 is described below
commit a94183cb9f53cedf8c8fa57bfae2e9da5508ca25
Author: Pxl <[email protected]>
AuthorDate: Wed Jul 16 10:06:29 2025 +0800
[Chore](build) fix some cloud build fail on gcc15 (#53306)
fix some cloud build fail
---
be/test/cloud/cloud_compaction_test.cpp | 2 +-
.../cloud_cumulative_compaction_policy_test.cpp | 3 +-
cloud/src/common/bvars.h | 35 +++++++++++-----------
cloud/src/meta-store/blob_message.cpp | 1 +
cloud/src/meta-store/txn_kv.cpp | 2 ++
cloud/test/util_test.cpp | 2 +-
6 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/be/test/cloud/cloud_compaction_test.cpp
b/be/test/cloud/cloud_compaction_test.cpp
index c8db6739084..0e81b2c49f8 100644
--- a/be/test/cloud/cloud_compaction_test.cpp
+++ b/be/test/cloud/cloud_compaction_test.cpp
@@ -38,7 +38,7 @@ namespace doris {
class TabletMap;
class CloudCompactionTest : public testing::Test {
- CloudCompactionTest() : _engine(CloudStorageEngine({})) {}
+ CloudCompactionTest() : _engine(CloudStorageEngine(EngineOptions {})) {}
void SetUp() override {
config::compaction_promotion_size_mbytes = 1024;
config::compaction_promotion_ratio = 0.05;
diff --git a/be/test/cloud/cloud_cumulative_compaction_policy_test.cpp
b/be/test/cloud/cloud_cumulative_compaction_policy_test.cpp
index 45dd3f1d093..4805d579df8 100644
--- a/be/test/cloud/cloud_cumulative_compaction_policy_test.cpp
+++ b/be/test/cloud/cloud_cumulative_compaction_policy_test.cpp
@@ -34,7 +34,8 @@ namespace doris {
class TestCloudSizeBasedCumulativeCompactionPolicy : public testing::Test {
public:
- TestCloudSizeBasedCumulativeCompactionPolicy() :
_engine(CloudStorageEngine({})) {}
+ TestCloudSizeBasedCumulativeCompactionPolicy()
+ : _engine(CloudStorageEngine(EngineOptions {})) {}
void SetUp() {
config::compaction_promotion_size_mbytes = 1024;
diff --git a/cloud/src/common/bvars.h b/cloud/src/common/bvars.h
index 496826f6ec2..55345670911 100644
--- a/cloud/src/common/bvars.h
+++ b/cloud/src/common/bvars.h
@@ -125,6 +125,24 @@ xxx_request_count{region="west",service="search"} 1
put() and get() methods must match in count. Also, all supported bvar types
have different behaviors for how values are processed and retrieved.
*/
+
+template <typename T>
+struct is_valid_bvar_type : std::false_type {};
+template <typename T>
+struct is_valid_bvar_type<bvar::Adder<T>> : std::true_type {};
+template <>
+struct is_valid_bvar_type<bvar::IntRecorder> : std::true_type {};
+template <typename T>
+struct is_valid_bvar_type<bvar::Maxer<T>> : std::true_type {};
+template <typename T>
+struct is_valid_bvar_type<bvar::Status<T>> : std::true_type {};
+template <>
+struct is_valid_bvar_type<bvar::LatencyRecorder> : std::true_type {};
+template <typename T>
+struct is_bvar_status : std::false_type {};
+template <typename T>
+struct is_bvar_status<bvar::Status<T>> : std::true_type {};
+
template <typename BvarType>
class mBvarWrapper {
public:
@@ -158,23 +176,6 @@ public:
}
private:
- template <typename T>
- struct is_valid_bvar_type : std::false_type {};
- template <typename T>
- struct is_valid_bvar_type<bvar::Adder<T>> : std::true_type {};
- template <>
- struct is_valid_bvar_type<bvar::IntRecorder> : std::true_type {};
- template <typename T>
- struct is_valid_bvar_type<bvar::Maxer<T>> : std::true_type {};
- template <typename T>
- struct is_valid_bvar_type<bvar::Status<T>> : std::true_type {};
- template <>
- struct is_valid_bvar_type<bvar::LatencyRecorder> : std::true_type {};
- template <typename T>
- struct is_bvar_status : std::false_type {};
- template <typename T>
- struct is_bvar_status<bvar::Status<T>> : std::true_type {};
-
bvar::MultiDimension<BvarType> counter_;
};
diff --git a/cloud/src/meta-store/blob_message.cpp
b/cloud/src/meta-store/blob_message.cpp
index e351ec6756b..0ada3eca56d 100644
--- a/cloud/src/meta-store/blob_message.cpp
+++ b/cloud/src/meta-store/blob_message.cpp
@@ -18,6 +18,7 @@
#include "blob_message.h"
#include <butil/iobuf.h>
+#include <butil/iobuf_inl.h>
#include <google/protobuf/message.h>
#include "common/logging.h"
diff --git a/cloud/src/meta-store/txn_kv.cpp b/cloud/src/meta-store/txn_kv.cpp
index 144b2f9bca2..8565e2d3c96 100644
--- a/cloud/src/meta-store/txn_kv.cpp
+++ b/cloud/src/meta-store/txn_kv.cpp
@@ -65,6 +65,8 @@ static std::tuple<fdb_bool_t, int>
apply_key_selector(RangeKeySelector selector)
case RangeKeySelector::LAST_LESS_THAN:
return {0, 0};
}
+ LOG(FATAL) << "Unknown RangeKeySelector: " << static_cast<int>(selector);
+ return {0, 0};
}
int FdbTxnKv::init() {
diff --git a/cloud/test/util_test.cpp b/cloud/test/util_test.cpp
index e0cd54acc8b..007262ee96a 100644
--- a/cloud/test/util_test.cpp
+++ b/cloud/test/util_test.cpp
@@ -311,7 +311,7 @@ TEST(UtilTest, test_sync_executor) {
auto* sp = doris::SyncPoint::get_instance();
sp->set_call_back("SyncExecutor::when_all.set_wait_time", [&](auto&& args)
{
std::unique_lock<std::mutex> _lock(go_mutex);
- auto max_wait_time = *doris::try_any_cast<size_t*>(args[0]);
+ [[maybe_unused]] auto max_wait_time =
*doris::try_any_cast<size_t*>(args[0]);
max_wait_time = 100;
});
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
