Skip to content

Commit 827bd2b

Browse files
committed
branch-hotfix-selectdb-cloud-4.1.7-minimax: [fix](file-cache) pass query IO context to preload segment meta (apache#9601)
fix selectdb/selectdb-core#9591 Fix query file-cache limit accounting for segment footer/meta reads done by the parallel scanner preload path. `file_cache_query_limit_segment_meta` only worked on paths that already carried the query `IOContext`. `ParallelScannerBuilder::_load()` preloads segment row counts by opening segment footers before scanner construction, but that path did not pass the query IO context, so footer/meta reads did not see the query id, file-cache profile stats, or the query-wide `RemoteScanCacheWriteLimiter`. This change threads an optional `IOContext` through `SegmentLoader`, `BetaRowset::get_segment_num_rows`, and `Segment::open`, and builds a query IO context for the parallel preload step. It also extends coverage for `Segment::open` IOContext propagation and adds docker regression coverage for the parallel preload behavior without `dry_run_query`. - `git diff --check` - `./run-be-ut.sh --run --filter=SegmentFooterCacheTest.* -j100` - `mvn package -pl fe-enterprise/fe-license-cloud -am -DskipTests` - `cp fe/fe-enterprise/fe-license-cloud/target/fe-license-cloud-1.2-SNAPSHOT.jar output/fe/lib/fe-enterprise.jar` - `./build.sh --be -j100` - `docker build -f docker/runtime/doris-compose/Dockerfile -t bh-cluster-2 .` - `env -u HTTP_PROXY -u HTTPS_PROXY -u http_proxy -u https_proxy -u ALL_PROXY -u all_proxy DORIS_FDB_IMAGE=foundationdb/foundationdb:7.1.26-single-layer ./run-regression-test.sh --run -d regression-test/suites/cloud_p0/cache/remote_scan_no_write_file_cache -s test_remote_scan_no_write_file_cache_threshold -runMode=cloud -dockerSuiteParallel 1 -image bh-cluster-2` - `env -u HTTP_PROXY -u HTTPS_PROXY -u http_proxy -u https_proxy -u ALL_PROXY -u all_proxy DORIS_FDB_IMAGE=foundationdb/foundationdb:7.1.26-single-layer ./run-regression-test.sh --run -d regression-test/suites/cloud_p0/cache/remote_scan_no_write_file_cache -s test_file_cache_query_limit_segment_meta_profile -runMode=cloud -dockerSuiteParallel 1 -image bh-cluster-2`
1 parent 538bcb9 commit 827bd2b

15 files changed

Lines changed: 217 additions & 67 deletions

‎be/src/exec/scan/parallel_scanner_builder.cpp‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
#include "common/status.h"
2626
#include "exec/operator/olap_scan_operator.h"
2727
#include "exec/scan/olap_scanner.h"
28+
#include "io/io_common.h"
29+
#include "runtime/query_context.h"
2830
#include "storage/rowset/beta_rowset.h"
2931
#include "storage/segment/segment_loader.h"
3032
#include "storage/tablet/base_tablet.h"
@@ -44,6 +46,22 @@ io::FileCacheStatistics take_initial_file_cache_stats(
4446
return stats;
4547
}
4648

49+
io::IOContext create_preload_io_context(RuntimeState* state, OlapReaderStatistics* preload_stats) {
50+
io::IOContext io_ctx;
51+
io_ctx.reader_type = ReaderType::READER_QUERY;
52+
io_ctx.file_cache_stats = preload_stats ? &preload_stats->file_cache_stats : nullptr;
53+
if (state == nullptr) {
54+
return io_ctx;
55+
}
56+
io_ctx.query_id = &state->query_id();
57+
io_ctx.read_file_cache = state->query_options().enable_file_cache;
58+
io_ctx.is_disposable = state->query_options().disable_file_cache;
59+
if (auto* query_ctx = state->get_query_ctx(); query_ctx != nullptr) {
60+
io_ctx.remote_scan_cache_write_limiter = query_ctx->remote_scan_cache_write_limiter();
61+
}
62+
return io_ctx;
63+
}
64+
4765
} // namespace
4866

4967
Status ParallelScannerBuilder::build_scanners(std::list<ScannerSPtr>& scanners) {
@@ -256,8 +274,9 @@ Status ParallelScannerBuilder::_load() {
256274
auto beta_rowset = std::dynamic_pointer_cast<BetaRowset>(rowset);
257275
std::vector<uint32_t> segment_rows;
258276
OlapReaderStatistics preload_stats;
277+
auto preload_io_ctx = create_preload_io_context(_state, &preload_stats);
259278
RETURN_IF_ERROR(beta_rowset->get_segment_num_rows(&segment_rows, enable_segment_cache,
260-
&preload_stats));
279+
&preload_stats, &preload_io_ctx));
261280
_tablet_preload_file_cache_stats[tablet_id].merge_from(preload_stats.file_cache_stats);
262281
auto segment_count = rowset->num_segments();
263282
for (int64_t i = 0; i != segment_count; i++) {

‎be/src/storage/rowset/beta_rowset.cpp‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,11 @@ Status BetaRowset::init() {
7575
namespace {
7676
Status load_segment_rows_from_footer(BetaRowsetSharedPtr rowset,
7777
std::vector<uint32_t>* segment_rows, bool enable_segment_cache,
78-
OlapReaderStatistics* read_stats) {
78+
OlapReaderStatistics* read_stats,
79+
const io::IOContext* io_ctx) {
7980
SegmentCacheHandle segment_cache_handle;
8081
RETURN_IF_ERROR(SegmentLoader::instance()->load_segments(
81-
rowset, &segment_cache_handle, enable_segment_cache, false, read_stats));
82+
rowset, &segment_cache_handle, enable_segment_cache, false, read_stats, io_ctx));
8283
for (const auto& segment : segment_cache_handle.get_segments()) {
8384
segment_rows->emplace_back(segment->num_rows());
8485
}
@@ -106,14 +107,14 @@ Status check_segment_rows_consistency(const std::vector<uint32_t>& rows_from_met
106107
} // namespace
107108

108109
Status BetaRowset::get_segment_num_rows(std::vector<uint32_t>* segment_rows,
109-
bool enable_segment_cache,
110-
OlapReaderStatistics* read_stats) {
110+
bool enable_segment_cache, OlapReaderStatistics* read_stats,
111+
const io::IOContext* io_ctx) {
111112
#ifndef BE_TEST
112113
// `ROWSET_UNLOADING` is state for closed() called but owned by some readers.
113114
// So here `ROWSET_UNLOADING` is allowed.
114115
DCHECK_NE(_rowset_state_machine.rowset_state(), ROWSET_UNLOADED);
115116
#endif
116-
RETURN_IF_ERROR(_load_segment_rows_once.call([this, enable_segment_cache, read_stats] {
117+
RETURN_IF_ERROR(_load_segment_rows_once.call([this, enable_segment_cache, read_stats, io_ctx] {
117118
auto segment_count = num_segments();
118119
if (segment_count == 0) {
119120
return Status::OK();
@@ -130,7 +131,7 @@ Status BetaRowset::get_segment_num_rows(std::vector<uint32_t>* segment_rows,
130131
std::vector<uint32_t> rows_from_footer;
131132
auto self = std::dynamic_pointer_cast<BetaRowset>(shared_from_this());
132133
auto load_status = load_segment_rows_from_footer(
133-
self, &rows_from_footer, enable_segment_cache, read_stats);
134+
self, &rows_from_footer, enable_segment_cache, read_stats, io_ctx);
134135
if (load_status.ok()) {
135136
return check_segment_rows_consistency(
136137
_segments_rows, rows_from_footer, _rowset_meta->tablet_id(),
@@ -162,7 +163,7 @@ Status BetaRowset::get_segment_num_rows(std::vector<uint32_t>* segment_rows,
162163
TEST_SYNC_POINT("BetaRowset::get_segment_num_rows:load_from_segment_footer");
163164
auto self = std::dynamic_pointer_cast<BetaRowset>(shared_from_this());
164165
return load_segment_rows_from_footer(self, &_segments_rows, enable_segment_cache,
165-
read_stats);
166+
read_stats, io_ctx);
166167
}));
167168
segment_rows->assign(_segments_rows.cbegin(), _segments_rows.cend());
168169
return Status::OK();
@@ -258,7 +259,8 @@ Status BetaRowset::load_segments(int64_t seg_id_begin, int64_t seg_id_end,
258259
}
259260

260261
Status BetaRowset::load_segment(int64_t seg_id, OlapReaderStatistics* stats,
261-
segment_v2::SegmentSharedPtr* segment) {
262+
segment_v2::SegmentSharedPtr* segment,
263+
const io::IOContext* io_ctx) {
262264
auto fs = _rowset_meta->fs();
263265
if (!fs) {
264266
return Status::Error<INIT_FAILED>("get fs failed");
@@ -279,7 +281,7 @@ Status BetaRowset::load_segment(int64_t seg_id, OlapReaderStatistics* stats,
279281
auto s = segment_v2::Segment::open(
280282
fs, seg_path, _rowset_meta->tablet_id(), static_cast<uint32_t>(seg_id), rowset_id(),
281283
_schema, reader_options, segment,
282-
_rowset_meta->inverted_index_file_info(static_cast<int>(seg_id)), stats);
284+
_rowset_meta->inverted_index_file_info(static_cast<int>(seg_id)), stats, io_ctx);
283285
if (!s.ok()) {
284286
LOG(WARNING) << "failed to open segment. " << seg_path << " under rowset " << rowset_id()
285287
<< " : " << s.to_string();

‎be/src/storage/rowset/beta_rowset.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ namespace doris {
3838
class BetaRowset;
3939

4040
namespace io {
41+
struct IOContext;
4142
class RemoteFileSystem;
4243
} // namespace io
4344
struct RowsetId;
@@ -78,7 +79,8 @@ class BetaRowset final : public Rowset {
7879
std::vector<segment_v2::SegmentSharedPtr>* segments);
7980

8081
Status load_segment(int64_t seg_id, OlapReaderStatistics* read_stats,
81-
segment_v2::SegmentSharedPtr* segment);
82+
segment_v2::SegmentSharedPtr* segment,
83+
const io::IOContext* io_ctx = nullptr);
8284

8385
Status get_segments_size(std::vector<size_t>* segments_size);
8486

@@ -92,7 +94,8 @@ class BetaRowset final : public Rowset {
9294
rapidjson::Document::AllocatorType& allocator);
9395

9496
Status get_segment_num_rows(std::vector<uint32_t>* segment_rows, bool enable_segment_cache,
95-
OlapReaderStatistics* read_stats);
97+
OlapReaderStatistics* read_stats,
98+
const io::IOContext* io_ctx = nullptr);
9699

97100
protected:
98101
BetaRowset(const TabletSchemaSPtr& schema, const RowsetMetaSharedPtr& rowset_meta,

‎be/src/storage/segment/column_reader_cache.h‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,11 @@ class ColumnReaderCache {
5252
// Main constructor used in production: cache is bound to a specific segment's
5353
// ColumnMetaAccessor, TabletSchema, file reader and row count, plus a footer
5454
// getter callback (Segment::_get_segment_footer).
55-
ColumnReaderCache(
56-
ColumnMetaAccessor* accessor, TabletSchemaSPtr tablet_schema,
57-
io::FileReaderSPtr file_reader, uint64_t num_rows,
58-
std::function<Status(std::shared_ptr<SegmentFooterPB>&, OlapReaderStatistics*,
59-
const io::IOContext*)>
60-
get_footer_cb);
55+
ColumnReaderCache(ColumnMetaAccessor* accessor, TabletSchemaSPtr tablet_schema,
56+
io::FileReaderSPtr file_reader, uint64_t num_rows,
57+
std::function<Status(std::shared_ptr<SegmentFooterPB>&, OlapReaderStatistics*,
58+
const io::IOContext*)>
59+
get_footer_cb);
6160
virtual ~ColumnReaderCache();
6261
// Get all available readers
6362
// if include_subcolumns is true, return all available readers, including subcolumn readers

‎be/src/storage/segment/lazy_init_segment_iterator.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ Status LazyInitSegmentIterator::init(const StorageReadOptions& opts) {
4141
{
4242
SegmentCacheHandle segment_cache_handle;
4343
RETURN_IF_ERROR(SegmentLoader::instance()->load_segment(
44-
_rowset, _segment_id, &segment_cache_handle, _should_use_cache, false, opts.stats));
44+
_rowset, _segment_id, &segment_cache_handle, _should_use_cache, false, opts.stats,
45+
&opts.io_ctx));
4546
const auto& tmp_segments = segment_cache_handle.get_segments();
4647
segment = tmp_segments[0];
4748
}

‎be/src/storage/segment/segment.cpp‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,14 @@ io::IOContext create_index_io_context(const io::IOContext* source, OlapReaderSta
160160
Status Segment::open(io::FileSystemSPtr fs, const std::string& path, int64_t tablet_id,
161161
uint32_t segment_id, RowsetId rowset_id, TabletSchemaSPtr tablet_schema,
162162
const io::FileReaderOptions& reader_options, std::shared_ptr<Segment>* output,
163-
InvertedIndexFileInfo idx_file_info, OlapReaderStatistics* stats) {
163+
InvertedIndexFileInfo idx_file_info, OlapReaderStatistics* stats,
164+
const io::IOContext* source_io_ctx) {
164165
// Ensure tablet_id is available in reader_options for CachedRemoteFileReader peer read.
165166
io::FileReaderOptions opts_with_tablet = reader_options;
166167
opts_with_tablet.tablet_id = tablet_id;
167168

168169
auto s = _open(fs, path, segment_id, rowset_id, tablet_schema, opts_with_tablet, output,
169-
idx_file_info, stats);
170+
idx_file_info, stats, source_io_ctx);
170171
if (s.ok() && output && *output) {
171172
(*output)->_tablet_id = tablet_id;
172173
}
@@ -187,7 +188,8 @@ Status Segment::open(io::FileSystemSPtr fs, const std::string& path, int64_t tab
187188
Status Segment::_open(io::FileSystemSPtr fs, const std::string& path, uint32_t segment_id,
188189
RowsetId rowset_id, TabletSchemaSPtr tablet_schema,
189190
const io::FileReaderOptions& reader_options, std::shared_ptr<Segment>* output,
190-
InvertedIndexFileInfo idx_file_info, OlapReaderStatistics* stats) {
191+
InvertedIndexFileInfo idx_file_info, OlapReaderStatistics* stats,
192+
const io::IOContext* source_io_ctx) {
191193
io::FileReaderSPtr file_reader;
192194
auto st = fs->open_file(path, &file_reader, &reader_options);
193195
TEST_INJECTION_POINT_CALLBACK("Segment::open:corruption", &st);
@@ -197,7 +199,7 @@ Status Segment::_open(io::FileSystemSPtr fs, const std::string& path, uint32_t s
197199
if (st) {
198200
segment->_fs = fs;
199201
segment->_file_reader = std::move(file_reader);
200-
st = segment->_open(stats);
202+
st = segment->_open(stats, source_io_ctx);
201203
}
202204

203205
// Three-tier retry for CORRUPTION errors when file cache is enabled.
@@ -216,7 +218,7 @@ Status Segment::_open(io::FileSystemSPtr fs, const std::string& path, uint32_t s
216218
if (st) {
217219
segment->_fs = fs;
218220
segment->_file_reader = std::move(file_reader);
219-
st = segment->_open(stats);
221+
st = segment->_open(stats, source_io_ctx);
220222
}
221223
TEST_INJECTION_POINT_CALLBACK("Segment::open:corruption1", &st);
222224
if (st.is<ErrorCode::CORRUPTION>()) { // corrupt again
@@ -232,7 +234,7 @@ Status Segment::_open(io::FileSystemSPtr fs, const std::string& path, uint32_t s
232234
RETURN_IF_ERROR(fs->open_file(path, &file_reader, &opt));
233235
segment->_fs = fs;
234236
segment->_file_reader = std::move(file_reader);
235-
st = segment->_open(stats);
237+
st = segment->_open(stats, source_io_ctx);
236238
if (!st.ok()) {
237239
// Tier 3: Remote source itself is corrupt.
238240
LOG(WARNING) << "failed to try to read remote source file directly,"
@@ -277,9 +279,9 @@ void Segment::update_metadata_size() {
277279
_tracked_meta_mem_usage = _meta_mem_usage;
278280
}
279281

280-
Status Segment::_open(OlapReaderStatistics* stats) {
282+
Status Segment::_open(OlapReaderStatistics* stats, const io::IOContext* source_io_ctx) {
281283
std::shared_ptr<SegmentFooterPB> footer_pb_shared;
282-
RETURN_IF_ERROR(_get_segment_footer(footer_pb_shared, stats));
284+
RETURN_IF_ERROR(_get_segment_footer(footer_pb_shared, stats, source_io_ctx));
283285

284286
_pk_index_meta.reset(
285287
footer_pb_shared->has_primary_key_index_meta()

‎be/src/storage/segment/segment.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ class Segment : public std::enable_shared_from_this<Segment>, public MetadataAdd
9696
uint32_t segment_id, RowsetId rowset_id, TabletSchemaSPtr tablet_schema,
9797
const io::FileReaderOptions& reader_options,
9898
std::shared_ptr<Segment>* output, InvertedIndexFileInfo idx_file_info = {},
99-
OlapReaderStatistics* stats = nullptr);
99+
OlapReaderStatistics* stats = nullptr,
100+
const io::IOContext* io_ctx = nullptr);
100101

101102
static io::UInt128Wrapper file_cache_key(std::string_view rowset_id, uint32_t seg_id);
102103
io::UInt128Wrapper file_cache_key() const {
@@ -246,9 +247,10 @@ class Segment : public std::enable_shared_from_this<Segment>, public MetadataAdd
246247
RowsetId rowset_id, TabletSchemaSPtr tablet_schema,
247248
const io::FileReaderOptions& reader_options,
248249
std::shared_ptr<Segment>* output, InvertedIndexFileInfo idx_file_info,
249-
OlapReaderStatistics* stats);
250+
OlapReaderStatistics* stats = nullptr,
251+
const io::IOContext* io_ctx = nullptr);
250252
// open segment file and read the minimum amount of necessary information (footer)
251-
Status _open(OlapReaderStatistics* stats);
253+
Status _open(OlapReaderStatistics* stats, const io::IOContext* io_ctx = nullptr);
252254
Status _parse_footer(std::shared_ptr<SegmentFooterPB>& footer,
253255
OlapReaderStatistics* stats = nullptr,
254256
const io::IOContext* io_ctx = nullptr);

‎be/src/storage/segment/segment_loader.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ void SegmentCache::erase(const SegmentCache::CacheKey& key) {
5555
Status SegmentLoader::load_segment(const BetaRowsetSharedPtr& rowset, int64_t segment_id,
5656
SegmentCacheHandle* cache_handle, bool use_cache,
5757
bool need_load_pk_index_and_bf,
58-
OlapReaderStatistics* index_load_stats) {
58+
OlapReaderStatistics* index_load_stats,
59+
const io::IOContext* io_ctx) {
5960
auto start = MonotonicMicros();
6061
SegmentCache::CacheKey cache_key(rowset->rowset_id(), segment_id);
6162
if (_segment_cache->lookup(cache_key, cache_handle)) {
@@ -72,7 +73,7 @@ Status SegmentLoader::load_segment(const BetaRowsetSharedPtr& rowset, int64_t se
7273
}
7374
// If the segment is not healthy, then will create a new segment and will replace the unhealthy one in SegmentCache.
7475
segment_v2::SegmentSharedPtr segment;
75-
RETURN_IF_ERROR(rowset->load_segment(segment_id, index_load_stats, &segment));
76+
RETURN_IF_ERROR(rowset->load_segment(segment_id, index_load_stats, &segment, io_ctx));
7677
if (need_load_pk_index_and_bf) {
7778
RETURN_IF_ERROR(segment->load_pk_index_and_bf(index_load_stats));
7879
}
@@ -95,13 +96,14 @@ Status SegmentLoader::load_segment(const BetaRowsetSharedPtr& rowset, int64_t se
9596
Status SegmentLoader::load_segments(const BetaRowsetSharedPtr& rowset,
9697
SegmentCacheHandle* cache_handle, bool use_cache,
9798
bool need_load_pk_index_and_bf,
98-
OlapReaderStatistics* index_load_stats) {
99+
OlapReaderStatistics* index_load_stats,
100+
const io::IOContext* io_ctx) {
99101
if (cache_handle->is_inited()) {
100102
return Status::OK();
101103
}
102104
for (int64_t i = 0; i < rowset->num_segments(); i++) {
103105
RETURN_IF_ERROR(load_segment(rowset, i, cache_handle, use_cache, need_load_pk_index_and_bf,
104-
index_load_stats));
106+
index_load_stats, io_ctx));
105107
}
106108
cache_handle->set_inited();
107109
return Status::OK();

‎be/src/storage/segment/segment_loader.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,16 @@ class SegmentLoader {
121121
// If use_cache is true, it will be loaded from _cache.
122122
Status load_segments(const BetaRowsetSharedPtr& rowset, SegmentCacheHandle* cache_handle,
123123
bool use_cache = false, bool need_load_pk_index_and_bf = false,
124-
OlapReaderStatistics* index_load_stats = nullptr);
124+
OlapReaderStatistics* index_load_stats = nullptr,
125+
const io::IOContext* io_ctx = nullptr);
125126

126127
// Load one segment of "rowset", return the "cache_handle" which contains segments.
127128
// If use_cache is true, it will be loaded from _cache.
128129
Status load_segment(const BetaRowsetSharedPtr& rowset, int64_t segment_id,
129130
SegmentCacheHandle* cache_handle, bool use_cache = false,
130131
bool need_load_pk_index_and_bf = false,
131-
OlapReaderStatistics* index_load_stats = nullptr);
132+
OlapReaderStatistics* index_load_stats = nullptr,
133+
const io::IOContext* io_ctx = nullptr);
132134

133135
void erase_segment(const SegmentCache::CacheKey& key);
134136

‎be/src/storage/segment/variant/variant_column_reader.cpp‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -536,9 +536,9 @@ Status VariantColumnReader::_build_read_plan_flat_leaves(
536536
}
537537
VLOG_DEBUG << "new iterator: " << target_col.path_info_ptr()->get_path();
538538
std::shared_ptr<ColumnReader> column_reader;
539-
RETURN_IF_ERROR(column_reader_cache->get_path_column_reader(
540-
target_col.parent_unique_id(), node->path, &column_reader, opts->stats, node,
541-
&opts->io_ctx));
539+
RETURN_IF_ERROR(column_reader_cache->get_path_column_reader(target_col.parent_unique_id(),
540+
node->path, &column_reader,
541+
opts->stats, node, &opts->io_ctx));
542542
plan->kind = ReadKind::LEAF;
543543
plan->type = column_reader->get_vec_data_type();
544544
plan->relative_path = relative_path;
@@ -813,9 +813,8 @@ Status VariantColumnReader::_try_build_external_leaf_plan(ReadPlan* plan, int32_
813813
}
814814

815815
std::shared_ptr<ColumnReader> leaf_column_reader;
816-
Status st = column_reader_cache->get_path_column_reader(col_uid, relative_path,
817-
&leaf_column_reader, stats, nullptr,
818-
io_ctx);
816+
Status st = column_reader_cache->get_path_column_reader(
817+
col_uid, relative_path, &leaf_column_reader, stats, nullptr, io_ctx);
819818
DCHECK(!_has_prefix_path_unlocked(relative_path));
820819
if (st.ok()) {
821820
plan->kind = ReadKind::LEAF;
@@ -950,9 +949,8 @@ Status VariantColumnReader::_build_read_plan(ReadPlan* plan, const TabletColumn&
950949
return Status::OK();
951950
}
952951
if (node == nullptr) {
953-
RETURN_IF_ERROR(_try_build_external_leaf_plan(plan, col_uid, relative_path,
954-
column_reader_cache, opt->stats,
955-
&opt->io_ctx));
952+
RETURN_IF_ERROR(_try_build_external_leaf_plan(
953+
plan, col_uid, relative_path, column_reader_cache, opt->stats, &opt->io_ctx));
956954
if (plan->kind == ReadKind::LEAF) {
957955
return Status::OK();
958956
}

0 commit comments

Comments
 (0)