Skip to content

Commit e27d103

Browse files
morningmanclaude
andcommitted
[fix](test) Avoid <ranges> in BE tests (breaks with -fno-access-control on libc++)
doris_be_test is compiled with -fno-access-control (be/test/CMakeLists.txt), which is incompatible with libc++'s <ranges> header on macOS: libc++ forward declares lazy_split_view's __outer_iterator/__inner_iterator as private and then defines them public, and with access control disabled clang rejects this as "redeclared with 'public' access". Any test TU that pulls in <ranges> then fails to compile. Remove the dependency on <ranges> from the tests: - drop unused '#include <ranges>' (lru_queue_test, block_file_cache_test_common, cloud_tablet_test); - replace the range-view usages that actually need <ranges> with plain loops: std::ranges::copy_if(std::views::values(...)) in the cloud tablet query tests, and std::ranges::for_each(std::ranges::iota_view{...}) in block_file_cache_test. Ranges algorithms that come from <algorithm> (std::ranges::fill/find/sort/...) are unaffected and left as-is. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
1 parent d6cf7d9 commit e27d103

6 files changed

Lines changed: 25 additions & 24 deletions

‎be/test/cloud/cloud_tablet_query_prefer_cache_test.cpp‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#include <chrono>
2424
#include <cstdint>
25-
#include <ranges>
2625

2726
#include "cloud/cloud_storage_engine.h"
2827
#include "cloud/cloud_tablet.h"
@@ -121,11 +120,13 @@ class TestQueryPreferCache : public testing::Test {
121120
} else {
122121
tablet->add_not_warmed_up_rowset(output_rowset->rowset_id());
123122
}
124-
std::ranges::copy_if(std::views::values(tablet->rowset_map()),
125-
std::back_inserter(input_rowsets), [=](const RowsetSharedPtr& rowset) {
126-
return rowset->version().first >= start_version &&
127-
rowset->version().first <= end_version;
128-
});
123+
for (const auto& kv : tablet->rowset_map()) {
124+
const auto& rowset = kv.second;
125+
if (rowset->version().first >= start_version &&
126+
rowset->version().first <= end_version) {
127+
input_rowsets.push_back(rowset);
128+
}
129+
}
129130
if (input_rowsets.size() == 1) {
130131
tablet->add_rowsets({output_rowset}, true, wrlock);
131132
} else {

‎be/test/cloud/cloud_tablet_query_with_tolerance_test.cpp‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#include <chrono>
2424
#include <cstdint>
25-
#include <ranges>
2625

2726
#include "cloud/cloud_storage_engine.h"
2827
#include "cloud/cloud_tablet.h"
@@ -116,11 +115,13 @@ class TestFreshnessTolerance : public testing::Test {
116115
} else {
117116
tablet->add_not_warmed_up_rowset(output_rowset->rowset_id());
118117
}
119-
std::ranges::copy_if(std::views::values(tablet->rowset_map()),
120-
std::back_inserter(input_rowsets), [=](const RowsetSharedPtr& rowset) {
121-
return rowset->version().first >= start_version &&
122-
rowset->version().first <= end_version;
123-
});
118+
for (const auto& kv : tablet->rowset_map()) {
119+
const auto& rowset = kv.second;
120+
if (rowset->version().first >= start_version &&
121+
rowset->version().first <= end_version) {
122+
input_rowsets.push_back(rowset);
123+
}
124+
}
124125
if (input_rowsets.size() == 1) {
125126
tablet->add_rowsets({output_rowset}, true, wrlock);
126127
} else {
@@ -151,11 +152,13 @@ class TestFreshnessTolerance : public testing::Test {
151152
std::vector<RowsetSharedPtr> input_rowsets;
152153
auto output_rowset = create_rowset(Version {start_version, end_version}, visible_timestamp);
153154
// Intentionally do NOT add any warmup state entry for this rowset
154-
std::ranges::copy_if(std::views::values(tablet->rowset_map()),
155-
std::back_inserter(input_rowsets), [=](const RowsetSharedPtr& rowset) {
156-
return rowset->version().first >= start_version &&
157-
rowset->version().first <= end_version;
158-
});
155+
for (const auto& kv : tablet->rowset_map()) {
156+
const auto& rowset = kv.second;
157+
if (rowset->version().first >= start_version &&
158+
rowset->version().first <= end_version) {
159+
input_rowsets.push_back(rowset);
160+
}
161+
}
159162
if (input_rowsets.size() == 1) {
160163
tablet->add_rowsets({output_rowset}, true, wrlock);
161164
} else {

‎be/test/cloud/cloud_tablet_test.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
#include <chrono>
2626
#include <cstdint>
27-
#include <ranges>
2827

2928
#include "cloud/cloud_meta_mgr.h"
3029
#include "cloud/cloud_storage_engine.h"

‎be/test/io/cache/block_file_cache_test.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5935,15 +5935,15 @@ TEST_F(BlockFileCacheTest, test_align_size) {
59355935
std::random_device rd; // a seed source for the random number engine
59365936
std::mt19937 gen(rd()); // mersenne_twister_engine seeded with rd()
59375937
std::uniform_int_distribution<> distrib(0, 10_mb + 10086);
5938-
std::ranges::for_each(std::ranges::iota_view {0, 1000}, [&](int) {
5938+
for (int loop_i = 0; loop_i < 1000; ++loop_i) {
59395939
size_t read_size = distrib(gen) % 1_mb;
59405940
size_t read_offset = distrib(gen);
59415941
auto [offset, size] =
59425942
CachedRemoteFileReader::s_align_size(read_offset, read_size, total_size);
59435943
EXPECT_EQ(offset % 1_mb, 0);
59445944
EXPECT_GE(size, 1_mb);
59455945
EXPECT_LE(size, 2_mb);
5946-
});
5946+
}
59475947
}
59485948

59495949
TEST_F(BlockFileCacheTest, remove_if_cached_when_isnt_releasable) {
@@ -6045,7 +6045,7 @@ TEST_F(BlockFileCacheTest, cached_remote_file_reader_opt_lock) {
60456045
std::random_device rd; // a seed source for the random number engine
60466046
std::mt19937 gen(rd()); // mersenne_twister_engine seeded with rd()
60476047
std::uniform_int_distribution<> distrib(1_mb, 7_mb);
6048-
std::ranges::for_each(std::ranges::iota_view {0, 1000}, [&](int) {
6048+
for (int loop_i = 0; loop_i < 1000; ++loop_i) {
60496049
size_t read_offset = distrib(gen);
60506050
size_t read_size = distrib(gen) % 1_mb;
60516051
if (read_offset + read_size > 7_mb || read_size == 0) {
@@ -6069,7 +6069,7 @@ TEST_F(BlockFileCacheTest, cached_remote_file_reader_opt_lock) {
60696069
} else {
60706070
EXPECT_EQ(std::string(read_size, '0' + num), buffer);
60716071
}
6072-
});
6072+
}
60736073
}
60746074
{
60756075
FileReaderSPtr local_reader;

‎be/test/io/cache/block_file_cache_test_common.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#include <mutex>
4646
#include <optional>
4747
#include <random>
48-
#include <ranges>
4948
#include <stdexcept>
5049
#include <string>
5150
#include <thread>

‎be/test/io/cache/lru_queue_test.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include <mutex>
2929
#include <optional>
3030
#include <random>
31-
#include <ranges>
3231
#include <stdexcept>
3332
#include <string>
3433
#include <thread>

0 commit comments

Comments
 (0)