database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[feature-wip](new-scan) Add new ES scanner and new ES scan node #13027

Browse Source
This commit is contained in:
Tiewei Fang
2022-10-10 09:56:38 +08:00
committed by GitHub
parent dd089259be
commit 935ef5a598
8 changed files with 596 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
be/src/exec/exec_node.cpp
View File

@ -61,6 +61,7 @@
#include "vec/core/block.h"
#include "vec/exec/file_scan_node.h"
#include "vec/exec/join/vhash_join_node.h"
#include "vec/exec/scan/new_es_scan_node.h"
#include "vec/exec/scan/new_file_scan_node.h"
#include "vec/exec/scan/new_jdbc_scan_node.h"
#include "vec/exec/scan/new_odbc_scan_node.h"
@ -477,7 +478,11 @@ Status ExecNode::create_node(RuntimeState* state, ObjectPool* pool, const TPlanN
case TPlanNodeType::ES_HTTP_SCAN_NODE:
if (state->enable_vectorized_exec()) {
*node = pool->add(new vectorized::VEsHttpScanNode(pool, tnode, descs));
if (config::enable_new_scan_node) {
*node = pool->add(new vectorized::NewEsScanNode(pool, tnode, descs));
} else {
*node = pool->add(new vectorized::VEsHttpScanNode(pool, tnode, descs));
}
} else {
*node = pool->add(new EsHttpScanNode(pool, tnode, descs));
}
@ -735,7 +740,8 @@ void ExecNode::try_do_aggregate_serde_improve() {
ExecNode* child0 = agg_node[0]->_children[0];
if (typeid(*child0) == typeid(vectorized::NewOlapScanNode) ||
typeid(*child0) == typeid(vectorized::NewFileScanNode) ||
typeid(*child0) == typeid(vectorized::NewOdbcScanNode)
typeid(*child0) == typeid(vectorized::NewOdbcScanNode) ||
typeid(*child0) == typeid(vectorized::NewEsScanNode)
#ifdef LIBJVM
|| typeid(*child0) == typeid(vectorized::NewJdbcScanNode)
#endif