Merge branch 'master' into invalid-argument

Author: mengranwo

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"
 
@@ -34,6 +35,9 @@ class StatementCache;
 CUCKOO_MAP_TEMPLATE_ARGUMENTS
 CUCKOO_MAP_TYPE::CuckooMap() {}
 
+CUCKOO_MAP_TEMPLATE_ARGUMENTS
+CUCKOO_MAP_TYPE::CuckooMap(size_t initial_size) : cuckoo_map(initial_size) {}
+
 CUCKOO_MAP_TEMPLATE_ARGUMENTS
 CUCKOO_MAP_TYPE::~CuckooMap() {}
 
@@ -83,6 +87,18 @@ CUCKOO_MAP_TEMPLATE_ARGUMENTS
 CUCKOO_MAP_ITERATOR_TYPE
 CUCKOO_MAP_TYPE::GetIterator() { return cuckoo_map.lock_table(); }
 
+CUCKOO_MAP_TEMPLATE_ARGUMENTS
+CUCKOO_MAP_ITERATOR_TYPE
+CUCKOO_MAP_TYPE::GetConstIterator() const {
+  // WARNING: This is a compiler hack and should never be used elsewhere
+  // If you are considering using this, please ask Marcel first
+  // We need the const iterator on the const object and the cuckoohash
+  // library returns a lock_table object. The other option would be to
+  // Modify the cuckoohash library which is not neat.
+  auto locked_table = const_cast<CuckooMap *>(this)->cuckoo_map.lock_table();
+  return locked_table;
+}
+
 // Explicit template instantiation
 template class CuckooMap<uint32_t, uint32_t>;
 
@@ -102,4 +118,8 @@ template class CuckooMap<std::shared_ptr<oid_t>, std::shared_ptr<oid_t>>;
 // Used in StatementCacheManager
 template class CuckooMap<StatementCache *, StatementCache *>;
 
+// Used in InternalTypes
+template class CuckooMap<ItemPointer, RWType, ItemPointerHasher,
+                         ItemPointerComparator>;
+
 }  // namespace peloton