hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[CP] fix external table bug

Browse Source
This commit is contained in:
wjhh2008
2023-10-19 13:43:23 +00:00
committed by ob-robot
parent 857e524cac
commit fbcc7b9e37
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/sql/engine/px/ob_px_util.cpp
View File

@ -193,14 +193,21 @@ int ObPXServerAddrUtil::get_external_table_loc(
} else { } else {
ObSEArray<ObAddr, 16> all_locations; ObSEArray<ObAddr, 16> all_locations;
int64_t expected_location_cnt = std::min(dfo.get_dop(), dfo.get_external_table_files().count()); int64_t expected_location_cnt = std::min(dfo.get_dop(), dfo.get_external_table_files().count());
if (OB_FAIL(GCTX.location_service_->external_table_get(tenant_id, ref_table_id, all_locations))) { if (1 == expected_location_cnt) {
LOG_WARN("fail to get external table location", K(ret)); if (OB_FAIL(target_locations.push_back(GCTX.self_addr()))) {
} else if (expected_location_cnt >= all_locations.count() ? LOG_WARN("fail to push push back", K(ret));
OB_FAIL(target_locations.assign(all_locations)) }
: OB_FAIL(ObPXServerAddrUtil::do_random_dfo_distribution(all_locations, } else {
expected_location_cnt, if (OB_FAIL(GCTX.location_service_->external_table_get(tenant_id, ref_table_id, all_locations))) {
target_locations))) LOG_WARN("fail to get external table location", K(ret));
LOG_WARN("fail to calc random dfo distribution", K(ret), K(all_locations), K(expected_location_cnt)); } else if (expected_location_cnt >= all_locations.count() ?
OB_FAIL(target_locations.assign(all_locations))
: OB_FAIL(ObPXServerAddrUtil::do_random_dfo_distribution(all_locations,
expected_location_cnt,
target_locations))) {
LOG_WARN("fail to calc random dfo distribution", K(ret), K(all_locations), K(expected_location_cnt));
}
}
} }
LOG_TRACE("calc external table location", K(target_locations)); LOG_TRACE("calc external table location", K(target_locations));
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {