diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt index 941a5bb972..69cb447329 100644 --- a/be/CMakeLists.txt +++ b/be/CMakeLists.txt @@ -160,10 +160,11 @@ include (cmake/thirdparty.cmake) find_program(THRIFT_COMPILER thrift ${CMAKE_SOURCE_DIR}/bin) -option(BUILD_JAVA OFF) -option(BUILD_CPP_TESTS OFF) -option(STOP_BUILD_ON_WARNING OFF) -option(BUILD_LIBHDFSPP OFF) +set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) +set(BUILD_JAVA OFF) +set(BUILD_CPP_TESTS OFF) +set(STOP_BUILD_ON_WARNING OFF) +set(BUILD_LIBHDFSPP OFF) SET(PROTOBUF_HOME "$ENV{DORIS_THIRDPARTY}/installed") SET(SNAPPY_HOME "$ENV{DORIS_THIRDPARTY}/installed") SET(LZ4_HOME "$ENV{DORIS_THIRDPARTY}/installed") diff --git a/be/src/apache-orc b/be/src/apache-orc index e52ba9094d..d7975612de 160000 --- a/be/src/apache-orc +++ b/be/src/apache-orc @@ -1 +1 @@ -Subproject commit e52ba9094dd8fa3e86e6043e42d6d561fe092d7c +Subproject commit d7975612de8b9711a284af9d7cba5248c49f73b3 diff --git a/be/test/CMakeLists.txt b/be/test/CMakeLists.txt index 6d5f7c7c86..c119af01e8 100644 --- a/be/test/CMakeLists.txt +++ b/be/test/CMakeLists.txt @@ -59,6 +59,46 @@ list(REMOVE_ITEM UT_FILES ${CMAKE_CURRENT_SOURCE_DIR}/runtime/large_int_value_test.cpp ) +list(APPEND UT_FILES + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/MemoryInputStream.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/MemoryOutputStream.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestAttributes.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestBlockBuffer.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestBufferedOutputStream.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestBloomFilter.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestByteRle.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestByteRLEEncoder.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestColumnPrinter.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestColumnReader.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestColumnStatistics.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestCompression.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestDecompression.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestDecimal.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestDictionaryEncoding.cc + #${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestDriver.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestInt128.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestMurmur3.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestPredicateLeaf.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestPredicatePushdown.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestReader.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestRleDecoder.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestRleEncoder.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestRLEV2Util.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestSargsApplier.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestSearchArgument.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestStripeIndexStatistics.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestTimestampStatistics.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestTimezone.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestType.cc + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/test/TestWriter.cc +) + +include_directories( + ${CMAKE_SOURCE_DIR}/src/apache-orc/c++/src + ${CMAKE_BINARY_DIR}/src/apache-orc/c++/src + ${CMAKE_BINARY_DIR}/src/apache-orc/c++/include +) + add_executable(doris_be_test ${UT_FILES}) target_link_libraries(doris_be_test ${TEST_LINK_LIBS}) diff --git a/run-be-ut.sh b/run-be-ut.sh index 30d2dae48c..346d5cd1ec 100755 --- a/run-be-ut.sh +++ b/run-be-ut.sh @@ -400,6 +400,9 @@ fi # set LIBHDFS_OPTS for hadoop libhdfs export LIBHDFS_OPTS="${final_java_opt}" +# set ORC_EXAMPLE_DIR for orc unit tests +export ORC_EXAMPLE_DIR="${DORIS_HOME}/be/src/apache-orc/examples" + # set asan and ubsan env to generate core file export DORIS_HOME="${DORIS_TEST_BINARY_DIR}/" export ASAN_OPTIONS=symbolize=1:abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1:detect_container_overflow=0