Skip to content

Commit c6760d5

Browse files
committed
fix(problem4):去掉对投影的限制
1 parent 133b11b commit c6760d5

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

src/optimizer/planner.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -940,9 +940,9 @@ std::shared_ptr<Plan> Planner::build_projection_plan(std::shared_ptr<Plan> plan,
940940
all_cols.push_back(col);
941941
}
942942
}
943-
if (ok) {
944-
return std::make_shared<ProjectionPlan>(PlanTag::T_Projection, std::move(plan), all_cols);
945-
}
943+
// if (ok) {
944+
// return std::make_shared<ProjectionPlan>(PlanTag::T_Projection, std::move(plan), all_cols);
945+
// }
946946
return x;
947947
} else if (auto x = std::dynamic_pointer_cast<ScanPlan>(plan)) {
948948
for (auto &cond : x->conds_) {
@@ -963,10 +963,12 @@ std::shared_ptr<Plan> Planner::build_projection_plan(std::shared_ptr<Plan> plan,
963963
all_cols.emplace_back(col);
964964
}
965965
}
966-
if (cnt != get_table_col_num(x->tab_name_)) {
967-
return std::make_shared<ProjectionPlan>(PlanTag::T_Projection, std::move(plan), all_cols);
968-
}
969-
return x;
966+
967+
return std::make_shared<ProjectionPlan>(PlanTag::T_Projection, std::move(plan), all_cols);
968+
// if (cnt != get_table_col_num(x->tab_name_)) {
969+
// return std::make_shared<ProjectionPlan>(PlanTag::T_Projection, std::move(plan), all_cols);
970+
// }
971+
// return x;
970972
} else if (auto x = std::dynamic_pointer_cast<SortPlan>(plan)) {
971973
// 添加所有排序列到需要的列中
972974
for (const auto &sort_col : x->sel_cols_) {

0 commit comments

Comments
 (0)