yiguolei commented on code in PR #52879:
URL: https://github.com/apache/doris/pull/52879#discussion_r2194355270
##########
be/src/pipeline/exec/olap_scan_operator.cpp:
##########
@@ -450,55 +449,72 @@ Status
OlapScanLocalState::_init_scanners(std::list<vectorized::ScannerSPtr>* sc
return Status::OK();
}
-Status OlapScanLocalState::hold_tablets() {
- if (!_tablets.empty()) {
+Status OlapScanLocalState::sync_cloud_tablets(RuntimeState* state) {
+ if (config::is_cloud_mode() && !_sync_tablet) {
+ _cloud_tablet_dependencies.resize(_scan_ranges.size());
+ for (size_t i = 0; i < _scan_ranges.size(); i++) {
+ _cloud_tablet_dependencies[i] =
+ Dependency::create_shared(_parent->operator_id(),
_parent->node_id(),
+ "CLOUD_TABLET_DEP_" +
std::to_string(i));
+ }
+
+ _tablets.resize(_scan_ranges.size());
+ _tasks.reserve(_scan_ranges.size());
+ _sync_statistics.resize(_scan_ranges.size());
+ SCOPED_RAW_TIMER(&_duration_ns);
+ for (size_t i = 0; i < _scan_ranges.size(); i++) {
+ auto* sync_stats = &_sync_statistics[i];
+ int64_t version = 0;
+ std::from_chars(_scan_ranges[i]->version.data(),
+ _scan_ranges[i]->version.data() +
_scan_ranges[i]->version.size(),
+ version);
+ auto task_ctx = state->get_task_execution_context();
+ _tasks.emplace_back([this, sync_stats, version, i, task_ctx]() {
+ auto task_lock = task_ctx.lock();
+ if (task_lock == nullptr) {
+ return Status::OK();
+ }
+ Defer defer([&] {
this->_cloud_tablet_dependencies[i]->set_ready(); });
+ auto tablet =
+
DORIS_TRY(ExecEnv::get_tablet(_scan_ranges[i]->tablet_id, sync_stats));
+ _tablets[i] = {std::move(tablet), version};
+ SyncOptions options;
+ options.query_version = version;
+ options.merge_schema = true;
+
RETURN_IF_ERROR(std::dynamic_pointer_cast<CloudTablet>(_tablets[i].tablet)
+ ->sync_rowsets(options, sync_stats));
+ // FIXME(plat1ko): Avoid pointer cast
+
ExecEnv::GetInstance()->storage_engine().to_cloud().tablet_hotspot().count(
+ *_tablets[i].tablet);
+ return Status::OK();
+ });
+ }
+ RETURN_IF_ERROR(cloud::bthread_fork_join(
+ _tasks, config::init_scanner_sync_rowsets_parallelism,
&_cloud_tablet_future));
+ _sync_tablet = true;
return Status::OK();
}
+ return Status::OK();
+}
+Status OlapScanLocalState::hold_tablets() {
MonotonicStopWatch timer;
timer.start();
- _tablets.resize(_scan_ranges.size());
_read_sources.resize(_scan_ranges.size());
if (config::is_cloud_mode()) {
- std::vector<SyncRowsetStats> sync_statistics(_scan_ranges.size());
- std::vector<std::function<Status()>> tasks {};
- tasks.reserve(_scan_ranges.size());
- int64_t duration_ns {0};
- {
- SCOPED_RAW_TIMER(&duration_ns);
- for (size_t i = 0; i < _scan_ranges.size(); i++) {
- auto* sync_stats = &sync_statistics[i];
- int64_t version = 0;
- std::from_chars(_scan_ranges[i]->version.data(),
- _scan_ranges[i]->version.data() +
_scan_ranges[i]->version.size(),
- version);
- tasks.emplace_back([this, sync_stats, version, i]() {
- auto tablet =
-
DORIS_TRY(ExecEnv::get_tablet(_scan_ranges[i]->tablet_id, sync_stats));
- _tablets[i] = {std::move(tablet), version};
- SyncOptions options;
- options.query_version = version;
- options.merge_schema = true;
-
RETURN_IF_ERROR(std::dynamic_pointer_cast<CloudTablet>(_tablets[i].tablet)
- ->sync_rowsets(options,
sync_stats));
- // FIXME(plat1ko): Avoid pointer cast
-
ExecEnv::GetInstance()->storage_engine().to_cloud().tablet_hotspot().count(
- *_tablets[i].tablet);
- return Status::OK();
- });
- }
- RETURN_IF_ERROR(
- cloud::bthread_fork_join(tasks,
config::init_scanner_sync_rowsets_parallelism));
- }
- COUNTER_UPDATE(_sync_rowset_timer, duration_ns);
+ DCHECK(std::all_of(
+ _cloud_tablet_dependencies.begin(),
_cloud_tablet_dependencies.end(),
+ [&](DependencySPtr dep) -> bool { return
!dep->is_blocked_by(nullptr); }));
+ DCHECK(_cloud_tablet_future.valid() &&
_cloud_tablet_future.get().ok());
Review Comment:
这个future 实际只是用来做dcheck的？
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
