Merge branch 'master' into fix/readme-platform-support

Author: pervazea

.travis.yml

@@ -28,11 +28,50 @@ matrix:
                     - g++-4.8
           env:
               # NAME has no actual use, just to make the travis jobs overview more clear
-              - NAME="gcc4.8 Debug+Tests+Coveralls"
+              - NAME="gcc4.8 Debug"
               - CXX=g++-4.8
               - CC=gcc-4.8
               - PELOTON_BUILD_TYPE=Debug
               # COVERALLS: we run coveralls only for one compiler
+              - COVERALLS=Off
+
+        - os: linux
+          sudo: required
+          dist: trusty
+          compiler: gcc
+          addons:
+              apt:
+                  sources:
+                      - llvm-toolchain-precise-3.7
+                      - ubuntu-toolchain-r-test
+                  packages:
+                    - g++-4.8
+          env:
+              # NAME has no actual use, just to make the travis jobs overview more clear
+              - NAME="gcc4.8 Release"
+              - CXX=g++-4.8
+              - CC=gcc-4.8
+              - PELOTON_BUILD_TYPE=Release
+              - COVERALLS=Off
+
+        # Linux builds for gcc 5
+        - os: linux
+          sudo: required
+          dist: trusty
+          compiler: gcc
+          addons:
+              apt:
+                  sources:
+                      - llvm-toolchain-precise-3.7
+                      - ubuntu-toolchain-r-test
+                  packages:
+                    - g++-5
+          env:
+              # NAME has no actual use, just to make the travis jobs overview more clear
+              - NAME="gcc5 Debug/Tests/AddressSanitizer/Coveralls"
+              - CXX=g++-5
+              - CC=gcc-5
+              - PELOTON_BUILD_TYPE=Debug
               - COVERALLS=On
           # override script value to run also tests and benchmarks
           script:
@@ -67,12 +106,12 @@ matrix:
                       - llvm-toolchain-precise-3.7
                       - ubuntu-toolchain-r-test
                   packages:
-                    - g++-4.8
+                    - g++-5
           env:
               # NAME has no actual use, just to make the travis jobs overview more clear
-              - NAME="gcc4.8 Release+Tests"
-              - CXX=g++-4.8
-              - CC=gcc-4.8
+              - NAME="gcc5 Release/Tests/AddressSanitizer"
+              - CXX=g++-5
+              - CC=gcc-5
               - PELOTON_BUILD_TYPE=Release
               - COVERALLS=Off
           # override script value to run also tests and benchmarks
@@ -96,45 +135,6 @@ matrix:
               # run jdbc tests
               - python ../script/validators/jdbc_validator.py
 
-        # Linux builds for gcc 5
-        - os: linux
-          sudo: required
-          dist: trusty
-          compiler: gcc
-          addons:
-              apt:
-                  sources:
-                      - llvm-toolchain-precise-3.7
-                      - ubuntu-toolchain-r-test
-                  packages:
-                    - g++-5
-          env:
-              # NAME has no actual use, just to make the travis jobs overview more clear
-              - NAME="gcc5 Debug"
-              - CXX=g++-5
-              - CC=gcc-5
-              - PELOTON_BUILD_TYPE=Debug
-              - COVERALLS=Off
-
-        - os: linux
-          sudo: required
-          dist: trusty
-          compiler: gcc
-          addons:
-              apt:
-                  sources:
-                      - llvm-toolchain-precise-3.7
-                      - ubuntu-toolchain-r-test
-                  packages:
-                    - g++-5
-          env:
-              # NAME has no actual use, just to make the travis jobs overview more clear
-              - NAME="gcc5 Release"
-              - CXX=g++-5
-              - CC=gcc-5
-              - PELOTON_BUILD_TYPE=Release
-              - COVERALLS=Off
-
 install:
     # setup environment
     - ./script/installation/packages.sh

script/installation/packages.sh

@@ -67,11 +67,12 @@ function install_protobuf3.4.0() {
 # Utility function for installing tensorflow components of python/C++
 function install_tf() {
  TFCApiFile=$1
- TFBinaryURL=$2
+ TF_VERSION=$2
  LinkerConfigCmd=$3
  TARGET_DIRECTORY="/usr/local"
  # Install Tensorflow Python Binary
- sudo -E pip3 install --upgrade ${TFBinaryURL}
+ sudo -E pip3 install --upgrade pip
+ sudo -E pip3 install --upgrade tensorflow==${TF_VERSION}
 
  # Install C-API
  TFCApiURL="https://storage.googleapis.com/tensorflow/libtensorflow/${TFCApiFile}"
@@ -88,7 +89,6 @@ function install_tf() {
 ## ------------------------------------------------
 if [ "$DISTRO" = "UBUNTU" ]; then
     MAJOR_VER=$(echo "$DISTRO_VER" | cut -d '.' -f 1)
-
     # Fix for LLVM-3.7 on Ubuntu 14 + 17
     if [ "$MAJOR_VER" == "14" -o "$MAJOR_VER" == "17" ]; then
         if [ "$MAJOR_VER" == "14" ]; then
@@ -120,19 +120,16 @@ if [ "$DISTRO" = "UBUNTU" ]; then
     if [ "$MAJOR_VER" == "14" ]; then
         PKG_CMAKE="cmake3"
         FORCE_Y="--force-yes"
-	TF_VERSION="1.4.0"
-        TFBinaryURL="https://storage.googleapis.com/tensorflow/linux/${TF_TYPE}/tensorflow-${TF_VERSION}-cp34-cp34m-linux_x86_64.whl"
+        TF_VERSION="1.4.0"
     fi
     if [ "$MAJOR_VER" == "16" ]; then
-	TF_VERSION="1.5.0"
-        TFBinaryURL="https://storage.googleapis.com/tensorflow/linux/${TF_TYPE}/tensorflow-${TF_VERSION}-cp35-cp35m-linux_x86_64.whl"
+        TF_VERSION="1.5.0"
     fi
     # Fix for llvm on Ubuntu 17.x
     if [ "$MAJOR_VER" == "17" ]; then
         PKG_LLVM="llvm-3.9"
         PKG_CLANG="clang-3.8"
-	TF_VERSION="1.5.0"
-        TFBinaryURL="https://storage.googleapis.com/tensorflow/linux/${TF_TYPE}/tensorflow-${TF_VERSION}-cp35-cp35m-linux_x86_64.whl"
+        TF_VERSION="1.5.0"
     fi
     TFCApiFile="libtensorflow-${TF_TYPE}-linux-x86_64-${TF_VERSION}.tar.gz"
     LinkerConfigCmd="sudo ldconfig"
@@ -168,7 +165,7 @@ if [ "$DISTRO" = "UBUNTU" ]; then
     # Install version of protobuf needed by C-API
     install_protobuf3.4.0 "ubuntu"
     # Install tensorflow
-    install_tf "$TFCApiFile" "$TFBinaryURL" "$LinkerConfigCmd"
+    install_tf "$TFCApiFile" "$TF_VERSION" "$LinkerConfigCmd"
 
 ## ------------------------------------------------
 ## DEBIAN
@@ -208,7 +205,6 @@ elif [[ "$DISTRO" == *"FEDORA"* ]]; then
     esac
     TF_VERSION="1.5.0"
     TFCApiFile="libtensorflow-${TF_TYPE}-linux-x86_64-${TF_VERSION}.tar.gz"
-    TFBinaryURL="https://storage.googleapis.com/tensorflow/linux/${TF_TYPE}/tensorflow-${TF_VERSION}-cp36-cp36m-linux_x86_64.whl"
     LinkerConfigCmd="sudo ldconfig"
     sudo dnf -q install -y \
         git \
@@ -244,7 +240,7 @@ elif [[ "$DISTRO" == *"FEDORA"* ]]; then
     # Install version of protobuf needed by C-API
     install_protobuf3.4.0 "fedora"        
     # Install tensorflow
-    install_tf "$TFCApiFile" "$TFBinaryURL" "$LinkerConfigCmd"
+    install_tf "$TFCApiFile" "$TF_VERSION" "$LinkerConfigCmd"
 
 ## ------------------------------------------------
 ## REDHAT
@@ -325,7 +321,6 @@ elif [ "$DISTRO" = "DARWIN" ]; then
       ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
     fi
     TF_VERSION="1.4.0"
-    TFBinaryURL="https://storage.googleapis.com/tensorflow/mac/${TF_TYPE}/tensorflow-${TF_VERSION}-py3-none-any.whl"
     TFCApiFile="libtensorflow-${TF_TYPE}-darwin-x86_64-${TF_VERSION}.tar.gz"
     LinkerConfigCmd="sudo update_dyld_shared_cache"
     brew install git
@@ -349,7 +344,7 @@ elif [ "$DISTRO" = "DARWIN" ]; then
     brew upgrade python
     # Brew installs correct version of Protobuf(3.5.1 >= 3.4.0)
     # So we can directly install tensorflow
-    install_tf "$TFCApiFile" "$TFBinaryURL" "$LinkerConfigCmd"
+    install_tf "$TFCApiFile" "$TF_VERSION" "$LinkerConfigCmd"
 
 ## ------------------------------------------------
 ## UNKNOWN

src/catalog/manager.cpp

@@ -36,51 +36,39 @@ Manager &Manager::GetInstance() {
 
 void Manager::AddTileGroup(const oid_t oid,
                            std::shared_ptr<storage::TileGroup> location) {
-
   // add/update the catalog reference to the tile group
-  tile_group_locator_.Update(oid, location);
+  tile_group_locator_[oid] = location;
 }
 
 void Manager::DropTileGroup(const oid_t oid) {
-  
   // drop the catalog reference to the tile group
-  tile_group_locator_.Erase(oid, empty_tile_group_);
+  tile_group_locator_[oid] = empty_tile_group_;
 }
 
 std::shared_ptr<storage::TileGroup> Manager::GetTileGroup(const oid_t oid) {
-  std::shared_ptr<storage::TileGroup> location;
-  
-  location = tile_group_locator_.Find(oid);
-
-  return location;
+  auto iter = tile_group_locator_.find(oid);
+  if (iter == tile_group_locator_.end()) {
+    return empty_tile_group_;
+  }
+  return iter->second;
 }
 
 // used for logging test
-void Manager::ClearTileGroup() {
-
-  tile_group_locator_.Clear(empty_tile_group_);
-}
-
-
-void Manager::AddIndirectionArray(const oid_t oid,
-                                  std::shared_ptr<storage::IndirectionArray> location) {
+void Manager::ClearTileGroup() { tile_group_locator_.clear(); }
 
+void Manager::AddIndirectionArray(
+    const oid_t oid, std::shared_ptr<storage::IndirectionArray> location) {
   // add/update the catalog reference to the indirection array
-  indirection_array_locator_.Update(oid, location);
+  auto ret = indirection_array_locator_[oid] = location;
 }
 
 void Manager::DropIndirectionArray(const oid_t oid) {
-  
   // drop the catalog reference to the tile group
-  indirection_array_locator_.Erase(oid, empty_indirection_array_);
+  indirection_array_locator_[oid] = empty_indirection_array_;
 }
 
-
 // used for logging test
-void Manager::ClearIndirectionArray() {
-
-  indirection_array_locator_.Clear(empty_indirection_array_);
-}
+void Manager::ClearIndirectionArray() { indirection_array_locator_.clear(); }
 
 }  // namespace catalog
 }  // namespace peloton

src/codegen/operator/update_translator.cpp

@@ -41,13 +41,14 @@ UpdateTranslator::UpdateTranslator(const planner::UpdatePlan &update_plan,
       UpdaterProxy::GetType(GetCodeGen()));
 }
 
-bool IsTarget(const TargetList &target_list, uint32_t index) {
-  for (const auto &target : target_list) {
-    if (target.first == index) {
-      return true;
+oid_t GetTargetIndex(const TargetList &target_list, uint32_t index) {
+  oid_t target_size = target_list.size();
+  for (oid_t i = 0; i < target_size; i++) {
+    if (target_list[i].first == index) {
+      return i;
     }
   }
-  return false;
+  return INVALID_OID;
 }
 
 void UpdateTranslator::InitializeState() {
@@ -93,13 +94,13 @@ void UpdateTranslator::Consume(ConsumerContext &, RowBatch::Row &row) const {
 
   // Collect all the column values
   std::vector<codegen::Value> values;
-  for (uint32_t i = 0, target_id = 0; i < column_num; i++) {
+  for (uint32_t i = 0; i < column_num; i++) {
     codegen::Value val;
-    if (IsTarget(target_list, i)) {
+    uint32_t target_index = GetTargetIndex(target_list, i);
+    if (target_index != INVALID_OID) {
       // Set the value for the update
-      const auto &derived_attribute = target_list[target_id].second;
+      const auto &derived_attribute = target_list[target_index].second;
       val = row.DeriveValue(codegen, *derived_attribute.expr);
-      target_id++;
     } else {
       val = row.DeriveValue(codegen, ais[i]);
     }