Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit 0fa4b3d

Browse files
apavloapavlo
authored
Merge branch 'master' into txnctx/readonly
2 parents c8e14f6 + bf7ff62 commit 0fa4b3d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1046
-1073
lines changed

‎src/catalog/catalog.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -369,13 +369,13 @@ ResultType Catalog::CreateTable(const std::string &database_name,
369369
// Update pg_table with table info
370370
pg_table->InsertTable(table_oid, table_name, schema_name,
371371
database_object->GetDatabaseOid(),
372-
table->GetDefaultLayout()->GetOid(), pool_.get(), txn);
372+
table->GetDefaultLayout()->GetOid(), pool_.get(), txn);
373373
oid_t column_id = 0;
374374
for (const auto &column : table->GetSchema()->GetColumns()) {
375375
pg_attribute->InsertColumn(table_oid, column.GetName(), column_id,
376376
column.GetOffset(), column.GetType(),
377377
column.GetLength(), column.IsInlined(),
378-
column.GetConstraints(), pool_.get(), txn);
378+
column.GetConstraints(), pool_.get(), txn);
379379

380380
// Create index on unique single column
381381
if (column.IsUnique()) {
@@ -393,11 +393,11 @@ ResultType Catalog::CreateTable(const std::string &database_name,
393393

394394
// Create layout as default layout
395395
auto pg_layout =
396-
catalog_map_[database_object->GetDatabaseOid()]->GetLayoutCatalog();
396+
catalog_map_[database_object->GetDatabaseOid()]->GetLayoutCatalog();
397397
auto default_layout = table->GetDefaultLayout();
398398
if (!pg_layout->InsertLayout(table_oid, default_layout, pool_.get(), txn))
399399
throw CatalogException("Failed to create a new layout for table "
400-
+ table_name);
400+
+ table_name);
401401

402402
return ResultType::SUCCESS;
403403
}
@@ -594,10 +594,10 @@ std::shared_ptr<const storage::Layout> Catalog::CreateLayout(
594594
// Add the layout the pg_layout table
595595
auto pg_layout = catalog_map_[database_oid]->GetLayoutCatalog();
596596
if (pg_layout->GetLayoutWithOid(table_oid, new_layout->GetOid(), txn)
597-
== nullptr &&
598-
!pg_layout->InsertLayout(table_oid, new_layout, pool_.get(), txn)) {
599-
LOG_ERROR("Failed to create a new layout for table %u", table_oid);
600-
return nullptr;
597+
== nullptr &&
598+
!pg_layout->InsertLayout(table_oid, new_layout, pool_.get(), txn)) {
599+
LOG_ERROR("Failed to create a new layout for table %u", table_oid);
600+
return nullptr;
601601
}
602602
return new_layout;
603603
}
@@ -615,7 +615,7 @@ std::shared_ptr<const storage::Layout> Catalog::CreateDefaultLayout(
615615

616616
// update table catalog
617617
catalog_map_[database_oid]->GetTableCatalog()
618-
->UpdateDefaultLayoutOid(new_layout->GetOid(), table_oid, txn);
618+
->UpdateDefaultLayoutOid(new_layout->GetOid(), table_oid, txn);
619619
}
620620
return new_layout;
621621
}
@@ -853,16 +853,16 @@ ResultType Catalog::DropLayout(oid_t database_oid, oid_t table_oid,
853853
table->ResetDefaultLayout();
854854
auto new_default_layout = table->GetDefaultLayout();
855855
if (pg_layout->GetLayoutWithOid(table_oid, new_default_layout->GetOid(),
856-
txn) == nullptr &&
857-
!pg_layout->InsertLayout(table_oid, new_default_layout,
858-
pool_.get(), txn)) {
856+
txn) == nullptr &&
857+
!pg_layout->InsertLayout(table_oid, new_default_layout,
858+
pool_.get(), txn)) {
859859
LOG_DEBUG("Failed to create a new layout for table %d", table_oid);
860860
return ResultType::FAILURE;
861861
}
862862

863863
// update table catalog
864864
catalog_map_[database_oid]->GetTableCatalog()
865-
->UpdateDefaultLayoutOid(new_default_layout->GetOid(), table_oid, txn);
865+
->UpdateDefaultLayoutOid(new_default_layout->GetOid(), table_oid, txn);
866866
}
867867

868868
return ResultType::SUCCESS;

‎src/catalog/index_catalog.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,11 @@ bool IndexCatalog::DeleteIndex(oid_t database_oid, oid_t index_oid,
174174
values.push_back(type::ValueFactory::GetIntegerValue(index_oid).Copy());
175175

176176
auto index_object = txn->catalog_cache.GetCachedIndexObject(database_oid,
177-
index_oid);
177+
index_oid);
178178
if (index_object) {
179179
auto table_object =
180180
txn->catalog_cache.GetCachedTableObject(database_oid,
181-
index_object->GetTableOid());
181+
index_object->GetTableOid());
182182
table_object->EvictAllIndexObjects();
183183
}
184184

@@ -192,7 +192,7 @@ std::shared_ptr<IndexCatalogObject> IndexCatalog::GetIndexObject(
192192
}
193193
// try get from cache
194194
auto index_object = txn->catalog_cache.GetCachedIndexObject(database_oid,
195-
index_oid);
195+
index_oid);
196196
if (index_object) {
197197
return index_object;
198198
}
@@ -227,15 +227,15 @@ std::shared_ptr<IndexCatalogObject> IndexCatalog::GetIndexObject(
227227
}
228228

229229
std::shared_ptr<IndexCatalogObject> IndexCatalog::GetIndexObject(
230-
const std::string &database_name, const std::string &index_name,
231-
const std::string &schema_name, concurrency::TransactionContext *txn) {
230+
const std::string &database_name, const std::string &index_name,
231+
const std::string &schema_name, concurrency::TransactionContext *txn) {
232232
if (txn == nullptr) {
233233
throw CatalogException("Transaction is invalid!");
234234
}
235235
// try get from cache
236236
auto index_object =
237237
txn->catalog_cache.GetCachedIndexObject(database_name, index_name,
238-
schema_name);
238+
schema_name);
239239
if (index_object) {
240240
return index_object;
241241
}

‎src/catalog/layout_catalog.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,12 @@ LayoutCatalog::GetLayouts(oid_t table_oid,
200200

201201
column_map_type column_map;
202202
if (column_map_str.length() != 0) {
203-
column_map =
204-
storage::Layout::DeserializeColumnMap(num_columns, column_map_str);
203+
column_map =
204+
storage::Layout::DeserializeColumnMap(num_columns, column_map_str);
205205
}
206206
auto layout_object =
207207
std::make_shared<const storage::Layout>(column_map, num_columns,
208-
layout_oid);
208+
layout_oid);
209209
table_object->InsertLayout(layout_object);
210210
}
211211
}

‎src/catalog/system_catalogs.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ SystemCatalogs::SystemCatalogs(storage::Database *database,
6060
pg_attribute_->InsertColumn(shared_tables[i].second, column.GetName(),
6161
column_id, column.GetOffset(),
6262
column.GetType(), column.GetLength(),
63-
column.IsInlined(), column.GetConstraints(),
64-
pool, txn);
63+
column.IsInlined(), column.GetConstraints(),
64+
pool, txn);
6565
column_id++;
6666
}
6767
}
@@ -110,12 +110,12 @@ void SystemCatalogs::Bootstrap(const std::string &database_name,
110110

111111
// Reset oid of each catalog to avoid collisions between catalog
112112
// values added by system and users when checkpoint recovery.
113-
pg_attribute_->UpdateOid(OID_FOR_USER_OFFSET);
114-
pg_namespace_->UpdateOid(OID_FOR_USER_OFFSET);
115-
pg_table_->UpdateOid(OID_FOR_USER_OFFSET);
116-
pg_index_->UpdateOid(OID_FOR_USER_OFFSET);
117-
pg_trigger_->UpdateOid(OID_FOR_USER_OFFSET);
118-
// pg_proc->UpdateOid(OID_FOR_USER_OFFSET);
113+
pg_attribute_->UpdateOid(OID_FOR_USER_OFFSET);
114+
pg_namespace_->UpdateOid(OID_FOR_USER_OFFSET);
115+
pg_table_->UpdateOid(OID_FOR_USER_OFFSET);
116+
pg_index_->UpdateOid(OID_FOR_USER_OFFSET);
117+
pg_trigger_->UpdateOid(OID_FOR_USER_OFFSET);
118+
// pg_proc->UpdateOid(OID_FOR_USER_OFFSET);
119119
}
120120

121121
} // namespace catalog

‎src/catalog/table_catalog.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ TableCatalogObject::TableCatalogObject(executor::LogicalTile *tile,
4242
version_id(tile->GetValue(tupleId, TableCatalog::ColumnId::VERSION_ID)
4343
.GetAs<uint32_t>()),
4444
default_layout_oid(tile->GetValue(tupleId,
45-
TableCatalog::ColumnId::DEFAULT_LAYOUT_OID).GetAs<oid_t>()),
45+
TableCatalog::ColumnId::DEFAULT_LAYOUT_OID).GetAs<oid_t>()),
4646
index_objects(),
4747
index_names(),
4848
valid_index_objects(false),
4949
column_objects(),
5050
column_names(),
5151
valid_column_objects(false),
52-
valid_layout_objects_(false),
52+
valid_layout_objects_(false),
5353
txn(txn) {}
5454

5555
/* @brief insert index catalog object into cache
@@ -477,7 +477,7 @@ std::unique_ptr<catalog::Schema> TableCatalog::InitializeSchema() {
477477
bool TableCatalog::InsertTable(oid_t table_oid, const std::string &table_name,
478478
const std::string &schema_name,
479479
oid_t database_oid, oid_t layout_oid,
480-
type::AbstractPool *pool,
480+
type::AbstractPool *pool,
481481
concurrency::TransactionContext *txn) {
482482
// Create the tuple first
483483
std::unique_ptr<storage::Tuple> tuple(
@@ -514,7 +514,7 @@ bool TableCatalog::DeleteTable(oid_t table_oid,
514514

515515
// evict from cache
516516
auto table_object = txn->catalog_cache.GetCachedTableObject(database_oid,
517-
table_oid);
517+
table_oid);
518518
if (table_object) {
519519
auto database_object =
520520
DatabaseCatalog::GetInstance()->GetDatabaseObject(database_oid, txn);
@@ -536,7 +536,7 @@ std::shared_ptr<TableCatalogObject> TableCatalog::GetTableObject(
536536
}
537537
// try get from cache
538538
auto table_object = txn->catalog_cache.GetCachedTableObject(database_oid,
539-
table_oid);
539+
table_oid);
540540
if (table_object) return table_object;
541541

542542
// cache miss, get from pg_table
@@ -677,7 +677,7 @@ bool TableCatalog::UpdateVersionId(oid_t update_val, oid_t table_oid,
677677

678678
// get table object, then evict table object
679679
auto table_object = txn->catalog_cache.GetCachedTableObject(database_oid,
680-
table_oid);
680+
table_oid);
681681
if (table_object) {
682682
auto database_object =
683683
DatabaseCatalog::GetInstance()->GetDatabaseObject(database_oid, txn);
@@ -708,7 +708,7 @@ bool TableCatalog::UpdateDefaultLayoutOid(oid_t update_val, oid_t table_oid,
708708

709709
// get table object, then evict table object
710710
auto table_object = txn->catalog_cache.GetCachedTableObject(database_oid,
711-
table_oid);
711+
table_oid);
712712
if (table_object) {
713713
auto database_object =
714714
DatabaseCatalog::GetInstance()->GetDatabaseObject(database_oid, txn);

‎src/codegen/query_compiler.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ bool QueryCompiler::IsExpressionSupported(
125125
const expression::AbstractExpression &expr) {
126126
switch (expr.GetExpressionType()) {
127127
case ExpressionType::STAR:
128-
case ExpressionType::VALUE_PARAMETER:
129128
return false;
130129
default:
131130
break;

‎src/executor/drop_executor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ bool DropExecutor::DropIndex(const planner::DropPlan &node,
229229
->GetSystemCatalogs(database_object->GetDatabaseOid())
230230
->GetIndexCatalog();
231231
auto index_object = pg_index->GetIndexObject(database_object->GetDatabaseName(),
232-
index_name, schema_name, txn);
232+
index_name, schema_name, txn);
233233
if (index_object == nullptr) {
234234
throw CatalogException("Can't find index " + schema_name + "." +
235235
index_name + " to drop");

‎src/include/catalog/catalog_cache.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ class CatalogCache {
5050
const std::string &name);
5151

5252
std::shared_ptr<TableCatalogObject> GetCachedTableObject(oid_t database_oid,
53-
oid_t table_oid);
53+
oid_t table_oid);
5454
std::shared_ptr<IndexCatalogObject> GetCachedIndexObject(oid_t database_oid,
55-
oid_t index_oid);
55+
oid_t index_oid);
5656
std::shared_ptr<IndexCatalogObject> GetCachedIndexObject(
57-
const std::string &database_name, const std::string &index_name,
58-
const std::string &schema_name);
57+
const std::string &database_name, const std::string &index_name,
58+
const std::string &schema_name);
5959

6060
// database catalog cache interface
6161
bool InsertDatabaseObject(

‎src/include/catalog/column_catalog.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class ColumnCatalog : public AbstractCatalog {
8787
bool InsertColumn(oid_t table_oid, const std::string &column_name,
8888
oid_t column_id, oid_t column_offset,
8989
type::TypeId column_type, size_t column_length,
90-
bool is_inlined, const std::vector<Constraint> &constraints,
90+
bool is_inlined, const std::vector<Constraint> &constraints,
9191
type::AbstractPool *pool,
9292
concurrency::TransactionContext *txn);
9393
bool DeleteColumn(oid_t table_oid, const std::string &column_name,
@@ -109,7 +109,7 @@ class ColumnCatalog : public AbstractCatalog {
109109
COLUMN_ID = 2,
110110
COLUMN_OFFSET = 3,
111111
COLUMN_TYPE = 4,
112-
COLUMN_LENGTH = 5,
112+
COLUMN_LENGTH = 5,
113113
IS_INLINED = 6,
114114
IS_PRIMARY = 7,
115115
IS_NOT_NULL = 8,

‎src/include/catalog/index_catalog.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,17 @@ class IndexCatalog : public AbstractCatalog {
9090
type::AbstractPool *pool,
9191
concurrency::TransactionContext *txn);
9292
bool DeleteIndex(oid_t database_oid, oid_t index_oid,
93-
concurrency::TransactionContext *txn);
93+
concurrency::TransactionContext *txn);
9494

9595
/** Read Related API */
9696
std::shared_ptr<IndexCatalogObject> GetIndexObject(
97-
const std::string &database_name, const std::string &index_name,
98-
const std::string &schema_name, concurrency::TransactionContext *txn);
97+
const std::string &database_name, const std::string &index_name,
98+
const std::string &schema_name, concurrency::TransactionContext *txn);
9999

100100
private:
101101
std::shared_ptr<IndexCatalogObject> GetIndexObject(
102102
oid_t database_oid, oid_t index_oid,
103-
concurrency::TransactionContext *txn);
103+
concurrency::TransactionContext *txn);
104104

105105
const std::unordered_map<oid_t, std::shared_ptr<IndexCatalogObject>>
106106
GetIndexObjects(oid_t table_oid, concurrency::TransactionContext *txn);

0 commit comments

Comments
 (0)