Merge branch 'master' into fix_udf_with_explode

zhangstar333 · Sep 7, 2023 · 609ff82 · 609ff82
2 parents ec9dbd6 + fdb7a44
commit 609ff82
Show file tree

Hide file tree

Showing 105 changed files with 3,278 additions and 2,705 deletions.
diff --git a/be/src/common/config.cpp b/be/src/common/config.cpp
@@ -1082,6 +1082,8 @@ DEFINE_Int32(fe_expire_duration_seconds, "60");
 
 DEFINE_Int32(grace_shutdown_wait_seconds, "120");
 
+DEFINE_Int16(bitmap_serialize_version, "1");
+
 #ifdef BE_TEST
 // test s3
 DEFINE_String(test_s3_resource, "resource");

diff --git a/be/src/common/config.h b/be/src/common/config.h
@@ -168,7 +168,7 @@ DECLARE_mString(process_full_gc_size);
 // used memory and the exec_mem_limit will be canceled.
 // If false, cancel query when the memory used exceeds exec_mem_limit, same as before.
 DECLARE_mBool(enable_query_memory_overcommit);
-
+//waibibabu
 // gc will release cache, cancel task, and task will wait for gc to release memory,
 // default gc strategy is conservative, if you want to exclude the interference of gc, let it be true
 DECLARE_mBool(disable_memory_gc);
@@ -1150,6 +1150,9 @@ DECLARE_Int32(fe_expire_duration_seconds);
 // During this period, FE will not send any queries to BE and waiting for all running queries to stop.
 DECLARE_Int32(grace_shutdown_wait_seconds);
 
+// BitmapValue serialize version.
+DECLARE_Int16(bitmap_serialize_version);
+
 #ifdef BE_TEST
 // test s3
 DECLARE_String(test_s3_resource);

diff --git a/be/src/common/status.h b/be/src/common/status.h
@@ -113,7 +113,6 @@ E(NOT_INITIALIZED, -236);
 E(ALREADY_CANCELLED, -237);
 E(TOO_MANY_SEGMENTS, -238);
 E(ALREADY_CLOSED, -239);
-E(NEED_SEND_AGAIN, -240);
 E(CE_CMD_PARAMS_ERROR, -300);
 E(CE_BUFFER_TOO_SMALL, -301);
 E(CE_CMD_NOT_VALID, -302);
@@ -285,7 +284,6 @@ constexpr bool capture_stacktrace(int code) {
         && code != ErrorCode::TOO_MANY_VERSION
         && code != ErrorCode::ALREADY_CANCELLED
         && code != ErrorCode::ALREADY_CLOSED
-        && code != ErrorCode::NEED_SEND_AGAIN
         && code != ErrorCode::PUSH_TRANSACTION_ALREADY_EXIST
         && code != ErrorCode::BE_NO_SUITABLE_VERSION
         && code != ErrorCode::CUMULATIVE_NO_SUITABLE_VERSION
@@ -313,7 +311,9 @@ constexpr bool capture_stacktrace(int code) {
         && code != ErrorCode::KEY_NOT_FOUND
         && code != ErrorCode::KEY_ALREADY_EXISTS
         && code != ErrorCode::CANCELLED
-        && code != ErrorCode::UNINITIALIZED;
+        && code != ErrorCode::UNINITIALIZED
+        && code != ErrorCode::PIP_WAIT_FOR_RF
+        && code != ErrorCode::PIP_WAIT_FOR_SC;
 }
 // clang-format on
 
@@ -427,7 +427,6 @@ class Status {
     ERROR_CTOR(DataQualityError, DATA_QUALITY_ERROR)
     ERROR_CTOR(NotAuthorized, NOT_AUTHORIZED)
     ERROR_CTOR(HttpError, HTTP_ERROR)
-    ERROR_CTOR(NeedSendAgain, NEED_SEND_AGAIN)
 #undef ERROR_CTOR
 
     template <int code>