Merge branch 'feature_4_3_2_bp1_fix_obkv_bug' into '4_3_2_release'

oceanbase · Dec 6, 2024 · f877a49 · f877a49
1 parent 220bf9d
commit f877a49
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/obproxy/proxy/rpc/engine/ob_rpc_req_operator_ls.cpp b/src/obproxy/proxy/rpc/engine/ob_rpc_req_operator_ls.cpp
@@ -230,9 +230,9 @@ int ObProxyRpcReqLSOp::generate_normal_resp(ObTableLSOpResult &ls_op_result,
                                             ObRpcResponse *&last_response)
 {
   int ret = OB_SUCCESS;
-  int64_t *all_ls_op_index_arr;                                           // record which ls resp belongs
-  int64_t *all_tablet_op_index_arr;                                       // record which tablet resp belongs
-  int64_t *all_single_op_index_arr;                                       // record which single resp belongs
+  int64_t *all_ls_op_index_arr = NULL;                                           // record which ls resp belongs
+  int64_t *all_tablet_op_index_arr = NULL;                                       // record which tablet resp belongs
+  int64_t *all_single_op_index_arr = NULL;                                       // record which single resp belongs
   LS_TABLET_ID_MAP &ls_id_tablet_id_map = ls_request.get_ls_id_tablet_id_map(); // the map record ls id of all tabelt_id
   TABLET_ID_INDEX_MAP &tablet_id_map = ls_request.get_tablet_id_index_map(); // the map record original index of all  single op
 
@@ -363,6 +363,7 @@ void ObProxyRpcReqLSOp::free_index_arr(int64_t *&arr, const int64_t count)
 {
   if (OB_NOT_NULL(arr)) {
     op_fixed_mem_free(arr, sizeof(int64_t) * count);
+    arr = NULL; //avoid double free
   }
 }
 

diff --git a/src/obproxy/proxy/rpc/ob_rpc_request_sm.cpp b/src/obproxy/proxy/rpc/ob_rpc_request_sm.cpp
@@ -1385,6 +1385,10 @@ int ObRpcRequestSM::process_cluster_resource(void *data)
 
       // store cluster version into client net
       client_net_handler->set_cluster_version(cluster_resource_->cluster_version_);
+      if (OB_NOT_NULL(rpc_req_)) {
+        //update rpc_req cluster version by new info
+        rpc_req_->set_cluster_version(cluster_resource_->cluster_version_);
+      }
     }
     if (OB_SUCC(ret)) {
       if (OB_FAIL(update_cached_cluster_resource())) {