@@ -670,7 +670,7 @@ QueryResult QueryExecutor::execute_update(const parser::UpdateStatement& stmt,
670670 if (log_manager_ != nullptr && txn != nullptr ) {
671671 recovery::LogRecord log (txn->get_id (), txn->get_prev_lsn (),
672672 recovery::LogRecordType::MARK_DELETE, table_name, op.rid ,
673- op. old_tuple );
673+ old_tuple);
674674 const auto lsn = log_manager_->append_log_record (log);
675675 txn->set_prev_lsn (lsn);
676676 }
@@ -724,12 +724,12 @@ std::unique_ptr<Operator> QueryExecutor::build_plan(const parser::SelectStatemen
724724 if (cluster_manager_ != nullptr &&
725725 cluster_manager_->has_shuffle_data (context_id_, base_table_name)) {
726726 auto data = cluster_manager_->fetch_shuffle_data (context_id_, base_table_name);
727- /* We need a schema for the buffered data. */
727+ /* We need a schema for the buffered data. Use unqualified names as BufferScan will qualify them. */
728728 auto meta_opt = catalog_.get_table_by_name (base_table_name);
729729 Schema buffer_schema;
730730 if (meta_opt.has_value ()) {
731731 for (const auto & col : meta_opt.value ()->columns ) {
732- buffer_schema.add_column (base_table_name + " . " + col.name , col.type );
732+ buffer_schema.add_column (col.name , col.type );
733733 }
734734 }
735735 std::cerr << " --- [BuildPlan] Table " << base_table_name
@@ -746,7 +746,7 @@ std::unique_ptr<Operator> QueryExecutor::build_plan(const parser::SelectStatemen
746746
747747 Schema base_schema;
748748 for (const auto & col : base_table_meta->columns ) {
749- base_schema.add_column (base_table_name + " . " + col.name , col.type );
749+ base_schema.add_column (col.name , col.type );
750750 }
751751
752752 /* Index Selection Optimization:
@@ -825,7 +825,7 @@ std::unique_ptr<Operator> QueryExecutor::build_plan(const parser::SelectStatemen
825825 Schema buffer_schema;
826826 if (meta_opt.has_value ()) {
827827 for (const auto & col : meta_opt.value ()->columns ) {
828- buffer_schema.add_column (join_table_name + " . " + col.name , col.type );
828+ buffer_schema.add_column (col.name , col.type );
829829 }
830830 }
831831 std::cerr << " --- [BuildPlan] JOIN Table " << join_table_name
@@ -842,7 +842,7 @@ std::unique_ptr<Operator> QueryExecutor::build_plan(const parser::SelectStatemen
842842
843843 Schema join_schema;
844844 for (const auto & col : join_table_meta->columns ) {
845- join_schema.add_column (join_table_name + " . " + col.name , col.type );
845+ join_schema.add_column (col.name , col.type );
846846 }
847847
848848 join_scan = std::make_unique<SeqScanOperator>(
0 commit comments