Revert "[DNM] some optimizations to shuffle's split function (oap-pro…

…ject#839)" This reverts commit 8aad39a.
zhouyuan · May 9, 2022 · ec532fc · ec532fc
1 parent ce68376
commit ec532fc
Show file tree

Hide file tree

Showing 7 changed files with 244 additions and 513 deletions.
diff --git a/native-sql-engine/cpp/CMakeLists.txt b/native-sql-engine/cpp/CMakeLists.txt
@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
 project(spark_columnar_plugin)
 
-#add_compile_options(-g)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
 set(root_directory ${PROJECT_BINARY_DIR})
 add_subdirectory(src)
diff --git a/native-sql-engine/cpp/src/CMakeLists.txt b/native-sql-engine/cpp/src/CMakeLists.txt
@@ -440,7 +440,6 @@ endif()
 
 if(BENCHMARKS)
   find_package(GTest)
-  find_package(benchmark REQUIRED)
   add_definitions(-DBENCHMARK_FILE_PATH="file://${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/source_files/")
 macro(package_add_benchmark TESTNAME)
   add_executable(${TESTNAME} ${ARGN})
@@ -452,12 +451,7 @@ macro(package_add_benchmark TESTNAME)
   )
   set_target_properties(${TESTNAME} PROPERTIES FOLDER tests)
 endmacro()
-macro(package_add_gbenchmark TESTNAME)
-  add_executable(${TESTNAME} ${ARGN})
-  target_link_libraries(${TESTNAME} benchmark::benchmark spark_columnar_jni parquet ${CMAKE_THREAD_LIBS_INIT})
-  target_include_directories(${TESTNAME} PUBLIC ${source_root_directory})
-  set_target_properties(${TESTNAME} PROPERTIES FOLDER tests)
-endmacro()
+  include(GoogleTest)
   ENABLE_TESTING()
   add_custom_target(benchmark ${CMAKE_CTEST_COMMAND} -R BenchmarkArrowCompute --output-on-failure)
   add_subdirectory(benchmarks)

diff --git a/native-sql-engine/cpp/src/benchmarks/CMakeLists.txt b/native-sql-engine/cpp/src/benchmarks/CMakeLists.txt
@@ -4,5 +4,5 @@ package_add_benchmark(BenchmarkArrowComputeWSCG arrow_compute_benchmark_wscg.cc)
 package_add_benchmark(BenchmarkArrowComputeSort arrow_compute_benchmark_sort.cc)
 package_add_benchmark(BenchmarkArrowComputeHashAggregate arrow_compute_benchmark_hash_aggregate.cc)
 #package_add_benchmark(BenchmarkArrowComputeBigScale arrow_compute_benchmark_big_scale.cc)
-package_add_gbenchmark(BenchmarkShuffleSplit shuffle_split_benchmark.cc)
+package_add_benchmark(BenchmarkShuffleSplit shuffle_split_benchmark.cc)
 package_add_benchmark(BenchmarkColumnarToRow columnar_to_row_converter_benchmark.cc)