This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 35fccfa299b3c77d40a16abc90a749e685a2ccd1
Author: Pxl <pxl...@qq.com>
AuthorDate: Fri Sep 6 16:22:34 2024 +0800
[Chore](agg-state) modify be exec version comments and catch exception on
memtable insert (#40465)
## Proposed changes
modify be exec version comments and catch exception on memtable insert
---
be/src/agent/be_exec_version_manager.cpp | 4 ++--
be/src/agent/be_exec_version_manager.h | 3 +--
be/src/olap/memtable.cpp | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/be/src/agent/be_exec_version_manager.cpp
b/be/src/agent/be_exec_version_manager.cpp
index 13edb1e5bc2..32cbe569892 100644
--- a/be/src/agent/be_exec_version_manager.cpp
+++ b/be/src/agent/be_exec_version_manager.cpp
@@ -69,7 +69,7 @@ void BeExecVersionManager::check_agg_state_compatibility(int
current_be_exec_ver
* 3: start from doris 2.0.0 (by some mistakes)
* a. aggregation function do not serialize bitmap to string.
* b. support window funnel mode.
- * 4: start from doris 2.1.0
+ * 4/5: start from doris 2.1.0
* a. ignore this line, window funnel mode should be enabled from 2.0.
* b. array contains/position/countequal function return nullable in less
situations.
* c. cleared old version of Version 2.
@@ -79,7 +79,7 @@ void BeExecVersionManager::check_agg_state_compatibility(int
current_be_exec_ver
* g. do local merge of remote runtime filter
* h. "now": ALWAYS_NOT_NULLABLE -> DEPEND_ON_ARGUMENTS
*
- * 5: start from doris 3.0.0
+ * 7: start from doris 3.0.0
* a. change the impl of percentile (need fix)
* b. clear old version of version 3->4
* c. change FunctionIsIPAddressInRange from AlwaysNotNullable to
DependOnArguments
diff --git a/be/src/agent/be_exec_version_manager.h
b/be/src/agent/be_exec_version_manager.h
index 34cdbbb4b74..16092197a3a 100644
--- a/be/src/agent/be_exec_version_manager.h
+++ b/be/src/agent/be_exec_version_manager.h
@@ -25,14 +25,13 @@
namespace doris {
-/// functional
constexpr inline int BITMAP_SERDE = 3;
constexpr inline int USE_NEW_SERDE = 4; // release on DORIS version 2.1
constexpr inline int OLD_WAL_SERDE = 3; // use to solve compatibility
issues, see pr #32299
constexpr inline int AGG_FUNCTION_NULLABLE = 5; // change some agg nullable
property: PR #37215
constexpr inline int VARIANT_SERDE = 6; // change variant serde to fix
PR #38413
constexpr inline int AGGREGATION_2_1_VERSION =
- 4; // some aggregation changed the data format after this version
+ 5; // some aggregation changed the data format after this version
class BeExecVersionManager {
public:
diff --git a/be/src/olap/memtable.cpp b/be/src/olap/memtable.cpp
index a8084748e5a..f7a9f0c1db0 100644
--- a/be/src/olap/memtable.cpp
+++ b/be/src/olap/memtable.cpp
@@ -190,7 +190,7 @@ Status MemTable::insert(const vectorized::Block*
input_block,
if (_keys_type != KeysType::DUP_KEYS) {
// there may be additional intermediate columns in input_block
// we only need columns indicated by column offset in the output
- _init_agg_functions(&clone_block);
+ RETURN_IF_CATCH_EXCEPTION(_init_agg_functions(&clone_block));
}
if (_tablet_schema->has_sequence_col()) {
if (_is_partial_update) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
