diff --git a/CMakeLists.txt b/CMakeLists.txt index 820f189a451bc81c7161d21ef5d349d293072e8c..b62f73b27959c21764e9a96707e197de11cdec22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,9 +10,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_CXX_STANDARD 17) # set(CMAKE_CXX_FLAGS "-Wall -O3 -g") -set(CMAKE_CXX_FLAGS_DEFAULT "-O3 -DNDEBUG -w -march=native fopenmp -flto=50") # 评测机的编译选项 -set(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb3 -Wall -fopenmp") -set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -w -march=native -fopenmp -flto=50") +set(CMAKE_CXX_FLAGS_DEFAULT "-O3 -DNDEBUG -w -march=native -flto=50") # 评测机的编译选项 +set(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb3 -Wall") +set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -w -march=native -flto=50") # 如果没有设置 CMAKE_BUILD_TYPE,使用自定义的 DEFALT(评测机) if(NOT CMAKE_BUILD_TYPE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 58109e030d4ac99bc2bdfd4264a6282fa2e19b1a..1b1822bc33268e9a5a6292d93378ba5bb59ded8e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,7 +13,7 @@ add_subdirectory(common) add_subdirectory(replacer) add_subdirectory(transaction) add_subdirectory(recovery) -add_subdirectory(test) +# add_subdirectory(test) target_link_libraries(parser execution pthread) diff --git a/src/execution/execution_sort.h b/src/execution/execution_sort.h index f62a082ff10120e4dbd8679756c23ae940dc597a..8c69c0b0765247a42be56199856fdcf37e3fb2f5 100644 --- a/src/execution/execution_sort.h +++ b/src/execution/execution_sort.h @@ -67,7 +67,8 @@ public: // 模拟mergeä¸çš„æ–‡ä»¶æ“作 为了过测试点,让其慢于index // std::this_thread::sleep_for(std::chrono::milliseconds(200)); - __gnu_parallel::sort(value_cache_.begin(), value_cache_.end(), [&](const auto &l, const auto &r) -> bool { + // __gnu_parallel::sort(value_cache_.begin(), value_cache_.end(), [&](const auto &l, const auto &r) -> bool { + sort(value_cache_.begin(), value_cache_.end(), [&](const auto &l, const auto &r) -> bool { if (is_desc_) { // é™åºæŽ’列 return l.first.CompareGreaterThan(r.first) == CmpBool::CmpTrue; } else { // å‡åºæŽ’列 diff --git a/test.bash b/test.bash index 93915ad642f33900e21d4faf94c6738a41c6fb49..f27fff7f348aaa70e5fad02408cec04b935c2134 100755 --- a/test.bash +++ b/test.bash @@ -6,7 +6,7 @@ bash ../build.sh release # 使用release模å¼ç¼–译 # åŽå°å¯åЍæœåŠ¡å™¨ï¼Œå¹¶å°†è¾“å‡ºé‡å®šå‘到logæ–‡ä»¶ä¸ echo "start server" ./bin/rmdb test > rmdb_server.log 2>&1 & -sleep 0.5 +sleep 3 # 开始计时 START_TIME=`date +%s`