Merge branch 'master' into fix-complex-nested-add-regress

amorynan · Nov 16, 2023 · 18caea5 · 18caea5
2 parents ab4d370 + 754ca1f
commit 18caea5
Show file tree

Hide file tree

Showing 115 changed files with 2,921 additions and 1,325 deletions.
diff --git 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
diff --git a/be/src/common/status.cpp b/be/src/common/status.cpp
@@ -17,6 +17,11 @@
 #include "service/backend_options.h"
 
 namespace doris {
+namespace ErrorCode {
+
+ErrorCodeState error_states[MAX_ERROR_CODE_DEFINE_NUM];
+ErrorCodeInitializer error_code_init;
+} // namespace ErrorCode
 
 void Status::to_thrift(TStatus* s) const {
     s->error_msgs.clear();