Merge branch 'master' into join-reordering

Author: GustavoAngulo

cmake/External/capnproto.cmake

@@ -20,8 +20,8 @@ if (NOT __CAPNP_INCLUDED) # guard against multiple includes
         set(CAPNP_EXTRA_COMPILER_FLAGS "-fPIC")
     endif()
 
-    set(CAPNP_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${CAPNP_EXTRA_COMPILER_FLAGS})
-    set(CAPNP_C_FLAGS ${CMAKE_C_FLAGS} ${CAPNP_EXTRA_COMPILER_FLAGS})
+    set(CAPNP_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CAPNP_EXTRA_COMPILER_FLAGS}")
+    set(CAPNP_C_FLAGS "${CMAKE_C_FLAGS} ${CAPNP_EXTRA_COMPILER_FLAGS}")
 
     ExternalProject_Add(capnp
       PREFIX ${capnp_PREFIX}

cmake/External/gflags.cmake

@@ -20,8 +20,8 @@ if (NOT __GFLAGS_INCLUDED) # guard against multiple includes
         set(GFLAGS_EXTRA_COMPILER_FLAGS "-fPIC")
     endif()
 
-    set(GFLAGS_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${GFLAGS_EXTRA_COMPILER_FLAGS})
-    set(GFLAGS_C_FLAGS ${CMAKE_C_FLAGS} ${GFLAGS_EXTRA_COMPILER_FLAGS})
+    set(GFLAGS_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GFLAGS_EXTRA_COMPILER_FLAGS}")
+    set(GFLAGS_C_FLAGS "${CMAKE_C_FLAGS} ${GFLAGS_EXTRA_COMPILER_FLAGS}")
 
     ExternalProject_Add(gflags
       PREFIX ${gflags_PREFIX}

cmake/External/glog.cmake

@@ -22,8 +22,8 @@ if (NOT __GLOG_INCLUDED)
       set(GLOG_EXTRA_COMPILER_FLAGS "-fPIC")
     endif()
 
-    set(GLOG_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${GLOG_EXTRA_COMPILER_FLAGS})
-    set(GLOG_C_FLAGS ${CMAKE_C_FLAGS} ${GLOG_EXTRA_COMPILER_FLAGS})
+    set(GLOG_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GLOG_EXTRA_COMPILER_FLAGS}")
+    set(GLOG_C_FLAGS "${CMAKE_C_FLAGS} ${GLOG_EXTRA_COMPILER_FLAGS}")
 
     # depend on gflags if we're also building it
     if (GFLAGS_EXTERNAL)

test/index/testing_index_util.cpp

@@ -104,7 +104,7 @@ void TestingIndexUtil::UniqueKeyInsertTest(const IndexType index_type) {
 
   // INDEX
   std::unique_ptr<index::Index, void (*)(index::Index *)> index(
-      TestingIndexUtil::BuildIndex(index_type, false), DestroyIndex);
+      TestingIndexUtil::BuildIndex(index_type, true), DestroyIndex);
   const catalog::Schema *key_schema = index->GetKeySchema();
 
   // Single threaded test
@@ -151,10 +151,10 @@ void TestingIndexUtil::UniqueKeyDeleteTest(const IndexType index_type) {
 
   key0->SetValue(0, type::ValueFactory::GetIntegerValue(100), pool);
   key0->SetValue(1, type::ValueFactory::GetVarcharValue("a"), pool);
-  key2->SetValue(0, type::ValueFactory::GetIntegerValue(100), pool);
-  key2->SetValue(1, type::ValueFactory::GetVarcharValue("b"), pool);
   key1->SetValue(0, type::ValueFactory::GetIntegerValue(100), pool);
-  key1->SetValue(1, type::ValueFactory::GetVarcharValue("c"), pool);
+  key1->SetValue(1, type::ValueFactory::GetVarcharValue("b"), pool);
+  key2->SetValue(0, type::ValueFactory::GetIntegerValue(100), pool);
+  key2->SetValue(1, type::ValueFactory::GetVarcharValue("c"), pool);
 
   LOG_DEBUG("INDEX CONTENTS:\n%s",
            index::IndexUtil::Debug(index.get()).c_str());
@@ -278,7 +278,7 @@ void TestingIndexUtil::UniqueKeyMultiThreadedTest(const IndexType index_type) {
 
   // INDEX
   std::unique_ptr<index::Index, void (*)(index::Index *)> index(
-      TestingIndexUtil::BuildIndex(index_type, false), DestroyIndex);
+      TestingIndexUtil::BuildIndex(index_type, true), DestroyIndex);
   const catalog::Schema *key_schema = index->GetKeySchema();
 
   // Parallel Test