This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new a2f74bf260 [Improvement] remove profile with poor readability (#10581)
a2f74bf260 is described below
commit a2f74bf26033b4c338a3d5b1c53452c5622a06a0
Author: Gabriel <gabrielleeb...@gmail.com>
AuthorDate: Tue Jul 5 11:09:23 2022 +0800
[Improvement] remove profile with poor readability (#10581)
---
be/src/exec/es_http_scan_node.cpp | 3 +--
be/src/exec/olap_scan_node.cpp | 3 +--
be/src/exec/scan_node.cpp | 9 +++------
be/src/exec/scan_node.h | 2 +-
be/src/vec/exec/ves_http_scan_node.cpp | 3 +--
be/src/vec/exec/volap_scan_node.cpp | 3 +--
6 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/be/src/exec/es_http_scan_node.cpp
b/be/src/exec/es_http_scan_node.cpp
index acdaeb772d..81303b002b 100644
--- a/be/src/exec/es_http_scan_node.cpp
+++ b/be/src/exec/es_http_scan_node.cpp
@@ -159,8 +159,7 @@ Status EsHttpScanNode::open(RuntimeState* state) {
auto checker = [&](int index) {
return _conjunct_to_predicate[index] != -1 &&
list[_conjunct_to_predicate[index]];
};
- std::string vconjunct_information = _peel_pushed_vconjunct(state, checker);
- _scanner_profile->add_info_string("VconjunctExprTree",
vconjunct_information);
+ _peel_pushed_vconjunct(state, checker);
RETURN_IF_ERROR(start_scanners());
diff --git a/be/src/exec/olap_scan_node.cpp b/be/src/exec/olap_scan_node.cpp
index d21b795e1d..846e927a17 100644
--- a/be/src/exec/olap_scan_node.cpp
+++ b/be/src/exec/olap_scan_node.cpp
@@ -552,8 +552,7 @@ void OlapScanNode::remove_pushed_conjuncts(RuntimeState*
state) {
// filter idle conjunct in vexpr_contexts
auto checker = [&](int index) { return
_pushed_conjuncts_index.count(index); };
- std::string vconjunct_information = _peel_pushed_vconjunct(state, checker);
- _runtime_profile->add_info_string("NonPushdownPredicate",
vconjunct_information);
+ _peel_pushed_vconjunct(state, checker);
}
void OlapScanNode::eval_const_conjuncts() {
diff --git a/be/src/exec/scan_node.cpp b/be/src/exec/scan_node.cpp
index d7120198e9..63197327a4 100644
--- a/be/src/exec/scan_node.cpp
+++ b/be/src/exec/scan_node.cpp
@@ -49,10 +49,10 @@ Status ScanNode::prepare(RuntimeState* state) {
// It relies on the logic of function convertConjunctsToAndCompoundPredicate()
of FE splicing expr.
// It requires FE to satisfy each splicing with 'and' expr, and spliced from
left to right, in order.
// Expr tree specific forms do not require requirements.
-std::string ScanNode::_peel_pushed_vconjunct(RuntimeState* state,
- const std::function<bool(int)>&
checker) {
+void ScanNode::_peel_pushed_vconjunct(RuntimeState* state,
+ const std::function<bool(int)>& checker)
{
if (_vconjunct_ctx_ptr == nullptr) {
- return "null";
+ return;
}
int leaf_index = 0;
@@ -65,11 +65,8 @@ std::string ScanNode::_peel_pushed_vconjunct(RuntimeState*
state,
_vconjunct_ctx_ptr.reset(nullptr);
} else {
(*_vconjunct_ctx_ptr)->set_root(new_conjunct_expr_root);
- return new_conjunct_expr_root->debug_string();
}
}
-
- return "null";
}
} // namespace doris
diff --git a/be/src/exec/scan_node.h b/be/src/exec/scan_node.h
index 17a14b8b08..227d32f25f 100644
--- a/be/src/exec/scan_node.h
+++ b/be/src/exec/scan_node.h
@@ -92,7 +92,7 @@ public:
static const std::string _s_num_disks_accessed_counter;
protected:
- std::string _peel_pushed_vconjunct(
+ void _peel_pushed_vconjunct(
RuntimeState* state,
const std::function<bool(int)>& checker); // remove pushed expr
from conjunct tree
diff --git a/be/src/vec/exec/ves_http_scan_node.cpp
b/be/src/vec/exec/ves_http_scan_node.cpp
index 4b9d0cd250..c1c2e79f37 100644
--- a/be/src/vec/exec/ves_http_scan_node.cpp
+++ b/be/src/vec/exec/ves_http_scan_node.cpp
@@ -157,8 +157,7 @@ Status VEsHttpScanNode::open(RuntimeState* state) {
auto checker = [&](int index) {
return _conjunct_to_predicate[index] != -1 &&
list[_conjunct_to_predicate[index]];
};
- std::string vconjunct_information = _peel_pushed_vconjunct(state, checker);
- _scanner_profile->add_info_string("VconjunctExprTree",
vconjunct_information);
+ _peel_pushed_vconjunct(state, checker);
RETURN_IF_ERROR(start_scanners());
diff --git a/be/src/vec/exec/volap_scan_node.cpp
b/be/src/vec/exec/volap_scan_node.cpp
index 1f7671675f..cae48c8f55 100644
--- a/be/src/vec/exec/volap_scan_node.cpp
+++ b/be/src/vec/exec/volap_scan_node.cpp
@@ -1046,8 +1046,7 @@ void VOlapScanNode::remove_pushed_conjuncts(RuntimeState*
state) {
// filter idle conjunct in vexpr_contexts
auto checker = [&](int index) { return
_pushed_conjuncts_index.count(index); };
- std::string vconjunct_information = _peel_pushed_vconjunct(state, checker);
- _runtime_profile->add_info_string("NonPushdownPredicate",
vconjunct_information);
+ _peel_pushed_vconjunct(state, checker);
}
// Construct the ColumnValueRange for one specified column
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
