Merge branch 'master' into pg_constraint

cmu-db · Jul 1, 2018 · fe5697e · fe5697e
2 parents ad827a2 + 6cc5559
commit fe5697e
Show file tree

Hide file tree

Showing 47 changed files with 3 additions and 13,138 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -62,28 +62,6 @@ set_target_properties(peloton-bin PROPERTIES OUTPUT_NAME peloton)
 
 ##################################################################################
 
-# --[ Benchmarks
-
-# --[ tpcc
-file(GLOB_RECURSE tpcc_srcs ${PROJECT_SOURCE_DIR}/src/main/tpcc/*.cpp)
-add_executable(tpcc EXCLUDE_FROM_ALL ${tpcc_srcs})
-target_link_libraries(tpcc peloton)
-
-# --[ ycsb
-file(GLOB_RECURSE ycsb_srcs ${PROJECT_SOURCE_DIR}/src/main/ycsb/*.cpp)
-add_executable(ycsb EXCLUDE_FROM_ALL ${ycsb_srcs})
-target_link_libraries(ycsb peloton)
-
-# --[ sdbench
-file(GLOB_RECURSE sdbench_srcs ${PROJECT_SOURCE_DIR}/src/main/sdbench/*.cpp)
-add_executable(sdbench EXCLUDE_FROM_ALL ${sdbench_srcs})
-target_link_libraries(sdbench peloton)
-
-# --[ tpch
-file(GLOB_RECURSE tpch_srcs ${PROJECT_SOURCE_DIR}/src/main/tpch/*.cpp)
-add_executable(tpch EXCLUDE_FROM_ALL ${tpch_srcs})
-target_link_libraries(tpch peloton)
-
 # --[ logger
 #file(GLOB_RECURSE logger_srcs ${PROJECT_SOURCE_DIR}/src/main/logger/*.cpp)
 #list(APPEND logger_srcs ${ycsb_srcs})
@@ -96,16 +74,11 @@ target_link_libraries(tpch peloton)
 # --[ link to jemalloc
 set(EXE_LINK_LIBRARIES ${JEMALLOC_LIBRARIES})
 set(EXE_LINK_FLAGS "-Wl,--no-as-needed")
-set(EXE_LIST peloton-bin ycsb tpcc sdbench tpch)
+set(EXE_LIST peloton-bin)
 foreach(exe_name ${EXE_LIST})
     target_link_libraries(${exe_name} ${EXE_LINK_LIBRARIES})
     if (LINUX)
         set_target_properties(${exe_name} PROPERTIES LINK_FLAGS ${EXE_LINK_FLAGS})
     endif ()
 endforeach()
 
-# --[ benchmark
-
-add_custom_target(benchmark)
-add_dependencies(benchmark tpcc ycsb sdbench)
-
diff --git a/src/codegen/interpreter/bytecode_builder.cpp b/src/codegen/interpreter/bytecode_builder.cpp
@@ -488,7 +488,7 @@ void BytecodeBuilder::AnalyseFunction() {
     // which are labeled and explained below.
     for (llvm::BasicBlock::const_iterator instr_iterator = bb->begin();
          instr_iterator != bb->end(); ++instr_iterator, ++instruction_index) {
-      const llvm::Instruction *instruction = instr_iterator;
+      const llvm::Instruction *instruction = &(*instr_iterator);
 
       bool is_non_zero_gep = false;
       if (instruction->getOpcode() == llvm::Instruction::GetElementPtr &&
@@ -828,7 +828,7 @@ void BytecodeBuilder::TranslateFunction() {
     // Interate all instruction in the basic block
     for (llvm::BasicBlock::const_iterator instr_iterator = bb->begin();
          instr_iterator != bb->end(); ++instr_iterator) {
-      const llvm::Instruction *instruction = instr_iterator;
+      const llvm::Instruction *instruction = &(*instr_iterator);
 
       // Dispatch to the respective translator function
       switch (instruction->getOpcode()) {

diff --git a/src/include/benchmark/benchmark_common.h b/src/include/benchmark/benchmark_common.h
diff --git a/src/include/benchmark/logger/logger_configuration.h b/src/include/benchmark/logger/logger_configuration.h
diff --git a/src/include/benchmark/logger/logger_workload.h b/src/include/benchmark/logger/logger_workload.h
diff --git a/src/include/benchmark/peloton/main.h b/src/include/benchmark/peloton/main.h