Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion be/src/exec/olap_scan_node.h
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ class OlapScanNode : public ScanNode {
// push down bloom filters to storage engine.
// 1. std::pair.first :: column name
// 2. std::pair.second :: shared_ptr of BloomFilterFuncBase
std::vector<std::pair<std::string, std::shared_ptr<IBloomFilterFuncBase>>>
std::vector<std::pair<std::string, std::shared_ptr<BloomFilterFuncBase>>>
_bloom_filters_push_down;

// push down functions to storage engine
Expand Down
4 changes: 2 additions & 2 deletions be/src/exec/olap_scanner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ OlapScanner::OlapScanner(RuntimeState* runtime_state, OlapScanNode* parent, bool
Status OlapScanner::prepare(
const TPaloScanRange& scan_range, const std::vector<OlapScanRange*>& key_ranges,
const std::vector<TCondition>& filters,
const std::vector<std::pair<string, std::shared_ptr<IBloomFilterFuncBase>>>& bloom_filters,
const std::vector<std::pair<string, std::shared_ptr<BloomFilterFuncBase>>>& bloom_filters,
const std::vector<FunctionFilter>& function_filters) {
SCOPED_CONSUME_MEM_TRACKER(_mem_tracker);
set_tablet_reader();
Expand Down Expand Up @@ -165,7 +165,7 @@ Status OlapScanner::open() {
// it will be called under tablet read lock because capture rs readers need
Status OlapScanner::_init_tablet_reader_params(
const std::vector<OlapScanRange*>& key_ranges, const std::vector<TCondition>& filters,
const std::vector<std::pair<string, std::shared_ptr<IBloomFilterFuncBase>>>& bloom_filters,
const std::vector<std::pair<string, std::shared_ptr<BloomFilterFuncBase>>>& bloom_filters,
const std::vector<FunctionFilter>& function_filters) {
// if the table with rowset [0-x] or [0-1] [2-y], and [0-1] is empty
bool single_version =
Expand Down
4 changes: 2 additions & 2 deletions be/src/exec/olap_scanner.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class OlapScanner {

Status prepare(const TPaloScanRange& scan_range, const std::vector<OlapScanRange*>& key_ranges,
const std::vector<TCondition>& filters,
const std::vector<std::pair<std::string, std::shared_ptr<IBloomFilterFuncBase>>>&
const std::vector<std::pair<std::string, std::shared_ptr<BloomFilterFuncBase>>>&
bloom_filters,
const std::vector<FunctionFilter>& function_filters);

Expand Down Expand Up @@ -95,7 +95,7 @@ class OlapScanner {
protected:
Status _init_tablet_reader_params(
const std::vector<OlapScanRange*>& key_ranges, const std::vector<TCondition>& filters,
const std::vector<std::pair<string, std::shared_ptr<IBloomFilterFuncBase>>>&
const std::vector<std::pair<string, std::shared_ptr<BloomFilterFuncBase>>>&
bloom_filters,
const std::vector<FunctionFilter>& function_filters);
Status _init_return_columns(bool need_seq_col);
Expand Down
4 changes: 2 additions & 2 deletions be/src/exprs/bloomfilter_predicate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ BloomFilterPredicate::BloomFilterPredicate(const BloomFilterPredicate& other)
_scan_rows() {}

Status BloomFilterPredicate::prepare(RuntimeState* state,
std::shared_ptr<IBloomFilterFuncBase> filter) {
std::shared_ptr<BloomFilterFuncBase> filter) {
// DCHECK(filter != nullptr);
if (_is_prepare) {
return Status::OK();
}
_filter = filter;
if (nullptr == _filter.get()) {
if (nullptr == _filter) {
return Status::InternalError("Unknown column type.");
}
_is_prepare = true;
Expand Down
Loading