Skip to content

Commit 91bc74a

Browse files
committed
Changes based on feedback of cmu-db#1349.
1 parent 038c23b commit 91bc74a

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/common/container/cuckoo_map.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <iostream>
1515

1616
#include "common/container/cuckoo_map.h"
17-
#include "common/container/lock_free_queue.h"
1817
#include "common/internal_types.h"
1918
#include "common/item_pointer.h"
2019
#include "common/logger.h"
@@ -33,6 +32,9 @@ class IndexMetric;
3332

3433
class StatementCache;
3534

35+
template <typename T>
36+
class LockFreeQueue;
37+
3638
CUCKOO_MAP_TEMPLATE_ARGUMENTS
3739
CUCKOO_MAP_TYPE::CuckooMap() {}
3840

@@ -128,6 +130,6 @@ template class CuckooMap<StatementCache *, StatementCache *>;
128130

129131
// Used in TransactionLevelGCManager
130132
template class CuckooMap<oid_t,
131-
std::shared_ptr<peloton::LockFreeQueue<ItemPointer>>>;
133+
std::shared_ptr<LockFreeQueue<ItemPointer>>>;
132134

133135
} // namespace peloton

src/gc/transaction_level_gc_manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ uint32_t TransactionLevelGCManager::Unlink(const uint32_t &thread_id,
243243

244244
if (txn_ctx->GetEpochId() <= expired_eid) {
245245
// since this txn's epochId is <= the global expired epoch id
246-
// no active transactions can read the version. Asa result,
246+
// no active transactions can read the version. As a result,
247247
// we can delete remove all of its garbage tuples from the indexes
248248

249249
// unlink versions from version chain and indexes

0 commit comments

Comments
 (0)