Added PredEq template

Author: poojanilangekar

src/common/container/cuckoo_map.cpp

@@ -15,6 +15,7 @@
 
 #include "common/container/cuckoo_map.h"
 #include "common/internal_types.h"
+#include "common/item_pointer.h"
 #include "common/logger.h"
 #include "common/macros.h"
 

src/include/common/container/cuckoo_map.h

@@ -24,14 +24,15 @@ namespace peloton {
 
 // CUCKOO_MAP_TEMPLATE_ARGUMENTS
 #define CUCKOO_MAP_TEMPLATE_ARGUMENTS template <typename KeyType, \
-    typename ValueType, typename HashType >
+    typename ValueType, typename HashType, typename PredType >
 
 // CUCKOO_MAP_DEFAULT_ARGUMENTS
 #define CUCKOO_MAP_DEFAULT_ARGUMENTS template <typename KeyType, \
-    typename ValueType, typename HashType = DefaultHasher<KeyType> >
+    typename ValueType, typename HashType = DefaultHasher<KeyType>, \
+    typename PredType = std::equal_to<KeyType>>
 
 // CUCKOO_MAP_TYPE
-#define CUCKOO_MAP_TYPE CuckooMap<KeyType, ValueType, HashType >
+#define CUCKOO_MAP_TYPE CuckooMap<KeyType, ValueType, HashType, PredType >
 
 // Iterator type
 #define CUCKOO_MAP_ITERATOR_TYPE \

src/include/common/internal_types.h

@@ -10,6 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef INTERNALTYPES_H
+#define INTERNALTYPES_H
+
 #pragma once
 
 #include <bitset>
@@ -28,9 +31,14 @@
 #include "type/type_id.h"
 #include "common/logger.h"
 #include "common/macros.h"
+#include "container/cuckoo_map.h"
 
 namespace peloton {
 
+class ItemPointer;
+struct ItemPointerHasher;
+class ItemPointerComparator;
+
 // For all of the enums defined in this header, we will
 // use this value to indicate that it is an invalid value
 // I don't think it matters whether this is 0 or -1
@@ -1199,6 +1207,10 @@ std::ostream &operator<<(std::ostream &os, const RWType &type);
 typedef std::unordered_map<oid_t, std::unordered_map<oid_t, RWType>>
     ReadWriteSet;
 
+// ItemPointer -> type
+typedef CuckooMap<ItemPointer, RWType, ItemPointerHasher, ItemPointerComparator>
+   CuckooReadWriteSet;
+
 // this enum is to identify why the version should be GC'd.
 enum class GCVersionType {
   INVALID,
@@ -1407,3 +1419,5 @@ enum class SSLLevel {
 };
 
 }  // namespace peloton
+
+#endif /* INTERNALTYPES_H */

src/include/common/item_pointer.h

@@ -11,11 +11,14 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef ITEMPOINTER_H
+#define ITEMPOINTER_H
+
 #pragma once
 
 #include <cstdint>
 
-#include "internal_types.h"
+#include "common/internal_types.h"
 
 namespace peloton {
 
@@ -77,3 +80,5 @@ class ItemPointerHashFunc {
 bool AtomicUpdateItemPointer(ItemPointer *src_ptr, const ItemPointer &value);
 
 }  // namespace peloton
+
+#endif /* ITEMPOINTER_H */