resolve conflicts

Author: mengranwo

src/catalog/abstract_catalog.cpp

@@ -12,10 +12,9 @@
 
 #include "catalog/abstract_catalog.h"
 
-#include "binder/bind_node_visitor.h"
-
 #include "common/statement.h"
 
+#include "catalog/catalog.h"
 #include "catalog/database_catalog.h"
 #include "catalog/table_catalog.h"
 
@@ -59,25 +58,11 @@ AbstractCatalog::AbstractCatalog(oid_t catalog_table_oid,
 
 AbstractCatalog::AbstractCatalog(const std::string &catalog_table_ddl,
                                  concurrency::TransactionContext *txn) {
-  // Get catalog table schema
+  // get catalog table schema
   auto &peloton_parser = parser::PostgresParser::GetInstance();
-
-  // Build the parse tree
-  const auto parse_tree_list = peloton_parser.BuildParseTree(catalog_table_ddl);
-  if (parse_tree_list->GetStatements().empty()) {
-    throw CatalogException(
-        "Parse tree list has no parse trees. Cannot build plan");
-  }
-  // TODO: support multi-statement queries
-  auto parse_tree = parse_tree_list->GetStatement(0);
-
-  // Run binder
-  auto bind_node_visitor = binder::BindNodeVisitor(txn, DATABASE_CATALOG_NAME);
-  bind_node_visitor.BindNameToNode(parse_tree);
-
-  // Create the plan tree
   auto create_plan = std::dynamic_pointer_cast<planner::CreatePlan>(
-      optimizer::Optimizer().BuildPelotonPlanTree(parse_tree_list, txn));
+      optimizer::Optimizer().BuildPelotonPlanTree(
+          peloton_parser.BuildParseTree(catalog_table_ddl), txn));
   auto catalog_table_schema = create_plan->GetSchema();
   auto catalog_table_name = create_plan->GetTableName();
   auto catalog_schema_name = create_plan->GetSchemaName();
@@ -88,15 +73,17 @@ AbstractCatalog::AbstractCatalog(const std::string &catalog_table_ddl,
       catalog_database_name, catalog_schema_name, catalog_table_name,
       std::unique_ptr<catalog::Schema>(catalog_table_schema), txn, true);
 
-  // Get catalog table oid
+  // get catalog table oid
   auto catalog_table_object = Catalog::GetInstance()->GetTableObject(
       catalog_database_name, catalog_schema_name, catalog_table_name, txn);
 
-  // Set catalog_table_
+  // set catalog_table_
   try {
     catalog_table_ = storage::StorageManager::GetInstance()->GetTableWithOid(
         catalog_table_object->GetDatabaseOid(),
         catalog_table_object->GetTableOid());
+    // set database_oid
+    database_oid = catalog_table_object->GetDatabaseOid();
   } catch (CatalogException &e) {
     LOG_TRACE("Can't find table %d! Return false",
               catalog_table_object->GetTableOid());
@@ -336,7 +323,8 @@ bool AbstractCatalog::UpdateWithIndexScan(
   std::vector<expression::AbstractExpression *> runtime_keys;
 
   planner::IndexScanPlan::IndexScanDesc index_scan_desc(
-      index, key_column_offsets, expr_types, scan_values, runtime_keys);
+      index->GetOid(), key_column_offsets, expr_types, scan_values,
+      runtime_keys);
 
   planner::IndexScanPlan index_scan_node(catalog_table_, nullptr,
                                          update_columns, index_scan_desc);

src/catalog/query_metrics_catalog.cpp

@@ -99,8 +99,7 @@ bool QueryMetricsCatalog::InsertQueryMetrics(
 }
 
 bool QueryMetricsCatalog::DeleteQueryMetrics(
-    const std::string &name, oid_t database_oid,
-    concurrency::TransactionContext *txn) {
+    const std::string &name, concurrency::TransactionContext *txn) {
   oid_t index_offset = IndexId::PRIMARY_KEY;  // Primary key index
 
   std::vector<type::Value> values;
@@ -116,6 +115,7 @@ stats::QueryMetric::QueryParamBuf QueryMetricsCatalog::GetParamTypes(
   oid_t index_offset = IndexId::PRIMARY_KEY;               // Primary key index
   std::vector<type::Value> values;
   values.push_back(type::ValueFactory::GetVarcharValue(name, nullptr).Copy());
+  values.push_back(type::ValueFactory::GetIntegerValue(database_oid).Copy());
 
   auto result_tiles =
       GetResultWithIndexScan(column_ids, index_offset, values, txn);

src/codegen/operator/table_scan_translator.cpp

@@ -14,9 +14,9 @@
 
 #include "codegen/lang/if.h"
 #include "codegen/proxy/executor_context_proxy.h"
+#include "codegen/proxy/runtime_functions_proxy.h"
 #include "codegen/proxy/storage_manager_proxy.h"
 #include "codegen/proxy/transaction_runtime_proxy.h"
-#include "codegen/proxy/runtime_functions_proxy.h"
 #include "codegen/proxy/zone_map_proxy.h"
 #include "codegen/type/boolean_type.h"
 #include "planner/seq_scan_plan.h"
@@ -50,7 +50,7 @@ TableScanTranslator::TableScanTranslator(const planner::SeqScanPlan &scan,
       pipeline.InstallBoundaryAtOutput(this);
     }
   }
-  LOG_DEBUG("Finished constructing TableScanTranslator ...");
+  LOG_TRACE("Finished constructing TableScanTranslator ...");
 }
 
 // Produce!
@@ -135,8 +135,12 @@ void TableScanTranslator::ScanConsumer::ProcessTuples(
   }
 
   // 3. Setup the (filtered) row batch and setup attribute accessors
-  RowBatch batch{translator_.GetCompilationContext(), tile_group_id_, tid_start,
-                 tid_end, selection_vector_, true};
+  RowBatch batch{translator_.GetCompilationContext(),
+                 tile_group_id_,
+                 tid_start,
+                 tid_end,
+                 selection_vector_,
+                 true};
 
   std::vector<TableScanTranslator::AttributeAccess> attribute_accesses;
   SetupRowBatch(batch, tile_group_access, attribute_accesses);
@@ -227,7 +231,8 @@ void TableScanTranslator::ScanConsumer::FilterRowsByPredicate(
     codegen::Value valid_row = row.DeriveValue(codegen, *predicate);
 
     // Reify the boolean value since it may be NULL
-    PELOTON_ASSERT(valid_row.GetType().GetSqlType() == type::Boolean::Instance());
+    PELOTON_ASSERT(valid_row.GetType().GetSqlType() ==
+                   type::Boolean::Instance());
     llvm::Value *bool_val = type::Boolean::Instance().Reify(codegen, valid_row);
 
     // Set the validity of the row

src/include/catalog/query_metrics_catalog.h

@@ -59,7 +59,7 @@ class QueryMetricsCatalog : public AbstractCatalog {
                           int64_t inserts, int64_t latency, int64_t cpu_time,
                           int64_t time_stamp, type::AbstractPool *pool,
                           concurrency::TransactionContext *txn);
-  bool DeleteQueryMetrics(const std::string &name, oid_t database_oid,
+  bool DeleteQueryMetrics(const std::string &name,
                           concurrency::TransactionContext *txn);
 
   //===--------------------------------------------------------------------===//

src/include/planner/seq_scan_plan.h

@@ -17,10 +17,10 @@
 #include <vector>
 
 #include "abstract_scan_plan.h"
+#include "common/internal_types.h"
 #include "common/logger.h"
 #include "expression/abstract_expression.h"
 #include "type/serializer.h"
-#include "common/internal_types.h"
 
 namespace peloton {
 

test/catalog/catalog_test.cpp

@@ -100,8 +100,9 @@ TEST_F(CatalogTests, CreatingTable) {
   catalog::Catalog::GetInstance()
       ->GetSystemCatalogs(database_object->GetDatabaseOid())
       ->GetQueryMetricsCatalog()
-      ->InsertQueryMetrics("a query", 1, param, param, param, 1, 1, 1, 1, 1, 1,
-                           1, pool.get(), txn);
+      ->InsertQueryMetrics("a query", database_object->GetDatabaseOid(), 1,
+                           param, param, param, 1, 1, 1, 1, 1, 1, 1, pool.get(),
+                           txn);
   auto param1 = catalog::Catalog::GetInstance()
                     ->GetSystemCatalogs(database_object->GetDatabaseOid())
                     ->GetQueryMetricsCatalog()

test/statistics/testing_stats_util.cpp

@@ -137,7 +137,7 @@ std::shared_ptr<Statement> TestingStatsUtil::GetInsertStmt(int id,
                                                            std::string val) {
   std::shared_ptr<Statement> statement;
   std::string sql =
-      "INSERT INTO department_table(dept_id,dept_name) VALUES "
+      "INSERT INTO emp_db.public.department_table(dept_id,dept_name) VALUES "
       "(" +
       std::to_string(id) + ",'" + val + "');";
   LOG_TRACE("Query: %s", sql.c_str());
@@ -148,7 +148,7 @@ std::shared_ptr<Statement> TestingStatsUtil::GetInsertStmt(int id,
 
 std::shared_ptr<Statement> TestingStatsUtil::GetDeleteStmt() {
   std::shared_ptr<Statement> statement;
-  std::string sql = "DELETE FROM department_table";
+  std::string sql = "DELETE FROM emp_db.public.department_table";
   LOG_INFO("Query: %s", sql.c_str());
   statement.reset(new Statement("DELETE", sql));
   ParseAndPlan(statement.get(), sql);
@@ -158,7 +158,8 @@ std::shared_ptr<Statement> TestingStatsUtil::GetDeleteStmt() {
 std::shared_ptr<Statement> TestingStatsUtil::GetUpdateStmt() {
   std::shared_ptr<Statement> statement;
   std::string sql =
-      "UPDATE department_table SET dept_name = 'CS' WHERE dept_id = 1";
+      "UPDATE emp_db.public.department_table SET dept_name = 'CS' WHERE "
+      "dept_id = 1";
   LOG_INFO("Query: %s", sql.c_str());
   statement.reset(new Statement("UPDATE", sql));
   ParseAndPlan(statement.get(), sql);