This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 18a4825accd [fix](compile) fix mac compile (#25367)
18a4825accd is described below
commit 18a4825accd6436f9624bb46d1af2edb4b05194d
Author: zy-kkk <[email protected]>
AuthorDate: Thu Oct 12 04:58:12 2023 -0500
[fix](compile) fix mac compile (#25367)
---------
Co-authored-by: yujun <[email protected]>
Co-authored-by: zclllyybb <[email protected]>
---
be/src/olap/storage_engine.cpp | 2 +-
be/src/util/timezone_utils.cpp | 2 +-
be/src/vec/exec/scan/pip_scanner_context.h | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/be/src/olap/storage_engine.cpp b/be/src/olap/storage_engine.cpp
index 1f4fc25d46f..52d5072f7d3 100644
--- a/be/src/olap/storage_engine.cpp
+++ b/be/src/olap/storage_engine.cpp
@@ -478,7 +478,7 @@ std::vector<DataDir*>
StorageEngine::get_stores_for_create_tablet(
int tablet_num;
- bool operator<(const DirInfo& other) {
+ bool operator<(const DirInfo& other) const {
if (available_level != other.available_level) {
return available_level < other.available_level;
}
diff --git a/be/src/util/timezone_utils.cpp b/be/src/util/timezone_utils.cpp
index e110f365442..a90f30820a3 100644
--- a/be/src/util/timezone_utils.cpp
+++ b/be/src/util/timezone_utils.cpp
@@ -266,7 +266,7 @@ void TimezoneUtils::load_timezones_to_cache() {
bool TimezoneUtils::find_cctz_time_zone(const std::string& timezone,
cctz::time_zone& ctz) {
zone_cache_rw_lock.lock_shared();
- if (auto it = zone_cache->find(timezone); it != nullptr) {
+ if (auto it = zone_cache->find(timezone); it != zone_cache->end()) {
ctz = it->second;
zone_cache_rw_lock.unlock_shared();
return true;
diff --git a/be/src/vec/exec/scan/pip_scanner_context.h
b/be/src/vec/exec/scan/pip_scanner_context.h
index 52ee803b864..13a0ef5b671 100644
--- a/be/src/vec/exec/scan/pip_scanner_context.h
+++ b/be/src/vec/exec/scan/pip_scanner_context.h
@@ -59,7 +59,6 @@ public:
} else {
*block = std::move(_blocks_queues[id].front());
_blocks_queues[id].pop_front();
-
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
