diff --git a/src/gausskernel/ddes/ddes_commit_id b/src/gausskernel/ddes/ddes_commit_id
index 556dee8b1..8a1c0e03c 100644
--- a/src/gausskernel/ddes/ddes_commit_id
+++ b/src/gausskernel/ddes/ddes_commit_id
@@ -1,3 +1,3 @@
-dms_commit_id=763fb89fcc19dd53068cd0abc2bf0ce29ab4f0dd
+dms_commit_id=84674f30f4b8183587871b459ef17b78a302bd26
 dss_commit_id=41ddc77da33f1ff6e513bff77aaf31ff7bdcf0c6
-cbb_commit_id=f0b4f881b1c957b9bfe90176c6bbe5336304ca79
\ No newline at end of file
+cbb_commit_id=4f22a6ccacd30e17661bd21464de86f94107a1a5
\ No newline at end of file
diff --git a/src/include/ddes/dms/dms_api.h b/src/include/ddes/dms/dms_api.h
index 60a956aa5..aae30388c 100644
--- a/src/include/ddes/dms/dms_api.h
+++ b/src/include/ddes/dms/dms_api.h
@@ -32,7 +32,7 @@ extern "C" {
 #define DMS_LOCAL_MINOR_VER_WEIGHT  1000
 #define DMS_LOCAL_MAJOR_VERSION     0
 #define DMS_LOCAL_MINOR_VERSION     0
-#define DMS_LOCAL_VERSION           127
+#define DMS_LOCAL_VERSION           128
 
 #define DMS_SUCCESS 0
 #define DMS_ERROR (-1)
@@ -823,7 +823,7 @@ typedef int(*dms_get_open_status)(void *db_handle);
 typedef void (*dms_reform_set_dms_role)(void *db_handle, unsigned int reformer_id);
 typedef void (*dms_reset_user)(void *db_handle, unsigned long long list_in);
 typedef int (*dms_drc_xa_res_rebuild)(void *db_handle, unsigned char thread_index, unsigned char parall_num);
-typedef void (*dms_reform_shrink_xa_rms)(unsigned char undo_seg_id);
+typedef void (*dms_reform_shrink_xa_rms)(void *db_handle, unsigned char undo_seg_id);
 typedef void (*dms_ckpt_unblock_rcy_local)(void *db_handle, unsigned long long list_in);
 
 // for openGauss
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index 08ea46778..f93d52724 100755
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -478,12 +478,12 @@ const int MAX_COMPACTION_THREAD_NUM = 10;
 #define NUM_DMS_PRIO_CNT 4
 #define NUM_DMS_RECV_THREAD_CNT (g_instance.attr.attr_storage.dms_attr.channel_count * \
     (g_instance.attr.attr_storage.dms_attr.inst_count - 1) * NUM_DMS_PRIO_CNT)
-#define NUM_DMS_MAX_WORK_THREAD_PROCS (128)
+#define NUM_DMS_MAX_WORK_THREAD_PROCS (g_instance.attr.attr_storage.dms_attr.work_thread_pool_max_cnt)
 #define NUM_DMS_WORK_SCHEDULER_PROC (1)
-#define NUM_DMS_RDMA_THREAD_PROCS (g_instance.attr.attr_storage.dms_attr.work_thread_count == 0 ? \
+#define NUM_DMS_RDMA_THREAD_PROCS (g_instance.attr.attr_storage.dms_attr.work_thread_pool_max_cnt != 0 ? \
     NUM_DMS_MAX_WORK_THREAD_PROCS * 2 + NUM_DMS_WORK_SCHEDULER_PROC : \
     g_instance.attr.attr_storage.dms_attr.work_thread_count * 2)
-#define NUM_DMS_WORK_THREAD_PROCS (g_instance.attr.attr_storage.dms_attr.work_thread_count == 0 ? \
+#define NUM_DMS_WORK_THREAD_PROCS (g_instance.attr.attr_storage.dms_attr.work_thread_pool_max_cnt != 0 ? \
     NUM_DMS_MAX_WORK_THREAD_PROCS + NUM_DMS_WORK_SCHEDULER_PROC : \
     g_instance.attr.attr_storage.dms_attr.work_thread_count)
 #define NUM_DMS_CALLBACK_PROCS \