Merge branch 'master' into junit

Author: pervazea

script/installation/packages.sh

@@ -17,6 +17,7 @@
 ##  * OSX
 ## =================================================================
 
+set -o errexit
 
 # Determine OS platform
 UNAME=$(uname | tr "[:upper:]" "[:lower:]")
@@ -104,14 +105,12 @@ if [ "$DISTRO" = "UBUNTU" ]; then
             echo -e "\n# Added by Peloton 'packages.sh' script on $(date)\ndeb $LLVM_PKG_URL $LLVM_PKG_TARGET" | sudo tee -a /etc/apt/sources.list > /dev/null
         fi
         sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 15CF4D18AF4F7421
-        sudo apt-get update -qq
         CMAKE_NAME="cmake3"
-        FORCE_Y="--force-yes"
     else
         CMAKE_NAME="cmake"
-        FORCE_Y=""
     fi
 
+    sudo apt-get update
     FORCE_Y=""
     PKG_CMAKE="cmake"
     PKG_LLVM="llvm-3.7"
@@ -134,7 +133,7 @@ if [ "$DISTRO" = "UBUNTU" ]; then
     fi
     TFCApiFile="libtensorflow-${TF_TYPE}-linux-x86_64-${TF_VERSION}.tar.gz"
     LinkerConfigCmd="sudo ldconfig"
-    sudo apt-get -qq $FORCE_Y --ignore-missing -y install \
+    sudo apt-get -q $FORCE_Y --ignore-missing -y install \
         $PKG_CMAKE \
         $PKG_LLVM \
         $PKG_CLANG \
@@ -171,7 +170,7 @@ if [ "$DISTRO" = "UBUNTU" ]; then
 ## DEBIAN
 ## ------------------------------------------------
 elif [ "$DISTRO" = "DEBIAN OS" ]; then
-    sudo apt-get -qq --ignore-missing -y install \
+    sudo apt-get -q --ignore-missing -y install \
         git \
         g++ \
         clang \
@@ -312,6 +311,7 @@ elif [[ "$DISTRO" == *"REDHAT"* ]] && [[ "${DISTRO_VER%.*}" == "7" ]]; then
 ## DARWIN (OSX)
 ## ------------------------------------------------
 elif [ "$DISTRO" = "DARWIN" ]; then
+    set +o errexit
     if test ! $(which brew); then
       echo "Installing homebrew..."
       ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"

src/binder/binder_context.cpp

@@ -37,10 +37,8 @@ void BinderContext::AddRegularTable(const std::string db_name,
                                     const std::string table_alias,
                                     concurrency::TransactionContext *txn) {
   // using catalog object to retrieve meta-data
-  // PL_ASSERT(txn->catalog_cache.GetDatabaseObject(db_name) != nullptr);
   auto table_object =
     catalog::Catalog::GetInstance()->GetTableObject(db_name, table_name, txn);
-    // txn->catalog_cache.GetDatabaseObject(db_name)->GetTableObject(table_name, true);
 
   if (regular_table_alias_map_.find(table_alias) !=
           regular_table_alias_map_.end() ||

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