Skip to content

Commit e76ca62

Browse files
poyrazKgithub-actions[bot]
authored andcommitted
style: automated clang-format fixes
1 parent a7106ec commit e76ca62

2 files changed

Lines changed: 16 additions & 9 deletions

File tree

src/executor/query_executor.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,8 @@ QueryResult QueryExecutor::execute_delete(const parser::DeleteStatement& stmt,
544544
uint16_t pos = idx_info.column_positions[0];
545545
common::ValueType ktype = table_meta->columns[pos].type;
546546
storage::BTreeIndex index(idx_info.name, bpm_, ktype);
547-
if (!apply_index_write(index, old_tuple.get(pos), rid, IndexOp::Remove, err)) {
547+
if (!apply_index_write(index, old_tuple.get(pos), rid, IndexOp::Remove,
548+
err)) {
548549
throw std::runtime_error(err);
549550
}
550551
}
@@ -631,7 +632,8 @@ QueryResult QueryExecutor::execute_update(const parser::UpdateStatement& stmt,
631632
uint16_t pos = idx_info.column_positions[0];
632633
common::ValueType ktype = table_meta->columns[pos].type;
633634
storage::BTreeIndex index(idx_info.name, bpm_, ktype);
634-
if (!apply_index_write(index, op.old_tuple.get(pos), op.rid, IndexOp::Remove, err)) {
635+
if (!apply_index_write(index, op.old_tuple.get(pos), op.rid, IndexOp::Remove,
636+
err)) {
635637
throw std::runtime_error(err);
636638
}
637639
}
@@ -654,7 +656,8 @@ QueryResult QueryExecutor::execute_update(const parser::UpdateStatement& stmt,
654656
uint16_t pos = idx_info.column_positions[0];
655657
common::ValueType ktype = table_meta->columns[pos].type;
656658
storage::BTreeIndex index(idx_info.name, bpm_, ktype);
657-
if (!apply_index_write(index, op.new_tuple.get(pos), new_tid, IndexOp::Insert, err)) {
659+
if (!apply_index_write(index, op.new_tuple.get(pos), new_tid, IndexOp::Insert,
660+
err)) {
658661
throw std::runtime_error(err);
659662
}
660663
}
@@ -750,10 +753,10 @@ std::unique_ptr<Operator> QueryExecutor::build_plan(const parser::SelectStatemen
750753
if (base_table_meta->columns[pos].name == col_name ||
751754
(base_table_name + "." + base_table_meta->columns[pos].name) ==
752755
col_name) {
753-
754756
common::ValueType ktype = base_table_meta->columns[pos].type;
755757
current_root = std::make_unique<IndexScanOperator>(
756-
std::make_unique<storage::HeapTable>(base_table_name, bpm_, base_schema),
758+
std::make_unique<storage::HeapTable>(base_table_name, bpm_,
759+
base_schema),
757760
std::make_unique<storage::BTreeIndex>(idx_info.name, bpm_, ktype),
758761
std::move(const_val), txn, &lock_manager_);
759762
index_used = true;

src/transaction/transaction_manager.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ bool TransactionManager::undo_transaction(Transaction* txn) {
218218
break;
219219
}
220220
case UndoLog::Type::UPDATE: {
221-
/* For UPDATE undo, remove new version from indexes/heap and restore old version's xmax/indexes */
221+
/* For UPDATE undo, remove new version from indexes/heap and restore old version's
222+
* xmax/indexes */
222223
executor::Tuple new_tuple;
223224
if (table.get(log.rid, new_tuple)) {
224225
for (const auto& idx_info : table_meta->indexes) {
@@ -231,13 +232,15 @@ bool TransactionManager::undo_transaction(Transaction* txn) {
231232
}
232233
}
233234
if (!table.physical_remove(log.rid)) {
234-
std::cerr << "Rollback ERROR: physical_remove failed for new version in UPDATE undo\n";
235+
std::cerr << "Rollback ERROR: physical_remove failed for new version in UPDATE "
236+
"undo\n";
235237
success = false;
236238
}
237239

238240
if (log.old_rid.has_value()) {
239241
if (!table.undo_remove(log.old_rid.value())) {
240-
std::cerr << "Rollback ERROR: undo_remove failed for old version in UPDATE undo\n";
242+
std::cerr << "Rollback ERROR: undo_remove failed for old version in UPDATE "
243+
"undo\n";
241244
success = false;
242245
} else {
243246
executor::Tuple old_tuple;
@@ -247,7 +250,8 @@ bool TransactionManager::undo_transaction(Transaction* txn) {
247250
uint16_t pos = idx_info.column_positions[0];
248251
common::ValueType ktype = table_meta->columns[pos].type;
249252
storage::BTreeIndex index(idx_info.name, bpm_, ktype);
250-
static_cast<void>(index.insert(old_tuple.get(pos), log.old_rid.value()));
253+
static_cast<void>(
254+
index.insert(old_tuple.get(pos), log.old_rid.value()));
251255
}
252256
}
253257
}

0 commit comments

Comments
 (0)