Merge branch 'master' into attribute-order-fix

Author: pervazea

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/gc/transaction_level_gc_manager.cpp

@@ -139,7 +139,7 @@ int TransactionLevelGCManager::Unlink(const int &thread_id,
         uint64_t timestamp = txn_ctx->GetTimestamp();
         auto &pool = threadpool::MonoQueuePool::GetBrainInstance();
         for(auto query_string: query_strings) {
-          pool.SubmitTask([this, query_string, timestamp] {
+          pool.SubmitTask([query_string, timestamp] {
             brain::QueryLogger::LogQuery(query_string, timestamp);
           });        
         }

src/include/index/bwtree.h

@@ -4587,7 +4587,7 @@ class BwTree : public BwTreeBase {
 
     // This is not used since in this case we do not need to compare
     // for equal relation
-    auto f2 = [this](const LeafDataNode *ldn1, const LeafDataNode *ldn2) {
+    auto f2 = [](const LeafDataNode *ldn1, const LeafDataNode *ldn2) {
       (void)ldn1;
       (void)ldn2;
 

src/traffic_cop/traffic_cop.cpp

@@ -191,7 +191,7 @@ executor::ExecutionResult TrafficCop::ExecuteHelper(
   };
 
   auto &pool = threadpool::MonoQueuePool::GetInstance();
-  pool.SubmitTask([plan, txn, &params, &result, &result_format, on_complete] {
+  pool.SubmitTask([plan, txn, &params, &result_format, on_complete] {
     executor::PlanExecutor::ExecutePlan(plan, txn, params, result_format,
                                         on_complete);
   });