This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 4c75fecea95 [fix](compile) be compile failed in mac due to std::max
(#37238) (#38860)
4c75fecea95 is described below
commit 4c75fecea95526abfd3c12e124214a94bd251e07
Author: feiniaofeiafei <53502832+feiniaofeia...@users.noreply.github.com>
AuthorDate: Mon Aug 5 16:31:39 2024 +0800
[fix](compile) be compile failed in mac due to std::max (#37238) (#38860)
cherry-pick #37238 to branch-2.1
---
be/src/olap/merger.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/be/src/olap/merger.cpp b/be/src/olap/merger.cpp
index 37f1c2116d2..b2e789b5b5a 100644
--- a/be/src/olap/merger.cpp
+++ b/be/src/olap/merger.cpp
@@ -403,7 +403,7 @@ int64_t estimate_batch_size(int group_index, BaseTabletSPtr
tablet, int64_t way_
tablet->sample_infos[group_index].rows = 0;
int64_t batch_size = block_mem_limit / group_data_size;
- int64_t res = std::max(std::min(batch_size, int64_t(4096 - 32)), 32L);
+ int64_t res = std::max(std::min(batch_size, int64_t(4096 - 32)),
int64_t(32L));
LOG(INFO) << "estimate batch size for vertical compaction, tablet id: " <<
tablet->tablet_id()
<< " group data size: " << info.group_data_size << " row num: "
<< info.rows
<< " consume bytes: " << info.bytes << " way cnt: " << way_cnt
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
