|
15 | 15 | #include <utility>
|
16 | 16 |
|
17 | 17 | #include "binder/bind_node_visitor.h"
|
| 18 | +#include "common/internal_types.h" |
18 | 19 | #include "concurrency/transaction_context.h"
|
19 | 20 | #include "concurrency/transaction_manager_factory.h"
|
20 |
| -#include "common/internal_types.h" |
21 | 21 | #include "expression/expression_util.h"
|
22 | 22 | #include "optimizer/optimizer.h"
|
23 | 23 | #include "planner/plan_util.h"
|
@@ -355,8 +355,8 @@ void TrafficCop::ProcessInvalidStatement() {
|
355 | 355 | }
|
356 | 356 |
|
357 | 357 | bool TrafficCop::BindParamsForCachePlan(
|
358 |
| - const std::vector<std::unique_ptr<expression::AbstractExpression>> & |
359 |
| - parameters, |
| 358 | + const std::vector<std::unique_ptr<expression::AbstractExpression>> |
| 359 | + ¶meters, |
360 | 360 | std::string &error_message, const size_t thread_id UNUSED_ATTRIBUTE) {
|
361 | 361 | if (tcop_txn_state_.empty()) {
|
362 | 362 | single_statement_txn_ = true;
|
@@ -572,14 +572,15 @@ ResultType TrafficCop::ExecuteStatement(
|
572 | 572 | if (statement->GetNeedsReplan()) {
|
573 | 573 | // TODO(Tianyi) Move Statement Replan into Statement's method
|
574 | 574 | // to increase coherence
|
575 |
| - auto plan = |
576 |
| - optimizer_->BuildPelotonPlanTree(statement->GetStmtParseTreeList(), default_database_name_, tcop_txn_state_.top().first); |
| 575 | + auto plan = optimizer_->BuildPelotonPlanTree( |
| 576 | + statement->GetStmtParseTreeList(), default_database_name_, |
| 577 | + tcop_txn_state_.top().first); |
577 | 578 | statement->SetPlanTree(plan);
|
578 | 579 | statement->SetNeedsReplan(true);
|
579 | 580 | }
|
580 |
| - |
581 |
| - ExecuteHelper(statement->GetPlanTree(), params, result, |
582 |
| - result_format, thread_id); |
| 581 | + |
| 582 | + ExecuteHelper(statement->GetPlanTree(), params, result, result_format, |
| 583 | + thread_id); |
583 | 584 | if (GetQueuing()) {
|
584 | 585 | return ResultType::QUEUING;
|
585 | 586 | } else {
|
|
0 commit comments