Skip to content
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

fix tispark query err: for PushDownFilter, conditions and executor_id should both be empty or neither should be empty #4864

Merged
merged 3 commits into from
May 11, 2022
Merged

fix tispark query err: for PushDownFilter, conditions and executor_id should both be empty or neither should be empty #4864

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
546f7c0
fix
SeaRise May 11, 2022
5d32b89
Merge branch 'master' into fix_sel_exception_from_tispark
ti-chi-bot May 11, 2022
117a7e5
Merge branch 'master' into fix_sel_exception_from_tispark
ti-chi-bot May 11, 2022
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 dbms/src/Flash/Coprocessor/DAGQueryBlockInterpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ void DAGQueryBlockInterpreter::handleMockTableScan(const TiDBTableScan & table_s

void DAGQueryBlockInterpreter::handleTableScan(const TiDBTableScan & table_scan, DAGPipeline & pipeline)
{
const auto push_down_filter = PushDownFilter::toPushDownFilter(query_block.selection);
const auto push_down_filter = PushDownFilter::toPushDownFilter(query_block.selection_name, query_block.selection);

DAGStorageInterpreter storage_interpreter(context, table_scan, push_down_filter, max_streams);
storage_interpreter.execute(pipeline);
Expand Down
8 changes: 4 additions & 4 deletions dbms/src/Flash/Coprocessor/PushDownFilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ tipb::Executor * PushDownFilter::constructSelectionForRemoteRead(tipb::Executor
}
}

PushDownFilter PushDownFilter::toPushDownFilter(const tipb::Executor * filter_executor)
PushDownFilter PushDownFilter::toPushDownFilter(const String & executor_id, const tipb::Executor * executor)
{
if (!filter_executor || !filter_executor->has_selection())
if (!executor || !executor->has_selection())
{
return {"", {}};
}

std::vector<const tipb::Expr *> conditions;
for (const auto & condition : filter_executor->selection().conditions())
for (const auto & condition : executor->selection().conditions())
conditions.push_back(&condition);

return {filter_executor->executor_id(), conditions};
return {executor_id, conditions};
}
} // namespace DB
2 changes: 1 addition & 1 deletion dbms/src/Flash/Coprocessor/PushDownFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace DB
{
struct PushDownFilter
{
static PushDownFilter toPushDownFilter(const tipb::Executor * filter_executor);
static PushDownFilter toPushDownFilter(const String & executor_id, const tipb::Executor * executor);

PushDownFilter(
const String & executor_id_,
Expand Down