Merge branch 'master' into feature/clangformat_hunks

Author: tli2

src/catalog/manager.cpp

@@ -21,12 +21,8 @@
 namespace peloton {
 namespace catalog {
 
-std::shared_ptr<storage::TileGroup> Manager::empty_tile_group_;
-
 std::shared_ptr<storage::IndirectionArray> Manager::empty_indirection_array_;
 
-Manager::Manager() : tile_group_locator_(DEFAULT_LOCATOR_SIZE) {}
-
 Manager &Manager::GetInstance() {
   static Manager manager;
   return manager;
@@ -36,28 +32,6 @@ Manager &Manager::GetInstance() {
 // OBJECT MAP
 //===--------------------------------------------------------------------===//
 
-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_.Upsert(oid, location);
-}
-
-void Manager::DropTileGroup(const oid_t oid) {
-  // drop the catalog reference to the tile group
-  tile_group_locator_.Erase(oid);
-}
-
-std::shared_ptr<storage::TileGroup> Manager::GetTileGroup(const oid_t oid) {
-  std::shared_ptr<storage::TileGroup> location;
-  if (tile_group_locator_.Find(oid, location)) {
-    return location;
-  }
-  return empty_tile_group_;
-}
-
-// used for logging test
-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

src/codegen/codegen.cpp

@@ -91,11 +91,19 @@ llvm::Value *CodeGen::AllocateVariable(llvm::Type *type,
   // matter where we insert it.
 
   auto *entry_block = code_context_.GetCurrentFunction()->GetEntryBlock();
+#if LLVM_VERSION_GE(5, 0)
+  if (entry_block->empty()) {
+    return new llvm::AllocaInst(type, 0, name, entry_block);
+  } else {
+    return new llvm::AllocaInst(type, 0, name, &entry_block->front());
+  }
+#else
   if (entry_block->empty()) {
     return new llvm::AllocaInst(type, name, entry_block);
   } else {
     return new llvm::AllocaInst(type, name, &entry_block->front());
   }
+#endif
 }
 
 llvm::Value *CodeGen::AllocateBuffer(llvm::Type *element_type,

src/codegen/function_builder.cpp

@@ -143,7 +143,7 @@ FunctionBuilder::~FunctionBuilder() {
 // Here, we just need to iterate over the arguments in the function to find a
 // match. The names of the arguments were provided and set at construction time.
 llvm::Value *FunctionBuilder::GetArgumentByName(std::string name) {
-  for (auto &arg : func_->getArgumentList()) {
+  for (auto &arg : func_->args()) {
     if (arg.getName().equals(name)) {
       return &arg;
     }

src/codegen/transaction_runtime.cpp

@@ -56,7 +56,7 @@ uint32_t TransactionRuntime::PerformVectorizedRead(
     ItemPointer location{tile_group_idx, selection_vector[idx]};
 
     // Perform the read
-    bool can_read = txn_manager.PerformRead(&txn, location);
+    bool can_read = txn_manager.PerformRead(&txn, location, tile_group_header, false);
 
     // Update the selection vector and output position
     selection_vector[out_idx] = selection_vector[idx];