Merge branch 'master' into cost_model_txn_fix

Author: apavlo

Jenkinsfile

@@ -141,35 +141,35 @@ pipeline {
                 //     }
                 // }
 
-                stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Debug)') {
-                    agent { docker { image 'fedora:27' } }
-                    steps {
-                        sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
-                        sh 'python ./script/validators/source_validator.py'
-                        sh 'mkdir build'
-                        sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
-                        sh 'cd build && make check -j4'
-                        sh 'cd build && make install'
-                        sh 'cd build && bash ../script/testing/psql/psql_test.sh'
-                        sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
-                        sh 'cd build && python ../script/validators/jdbc_validator.py'
-                    }
-                }
+                // stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Debug)') {
+                //     agent { docker { image 'fedora:27' } }
+                //     steps {
+                //         sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
+                //         sh 'python ./script/validators/source_validator.py'
+                //         sh 'mkdir build'
+                //         sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
+                //         sh 'cd build && make check -j4'
+                //         sh 'cd build && make install'
+                //         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
+                //         sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
+                //         sh 'cd build && python ../script/validators/jdbc_validator.py'
+                //     }
+                // }
 
-                stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Release)') {
-                    agent { docker { image 'fedora:27' } }
-                    steps {
-                        sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
-                        sh 'python ./script/validators/source_validator.py'
-                        sh 'mkdir build'
-                        sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
-                        sh 'cd build && make check -j4'
-                        sh 'cd build && make install'
-                        sh 'cd build && bash ../script/testing/psql/psql_test.sh'
-                        sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
-                        sh 'cd build && python ../script/validators/jdbc_validator.py'
-                    }
-                }
+                // stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Release)') {
+                //     agent { docker { image 'fedora:27' } }
+                //     steps {
+                //         sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
+                //         sh 'python ./script/validators/source_validator.py'
+                //         sh 'mkdir build'
+                //         sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
+                //         sh 'cd build && make check -j4'
+                //         sh 'cd build && make install'
+                //         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
+                //         sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
+                //         sh 'cd build && python ../script/validators/jdbc_validator.py'
+                //     }
+                // }
 
                 // stage('CentOS 7/gcc-4.8.5/llvm-3.9.1 (Debug)') {
                 //     agent { docker { image 'centos:7' } }

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