Changes based on feedback of cmu-db#1349.

mbutrovich · Jul 3, 2018 · 8b7e092 · 8b7e092
1 parent 40eff31
commit 8b7e092
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/common/container/cuckoo_map.cpp b/src/common/container/cuckoo_map.cpp
@@ -14,7 +14,6 @@
 #include <iostream>
 
 #include "common/container/cuckoo_map.h"
-#include "common/container/lock_free_queue.h"
 #include "common/internal_types.h"
 #include "common/item_pointer.h"
 #include "common/logger.h"
@@ -33,6 +32,9 @@ class IndexMetric;
 
 class StatementCache;
 
+template <typename T>
+class LockFreeQueue;
+
 CUCKOO_MAP_TEMPLATE_ARGUMENTS
 CUCKOO_MAP_TYPE::CuckooMap() {}
 
@@ -128,6 +130,6 @@ template class CuckooMap<StatementCache *, StatementCache *>;
 
 // Used in TransactionLevelGCManager
 template class CuckooMap<oid_t,
-                         std::shared_ptr<peloton::LockFreeQueue<ItemPointer>>>;
+                         std::shared_ptr<LockFreeQueue<ItemPointer>>>;
 
 }  // namespace peloton
diff --git a/src/gc/transaction_level_gc_manager.cpp b/src/gc/transaction_level_gc_manager.cpp
@@ -243,7 +243,7 @@ uint32_t TransactionLevelGCManager::Unlink(const uint32_t &thread_id,
 
     if (txn_ctx->GetEpochId() <= expired_eid) {
       // since this txn's epochId is <= the global expired epoch id
-      // no active transactions can read the version. Asa result,
+      // no active transactions can read the version. As a result,
       // we can delete remove all of its garbage tuples from the indexes
 
       // unlink versions from version chain and indexes