More fixes for recent refactors

Author: saatviks

src/catalog/table_catalog.cpp

@@ -140,7 +140,7 @@ void TableCatalogEntry::EvictAllIndexCatalogEntries() {
  * @param is_valid
  */
 void TableCatalogEntry::SetValidIndexCatalogEntries(bool is_valid) {
-  valid_index_entries = is_valid;
+  valid_index_catalog_entries_ = is_valid;
 }
 
 /* @brief   get all index objects of this table into cache

src/include/catalog/table_catalog.h

@@ -117,7 +117,6 @@ class TableCatalogEntry {
   oid_t database_oid;
   uint32_t version_id;
   oid_t default_layout_oid;
-  bool valid_index_entries;
 
   // Insert layout catalog entry into table catalog entry
   bool InsertLayout(std::shared_ptr<const storage::Layout> layout);

src/include/planner/plan_util.h

@@ -29,6 +29,7 @@ namespace peloton {
 
 namespace catalog {
 class CatalogCache;
+class ConstraintCatalogEntry;
 }  // namespace catalog
 
 namespace parser {
@@ -60,11 +61,10 @@ class PlanUtil {
   * @param CatalogCache
   * @param SQLStatement
   * @return vector of affected index ids with triplet format
-   * TODO(saatviks): fix
   */
   static const std::vector<col_triplet> GetAffectedIndexes(
       catalog::CatalogCache &catalog_cache,
-      const parser::SQLStatement &sql_stmt, UNUSED_ATTRIBUTE const bool ignore_primary = false);
+      const parser::SQLStatement &sql_stmt, const bool ignore_primary = false);
 
   /**
   * @brief Get the columns affected by a given query
@@ -83,6 +83,9 @@ class PlanUtil {
   /// Helpers for GetInfo() and GetTablesReferenced()
   ///
 
+  static const std::set<oid_t> GetPrimaryKeyColumns(std::unordered_map<oid_t, std::shared_ptr<catalog::ConstraintCatalogEntry>>
+                                                    table_constraint_entries);
+
   static void GetInfo(const planner::AbstractPlan *plan, std::ostringstream &os,
                       int num_indent);
 

src/planner/plan_util.cpp

@@ -15,6 +15,7 @@
 #include <string>
 #include "catalog/catalog_cache.h"
 #include "catalog/column_catalog.h"
+#include "catalog/constraint_catalog.h"
 #include "catalog/database_catalog.h"
 #include "catalog/index_catalog.h"
 #include "catalog/table_catalog.h"
@@ -33,9 +34,23 @@
 namespace peloton {
 namespace planner {
 
+const std::set<oid_t> PlanUtil::GetPrimaryKeyColumns(
+    std::unordered_map<oid_t, std::shared_ptr<catalog::ConstraintCatalogEntry>>
+    table_constraint_entries) {
+  std::set<oid_t> pkey_set;
+  for(const auto &kv: table_constraint_entries) {
+    if(kv.second->GetConstraintType() == ConstraintType::PRIMARY) {
+      for(const auto& col_oid: kv.second->GetColumnIds()) {
+        pkey_set.insert(col_oid);
+      }
+    }
+  }
+  return pkey_set;
+}
+
 const std::vector<col_triplet> PlanUtil::GetAffectedIndexes(
     catalog::CatalogCache &catalog_cache, const parser::SQLStatement &sql_stmt,
-    UNUSED_ATTRIBUTE const bool ignore_primary) {
+    const bool ignore_primary) {
   std::vector<col_triplet> index_triplets;
   std::string db_name, table_name, schema_name;
   std::shared_ptr<catalog::DatabaseCatalogEntry> db_object;
@@ -73,16 +88,16 @@ const std::vector<col_triplet> PlanUtil::GetAffectedIndexes(
       for (auto &index : indexes_map) {
         bool add_index = true;
 
-        // TODO(saatviks): Find a way to check for PKey
-//        if (ignore_primary) {
-//          const auto col_oids = index.second->GetKeyAttrs();
-//          for (const auto col_oid : col_oids) {
-//            if (table_object->GetConstraintCatalogEntries()GetCGetColumnCatalogEntry(col_oid)->) {
-//              add_index = false;
-//              break;
-//            }
-//          }
-//        }
+        if (ignore_primary) {
+          auto pkey_cols_table = GetPrimaryKeyColumns(table_object->GetConstraintCatalogEntries());
+          const auto col_oids = index.second->GetKeyAttrs();
+          for (const auto col_oid : col_oids) {
+            if(pkey_cols_table.find(col_oid) != pkey_cols_table.end()) {
+              add_index = false;
+              break;
+            }
+          }
+        }
 
         if (add_index) {
           index_triplets.emplace_back(db_oid, table_oid, index.first);
@@ -96,9 +111,11 @@ const std::vector<col_triplet> PlanUtil::GetAffectedIndexes(
       db_name = update_stmt.table->GetDatabaseName();
       table_name = update_stmt.table->GetTableName();
       db_object = catalog_cache.GetDatabaseObject(db_name);
+      db_oid = db_object->GetDatabaseOid();
       schema_name = update_stmt.table->GetSchemaName();
       auto table_object = catalog_cache.GetDatabaseObject(db_name)
           ->GetTableCatalogEntry(table_name, schema_name);
+      table_oid = table_object->GetTableOid();
 
       auto &update_clauses = update_stmt.updates;
       std::set<oid_t> update_oids;
@@ -122,15 +139,16 @@ const std::vector<col_triplet> PlanUtil::GetAffectedIndexes(
                     index.second->GetIndexName().c_str());
           bool add_index = true;
 
-          // TODO(saatviks): Find a way to check for PKey
-//          if (ignore_primary) {
-//            for (const auto col_oid : key_attrs) {
-//              if (table_object->GetColumnObject(col_oid)->IsPrimary()) {
-//                add_index = false;
-//                break;
-//              }
-//            }
-//          }
+          if (ignore_primary) {
+            auto pkey_cols_table = GetPrimaryKeyColumns(table_object->GetConstraintCatalogEntries());
+            const auto col_oids = index.second->GetKeyAttrs();
+            for (const auto col_oid : col_oids) {
+              if(pkey_cols_table.find(col_oid) != pkey_cols_table.end()) {
+                add_index = false;
+                break;
+              }
+            }
+          }
 
           if (add_index) {
             index_triplets.emplace_back(db_oid, table_oid, index.first);

test/brain/compressed_idx_config_test.cpp

@@ -41,8 +41,8 @@ class CompressedIdxConfigTest : public PelotonTest {
    */
   oid_t GetTableOid(const std::string &db_name, const std::string &table_name) {
     auto txn = txn_manager_->BeginTransaction();
-    const auto table_oid = catalog_->GetDatabaseObject(db_name, txn)
-                               ->GetTableObject(table_name, DEFAULT_SCHEMA_NAME)
+    const auto table_oid = catalog_->GetDatabaseCatalogEntry(txn, db_name)
+                               ->GetTableCatalogEntry(table_name, DEFAULT_SCHEMA_NAME)
                                ->GetTableOid();
     txn_manager_->CommitTransaction(txn);
     return table_oid;

test/planner/plan_util_test.cpp

@@ -38,13 +38,8 @@ TEST_F(PlanUtilTests, GetAffectedIndexesTest) {
 
   auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
   auto txn = txn_manager.BeginTransaction();
-
-<<<<<<< HEAD
-  catalog->CreateDatabase(TEST_DB_NAME, txn);
-  auto db = catalog->GetDatabaseWithName(TEST_DB_NAME, txn);
-=======
   catalog->CreateDatabase(txn, TEST_DB_NAME);
->>>>>>> upstream/master
+  auto db = catalog->GetDatabaseWithName(txn, TEST_DB_NAME);
   // Insert a table first
   auto id_column = catalog::Column(
       type::TypeId::INTEGER, type::Type::GetTypeSize(type::TypeId::INTEGER),
@@ -73,13 +68,9 @@ TEST_F(PlanUtilTests, GetAffectedIndexesTest) {
   txn_manager.CommitTransaction(txn);
 
   txn = txn_manager.BeginTransaction();
-<<<<<<< HEAD
   oid_t db_oid = db->GetOid();
   oid_t table_oid = source_table->GetOid();
-  oid_t col_id = source_table->GetSchema()->GetColumnID(id_column.column_name);
-=======
   oid_t col_id = source_table->GetSchema()->GetColumnID(id_column.GetName());
->>>>>>> upstream/master
   std::vector<oid_t> source_col_ids;
   source_col_ids.push_back(col_id);
 
@@ -215,18 +206,10 @@ TEST_F(PlanUtilTests, GetIndexableColumnsTest) {
   auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
 
   auto txn = txn_manager.BeginTransaction();
-<<<<<<< HEAD
-  catalog->CreateDatabase(TEST_DB_COLUMNS, txn);
-  auto db_object = catalog->GetDatabaseObject(TEST_DB_COLUMNS, txn);
-  oid_t database_id = db_object->GetDatabaseOid();
-  int table_count = db_object->GetTableObjects().size();
-=======
   catalog->CreateDatabase(txn, TEST_DB_COLUMNS);
-  auto db = catalog->GetDatabaseWithName(txn, TEST_DB_COLUMNS);
-  oid_t database_id = db->GetOid();
   auto db_object = catalog->GetDatabaseCatalogEntry(txn, TEST_DB_COLUMNS);
+  oid_t database_id = db_object->GetDatabaseOid();
   int table_count = db_object->GetTableCatalogEntries().size();
->>>>>>> upstream/master
   txn_manager.CommitTransaction(txn);
 
   // Insert a 'test_table' with 'id', 'first_name' and 'last_name'
@@ -252,16 +235,10 @@ TEST_F(PlanUtilTests, GetIndexableColumnsTest) {
 
   // Obtain ids for the table and columns
   txn = txn_manager.BeginTransaction();
-<<<<<<< HEAD
-
-  auto source_table = catalog->GetTableWithName(
-      TEST_DB_COLUMNS, DEFAULT_SCHEMA_NAME, "test_table", txn);
-=======
   auto source_table = catalog->GetTableWithName(txn,
                                                 TEST_DB_COLUMNS,
                                                 DEFAULT_SCHEMA_NAME,
                                                 "test_table");
->>>>>>> upstream/master
   txn_manager.CommitTransaction(txn);
 
   oid_t table_id = source_table->GetOid();