Skip to content

Fix multithreads for EsHttpScanNode #899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lide-reed merged 1 commit into from
Apr 9, 2019
Merged

Fix multithreads for EsHttpScanNode #899

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 30 additions & 28 deletions be/src/exec/es_http_scan_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,13 @@ Status EsHttpScanNode::open(RuntimeState* state) {
Status EsHttpScanNode::start_scanners() {
{
std::unique_lock<std::mutex> l(_batch_queue_lock);
_num_running_scanners = 1;
_num_running_scanners = _scan_ranges.size();
}

for (int i = 0; i < _scan_ranges.size(); i++) {
_scanner_threads.emplace_back(&EsHttpScanNode::scanner_worker, this, i,
_scan_ranges.size());
}
_scanner_threads.emplace_back(&EsHttpScanNode::scanner_worker, this, 0,
_scan_ranges.size());
return Status::OK;
}

Expand Down Expand Up @@ -378,38 +381,37 @@ static std::string get_host_port(const std::vector<TNetworkAddress>& es_hosts) {
void EsHttpScanNode::scanner_worker(int start_idx, int length) {
// Clone expr context
std::vector<ExprContext*> scanner_expr_ctxs;
DCHECK(start_idx < length);
auto status = Expr::clone_if_not_exists(_conjunct_ctxs, _runtime_state,
&scanner_expr_ctxs);
if (!status.ok()) {
LOG(WARNING) << "Clone conjuncts failed.";
}

EsScanCounter counter;
for (int i = 0; i < length && status.ok(); ++i) {
const TEsScanRange& es_scan_range =
_scan_ranges[start_idx + i].scan_range.es_scan_range;

// Collect the informations from scan range to perperties
std::map<std::string, std::string> properties(_properties);
properties[ESScanReader::KEY_INDEX] = es_scan_range.index;
if (es_scan_range.__isset.type) {
properties[ESScanReader::KEY_TYPE] = es_scan_range.type;
}
properties[ESScanReader::KEY_SHARD] = std::to_string(es_scan_range.shard_id);
properties[ESScanReader::KEY_BATCH_SIZE] = std::to_string(_runtime_state->batch_size());
properties[ESScanReader::KEY_HOST_PORT] = get_host_port(es_scan_range.es_hosts);
properties[ESScanReader::KEY_QUERY]
= ESScrollQueryBuilder::build(properties, _column_names, _predicates);

// start scanner to scan
std::unique_ptr<EsHttpScanner> scanner(new EsHttpScanner(
_runtime_state, runtime_profile(), _tuple_id,
properties, scanner_expr_ctxs, &counter));
status = scanner_scan(std::move(scanner), scanner_expr_ctxs, &counter);
if (!status.ok()) {
LOG(WARNING) << "Scanner[" << start_idx + i << "] process failed. status="
<< status.get_error_msg();
}
const TEsScanRange& es_scan_range =
_scan_ranges[start_idx].scan_range.es_scan_range;

// Collect the informations from scan range to perperties
std::map<std::string, std::string> properties(_properties);
properties[ESScanReader::KEY_INDEX] = es_scan_range.index;
if (es_scan_range.__isset.type) {
properties[ESScanReader::KEY_TYPE] = es_scan_range.type;
}
properties[ESScanReader::KEY_SHARD] = std::to_string(es_scan_range.shard_id);
properties[ESScanReader::KEY_BATCH_SIZE] = std::to_string(_runtime_state->batch_size());
properties[ESScanReader::KEY_HOST_PORT] = get_host_port(es_scan_range.es_hosts);
properties[ESScanReader::KEY_QUERY]
= ESScrollQueryBuilder::build(properties, _column_names, _predicates);

// start scanner to scan
std::unique_ptr<EsHttpScanner> scanner(new EsHttpScanner(
_runtime_state, runtime_profile(), _tuple_id,
properties, scanner_expr_ctxs, &counter));
status = scanner_scan(std::move(scanner), scanner_expr_ctxs, &counter);
if (!status.ok()) {
LOG(WARNING) << "Scanner[" << start_idx << "] process failed. status="
<< status.get_error_msg();
}

// Update stats
Expand Down