rebase master

Author: sxzh93

src/binder/bind_node_visitor.cpp

@@ -10,19 +10,19 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "expression/expression_util.h"
 #include "binder/bind_node_visitor.h"
-#include "expression/star_expression.h"
 #include "catalog/catalog.h"
+#include "expression/expression_util.h"
+#include "expression/star_expression.h"
 #include "type/type_id.h"
 
 #include "expression/aggregate_expression.h"
 #include "expression/case_expression.h"
 #include "expression/function_expression.h"
 #include "expression/operator_expression.h"
 #include "expression/star_expression.h"
-#include "expression/tuple_value_expression.h"
 #include "expression/subquery_expression.h"
+#include "expression/tuple_value_expression.h"
 
 namespace peloton {
 namespace binder {
@@ -155,8 +155,8 @@ void BindNodeVisitor::Visit(parser::UpdateStatement *node) {
 void BindNodeVisitor::Visit(parser::DeleteStatement *node) {
   context_ = std::make_shared<BinderContext>(nullptr);
   node->TryBindDatabaseName(default_database_name_);
-  context_->AddRegularTable(node->GetDatabaseName(), node->GetTableName(),
-                            node->GetTableName(), txn_);
+  context_->AddRegularTable(node->GetDatabaseName(), node->GetSchemaName(),
+                            node->GetTableName(), node->GetTableName(), txn_);
 
   if (node->expr != nullptr) {
     node->expr->Accept(this);
@@ -174,8 +174,8 @@ void BindNodeVisitor::Visit(parser::CreateStatement *node) {
 void BindNodeVisitor::Visit(parser::InsertStatement *node) {
   node->TryBindDatabaseName(default_database_name_);
   context_ = std::make_shared<BinderContext>(nullptr);
-  context_->AddRegularTable(node->GetDatabaseName(), node->GetTableName(),
-                            node->GetTableName(), txn_);
+  context_->AddRegularTable(node->GetDatabaseName(), node->GetSchemaName(),
+                            node->GetTableName(), node->GetTableName(), txn_);
   if (node->select != nullptr) {
     node->select->Accept(this);
   }

src/binder/binder_context.cpp

@@ -16,8 +16,8 @@
 #include "catalog/column_catalog.h"
 #include "catalog/database_catalog.h"
 #include "catalog/table_catalog.h"
-#include "parser/table_ref.h"
 #include "expression/tuple_value_expression.h"
+#include "parser/table_ref.h"
 #include "storage/storage_manager.h"
 
 namespace peloton {
@@ -28,17 +28,18 @@ void BinderContext::AddRegularTable(parser::TableRef *table_ref,
                                     concurrency::TransactionContext *txn) {
   table_ref->TryBindDatabaseName(default_database_name);
   auto table_alias = table_ref->GetTableAlias();
-  AddRegularTable(table_ref->GetDatabaseName(), table_ref->GetTableName(),
-                  table_alias, txn);
+  AddRegularTable(table_ref->GetDatabaseName(), table_ref->GetSchemaName(),
+                  table_ref->GetTableName(), table_alias, txn);
 }
 
 void BinderContext::AddRegularTable(const std::string db_name,
+                                    const std::string schema_name,
                                     const std::string table_name,
                                     const std::string table_alias,
                                     concurrency::TransactionContext *txn) {
   // using catalog object to retrieve meta-data
-  auto table_object =
-    catalog::Catalog::GetInstance()->GetTableObject(db_name, table_name, txn);
+  auto table_object = catalog::Catalog::GetInstance()->GetTableObject(
+      db_name, schema_name, table_name, txn);
 
   if (regular_table_alias_map_.find(table_alias) !=
           regular_table_alias_map_.end() ||