This repository has been archived by the owner on Sep 27, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 623
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Added layout.h. Modified Runtime functions to handle row stores. * Modify TileGroup api * Changed Updater & Inserter to use Layout object * Remove calls from optimizer and executor * Removed all calls to schemas vector from TileGroup * Removed Calls to LocateTileAndColumn for TileGroup * Moved definition of column_map_type. Removed column_map from tile_group * Added GetInfo function * make check pases. Need to change a few more function calls * Convert PL_ASSERT -> PELOTON_ASSERT * Modified DataTable and LayoutTunerTest * Added Layout Test for codegen * Get the tests to actually use different layouts * Modified storage layer, builds successfully. Need to fix tests * Moved GetColumnMapStats -> GetColumnLayoutStats * Minor change in TableScanTranslator * Modify TransformTileGroup * Change layout.cpp to better handle HYBRID layouts * use std::make_shared * Modified tests to change calls to GetTileGroup() * make check passes. Need to add test with hybrid layout. * Modify print functions * Add TODOs for catalog * Added LayoutCatalog. Yet to modify TableCatalog * Added catalog functions * Added DeleteLayouts to delete all layouts of a table_oid * LayoutTunerTest fixed * Fix build failures * Access LayoutCatalog via the global Catalog object * Added Multi layout scan test * Fixed tests after catalog refactor * Failing LayoutCatalog test because of deserialization * Fix all tests * Added documentation * Style Fix * Address review comments + minor clean-up in the layout.h API * Change valid_layout_objects_ * Revert unused changes * Addressed Prashanth's initial comments * Modify CreateTable for tests + modify LayoutTuner * Address Pervaze's review comments. * Changed after Prashanth's review
- Loading branch information
1 parent
d052644
commit 5686479
Showing
76 changed files
with
2,104 additions
and
597 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,229 @@ | ||
| //===----------------------------------------------------------------------===// | ||
| // | ||
| // Peloton | ||
| // | ||
| // layout_catalog.cpp | ||
| // | ||
| // Identification: src/catalog/layout_catalog.cpp | ||
| // | ||
| // Copyright (c) 2015-2018, Carnegie Mellon University Database Group | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| #include "catalog/layout_catalog.h" | ||
|
|
||
| #include "catalog/catalog.h" | ||
| #include "catalog/system_catalogs.h" | ||
| #include "concurrency/transaction_context.h" | ||
| #include "executor/logical_tile.h" | ||
| #include "storage/data_table.h" | ||
| #include "storage/layout.h" | ||
|
|
||
| namespace peloton { | ||
| namespace catalog { | ||
|
|
||
| /** @brief Constructor invoked by the SystemsCatalog constructor. | ||
| * @param pg_catalog The database to which this pg_layout belongs. | ||
| */ | ||
| LayoutCatalog::LayoutCatalog( | ||
| storage::Database *pg_catalog, UNUSED_ATTRIBUTE type::AbstractPool *pool, | ||
| UNUSED_ATTRIBUTE concurrency::TransactionContext *txn) | ||
| : AbstractCatalog(LAYOUT_CATALOG_OID, LAYOUT_CATALOG_NAME, | ||
| InitializeSchema().release(), pg_catalog) { | ||
| // Add indexes for pg_attribute | ||
| AddIndex({ColumnId::TABLE_OID, ColumnId::LAYOUT_OID}, LAYOUT_CATALOG_PKEY_OID, | ||
| LAYOUT_CATALOG_NAME "_pkey", IndexConstraintType::PRIMARY_KEY); | ||
| AddIndex({ColumnId::TABLE_OID}, LAYOUT_CATALOG_SKEY0_OID, | ||
| LAYOUT_CATALOG_NAME "_skey0", IndexConstraintType::DEFAULT); | ||
| } | ||
| /** @brief Destructor. Do nothing. Layouts will be dropped by DropTable. */ | ||
| LayoutCatalog::~LayoutCatalog() {} | ||
|
|
||
| /** @brief Initilailizes the schema for the pg_layout table. | ||
| * @return unique_ptr of the schema for pg_layout. | ||
| */ | ||
| std::unique_ptr<catalog::Schema> LayoutCatalog::InitializeSchema() { | ||
| const std::string primary_key_constraint_name = "primary_key"; | ||
| const std::string not_null_constraint_name = "not_null"; | ||
|
|
||
| auto table_id_column = catalog::Column( | ||
| type::TypeId::INTEGER, type::Type::GetTypeSize(type::TypeId::INTEGER), | ||
| "table_oid", true); | ||
| table_id_column.AddConstraint(catalog::Constraint( | ||
| ConstraintType::PRIMARY, primary_key_constraint_name)); | ||
| table_id_column.AddConstraint( | ||
| catalog::Constraint(ConstraintType::NOTNULL, not_null_constraint_name)); | ||
|
|
||
| auto layout_oid_column = catalog::Column( | ||
| type::TypeId::INTEGER, type::Type::GetTypeSize(type::TypeId::INTEGER), | ||
| "layout_oid", true); | ||
| layout_oid_column.AddConstraint(catalog::Constraint( | ||
| ConstraintType::PRIMARY, primary_key_constraint_name)); | ||
| layout_oid_column.AddConstraint( | ||
| catalog::Constraint(ConstraintType::NOTNULL, not_null_constraint_name)); | ||
|
|
||
| auto num_columns_column = catalog::Column( | ||
| type::TypeId::INTEGER, type::Type::GetTypeSize(type::TypeId::INTEGER), | ||
| "num_columns", true); | ||
| num_columns_column.AddConstraint( | ||
| catalog::Constraint(ConstraintType::NOTNULL, not_null_constraint_name)); | ||
|
|
||
| auto column_map_column = catalog::Column( | ||
| type::TypeId::VARCHAR, type::Type::GetTypeSize(type::TypeId::VARCHAR), | ||
| "column_map", false); | ||
| column_map_column.AddConstraint( | ||
| catalog::Constraint(ConstraintType::NOTNULL, not_null_constraint_name)); | ||
|
|
||
| std::unique_ptr<catalog::Schema> column_catalog_schema( | ||
| new catalog::Schema({table_id_column, layout_oid_column, | ||
| num_columns_column, column_map_column})); | ||
|
|
||
| return column_catalog_schema; | ||
| } | ||
|
|
||
| /** @brief Insert a layout into the pg_layout table. | ||
| * @param table_oid oid of the table to which the new layout belongs. | ||
| * @param layout layout to be added to the pg_layout table. | ||
| * @param pool to allocate memory for the column_map column. | ||
| * @param txn TransactionContext for adding the layout. | ||
| * @return true on success. | ||
| */ | ||
| bool LayoutCatalog::InsertLayout(oid_t table_oid, | ||
| std::shared_ptr<const storage::Layout> layout, | ||
| type::AbstractPool *pool, | ||
| concurrency::TransactionContext *txn) { | ||
| // Create the tuple first | ||
| std::unique_ptr<storage::Tuple> tuple( | ||
| new storage::Tuple(catalog_table_->GetSchema(), true)); | ||
|
|
||
| auto val0 = type::ValueFactory::GetIntegerValue(table_oid); | ||
| auto val1 = type::ValueFactory::GetIntegerValue(layout->GetOid()); | ||
| auto val2 = type::ValueFactory::GetIntegerValue(layout->GetColumnCount()); | ||
| auto val3 = type::ValueFactory::GetVarcharValue(layout->SerializeColumnMap(), | ||
| nullptr); | ||
|
|
||
| tuple->SetValue(LayoutCatalog::ColumnId::TABLE_OID, val0, pool); | ||
| tuple->SetValue(LayoutCatalog::ColumnId::LAYOUT_OID, val1, pool); | ||
| tuple->SetValue(LayoutCatalog::ColumnId::NUM_COLUMNS, val2, pool); | ||
| tuple->SetValue(LayoutCatalog::ColumnId::COLUMN_MAP, val3, pool); | ||
|
|
||
| // Insert the tuple | ||
| return InsertTuple(std::move(tuple), txn); | ||
| } | ||
|
|
||
| /** @brief Delete a layout from the pg_layout table. | ||
| * @param table_oid oid of the table to which the old layout belongs. | ||
| * @param layout_oid oid of the layout to be deleted. | ||
| * @param txn TransactionContext for deleting the layout. | ||
| * @return true on success. | ||
| */ | ||
| bool LayoutCatalog::DeleteLayout(oid_t table_oid, oid_t layout_oid, | ||
| concurrency::TransactionContext *txn) { | ||
| oid_t index_offset = IndexId::PRIMARY_KEY; // Index of table_oid & layout_oid | ||
|
|
||
| std::vector<type::Value> values; | ||
| values.push_back(type::ValueFactory::GetIntegerValue(table_oid).Copy()); | ||
| values.push_back(type::ValueFactory::GetIntegerValue(layout_oid).Copy()); | ||
|
|
||
| auto pg_table = Catalog::GetInstance() | ||
| ->GetSystemCatalogs(database_oid) | ||
| ->GetTableCatalog(); | ||
|
|
||
| // delete column from cache | ||
| auto table_object = pg_table->GetTableObject(table_oid, txn); | ||
| table_object->EvictLayout(layout_oid); | ||
|
|
||
| return DeleteWithIndexScan(index_offset, values, txn); | ||
| } | ||
|
|
||
| /** @brief Delete all layouts correponding to a table from the pg_layout. | ||
| * @param table_oid oid of the table to delete all layouts. | ||
| * @param txn TransactionContext for deleting the layouts. | ||
| * @return true on success. | ||
| */ | ||
| bool LayoutCatalog::DeleteLayouts(oid_t table_oid, | ||
| concurrency::TransactionContext *txn) { | ||
| oid_t index_offset = IndexId::SKEY_TABLE_OID; // Index of table_oid | ||
| std::vector<type::Value> values; | ||
| values.push_back(type::ValueFactory::GetIntegerValue(table_oid).Copy()); | ||
|
|
||
| // delete layouts from cache | ||
| auto pg_table = Catalog::GetInstance() | ||
| ->GetSystemCatalogs(database_oid) | ||
| ->GetTableCatalog(); | ||
| auto table_object = pg_table->GetTableObject(table_oid, txn); | ||
| table_object->EvictAllLayouts(); | ||
|
|
||
| return DeleteWithIndexScan(index_offset, values, txn); | ||
| } | ||
|
|
||
| /** @brief Get all layouts correponding to a table from the pg_layout. | ||
| * @param table_oid oid of the table to fetch all layouts. | ||
| * @param txn TransactionContext for getting the layouts. | ||
| * @return unordered_map containing a layout_oid -> layout mapping. | ||
| */ | ||
| const std::unordered_map<oid_t, std::shared_ptr<const storage::Layout>> | ||
| LayoutCatalog::GetLayouts(oid_t table_oid, | ||
| concurrency::TransactionContext *txn) { | ||
| // Try to find the layouts in the cache | ||
| auto pg_table = Catalog::GetInstance() | ||
| ->GetSystemCatalogs(database_oid) | ||
| ->GetTableCatalog(); | ||
| auto table_object = pg_table->GetTableObject(table_oid, txn); | ||
| PELOTON_ASSERT(table_object && table_object->GetTableOid() == table_oid); | ||
| auto layout_objects = table_object->GetLayouts(true); | ||
| if (layout_objects.size() != 0) { | ||
| return layout_objects; | ||
| } | ||
|
|
||
| // Cache miss, get from pg_catalog | ||
| std::vector<oid_t> column_ids(all_column_ids); | ||
| oid_t index_offset = IndexId::SKEY_TABLE_OID; // Index of table_oid | ||
| std::vector<type::Value> values; | ||
| values.push_back(type::ValueFactory::GetIntegerValue(table_oid).Copy()); | ||
|
|
||
| auto result_tiles = | ||
| GetResultWithIndexScan(column_ids, index_offset, values, txn); | ||
|
|
||
| for (auto &tile : (*result_tiles)) { // Iterate through the result_tiles | ||
| for (auto tuple_id : *tile) { | ||
| oid_t layout_oid = | ||
| tile->GetValue(tuple_id, LayoutCatalog::ColumnId::LAYOUT_OID) | ||
| .GetAs<oid_t>(); | ||
| oid_t num_columns = | ||
| tile->GetValue(tuple_id, LayoutCatalog::ColumnId::NUM_COLUMNS) | ||
| .GetAs<oid_t>(); | ||
| std::string column_map_str = | ||
| tile->GetValue(tuple_id, LayoutCatalog::ColumnId::COLUMN_MAP) | ||
| .ToString(); | ||
| auto column_map = | ||
| storage::Layout::DeserializeColumnMap(num_columns, column_map_str); | ||
| auto layout_object = | ||
| std::make_shared<const storage::Layout>(column_map, layout_oid); | ||
| table_object->InsertLayout(layout_object); | ||
| } | ||
| } | ||
|
|
||
| return table_object->GetLayouts(); | ||
| } | ||
|
|
||
| /** @brief Get the layout by layout_oid from the pg_layout. | ||
| * @param table_oid oid of the table to fetch the layout. | ||
| * @param layout_oid oid of the layout being queried. | ||
| * @param txn TransactionContext for getting the layout. | ||
| * @return shared_ptr corresponding to the layout_oid if found. | ||
| * nullptr otherwise. | ||
| */ | ||
| std::shared_ptr<const storage::Layout> LayoutCatalog::GetLayoutWithOid( | ||
| oid_t table_oid, oid_t layout_oid, concurrency::TransactionContext *txn) { | ||
| auto table_layouts = GetLayouts(table_oid, txn); | ||
| for (const auto &layout_entry : table_layouts) { | ||
| if (layout_entry.second->GetOid() == layout_oid) { | ||
| return layout_entry.second; | ||
| } | ||
| } | ||
| return nullptr; | ||
| } | ||
|
|
||
| } // namespace catalog | ||
| } // namespace peloton |
Oops, something went wrong.