This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new f4663ad [improvement](vectorized) Merge block in scanner to speed up
query with conjunct (#8395)
f4663ad is described below
commit f4663ad2eb3fc8ce929304ccdea09d87bb86ec8a
Author: HappenLee <[email protected]>
AuthorDate: Wed Mar 9 13:11:18 2022 +0800
[improvement](vectorized) Merge block in scanner to speed up query with
conjunct (#8395)
---
be/src/vec/exec/join/vhash_join_node.cpp | 1 -
be/src/vec/exec/volap_scan_node.cpp | 9 ++++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/be/src/vec/exec/join/vhash_join_node.cpp
b/be/src/vec/exec/join/vhash_join_node.cpp
index 9f93f96..163d120 100644
--- a/be/src/vec/exec/join/vhash_join_node.cpp
+++ b/be/src/vec/exec/join/vhash_join_node.cpp
@@ -24,7 +24,6 @@
#include "vec/core/materialize_block.h"
#include "vec/exprs/vexpr.h"
#include "vec/exprs/vexpr_context.h"
-#include "vec/functions/simple_function_factory.h"
#include "vec/utils/util.hpp"
namespace doris::vectorized {
diff --git a/be/src/vec/exec/volap_scan_node.cpp
b/be/src/vec/exec/volap_scan_node.cpp
index 953e5b7..ba9838b 100644
--- a/be/src/vec/exec/volap_scan_node.cpp
+++ b/be/src/vec/exec/volap_scan_node.cpp
@@ -221,7 +221,14 @@ void VOlapScanNode::scanner_thread(VOlapScanner* scanner) {
std::lock_guard<std::mutex> l(_free_blocks_lock);
_free_blocks.emplace_back(block);
} else {
- blocks.push_back(block);
+ if (!blocks.empty() && blocks.back()->rows() + block->rows() <=
_runtime_state->batch_size()) {
+ MutableBlock(blocks.back()).merge(*block);
+ block->clear_column_data();
+ std::lock_guard<std::mutex> l(_free_blocks_lock);
+ _free_blocks.emplace_back(block);
+ } else {
+ blocks.push_back(block);
+ }
}
raw_rows_read = scanner->raw_rows_read();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
