From 8431361f524b85278b2c936154e842dcd69a9d97 Mon Sep 17 00:00:00 2001 From: dongning12 Date: Fri, 2 Aug 2024 15:40:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B5=84=E6=BA=90=E6=B1=A0=E5=8C=96?= =?UTF-8?q?=E3=80=91=E3=80=90=E5=90=8C=E6=AD=A5DMS=E7=82=B9=E3=80=918.2?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gausskernel/ddes/ddes_commit_id | 2 +- src/include/ddes/dms/dms_api.h | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/gausskernel/ddes/ddes_commit_id b/src/gausskernel/ddes/ddes_commit_id index 31cce690c..61d908823 100644 --- a/src/gausskernel/ddes/ddes_commit_id +++ b/src/gausskernel/ddes/ddes_commit_id @@ -1,3 +1,3 @@ -dms_commit_id=1e366d6a3ab36a7947d02d2664496d09e2a079ef +dms_commit_id=8b64ce46c8cfa9a978604b346b0d32b264c8ee6c dss_commit_id=083e52af8c7f965856f319554d6332b14f6b2c99 cbb_commit_id=49b0b0c664346a690c9fe9b537f264306dbdc46d diff --git a/src/include/ddes/dms/dms_api.h b/src/include/ddes/dms/dms_api.h index 1c2421034..c5b98f264 100644 --- a/src/include/ddes/dms/dms_api.h +++ b/src/include/ddes/dms/dms_api.h @@ -34,7 +34,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 163 +#define DMS_LOCAL_VERSION 164 #define DMS_SUCCESS 0 #define DMS_ERROR (-1) @@ -841,14 +841,16 @@ typedef void(*dms_stats_buf)(void *db_handle, dms_buf_ctrl_t *buf_ctrl, dms_buf_ typedef int(*dms_remove_buf_load_status)(dms_buf_ctrl_t *buf_ctrl, dms_buf_load_status_t dms_buf_load_status); typedef void(*dms_update_global_lsn)(void *db_handle, unsigned long long lamport_lsn); typedef void(*dms_update_global_scn)(void *db_handle, unsigned long long lamport_scn); -typedef void(*dms_update_node_lfn)(void *db_handle, unsigned long long lfn, char node_id); +typedef void(*dms_update_node_lfn)(void *db_handle, unsigned char node_id, unsigned long long node_lfn, + unsigned long long *node_data, unsigned int len); typedef void(*dms_update_page_lfn)(dms_buf_ctrl_t *buf_ctrl, unsigned long long lastest_lfn); typedef unsigned long long (*dms_get_page_lfn)(dms_buf_ctrl_t *buf_ctrl); typedef unsigned long long (*dms_get_page_scn)(dms_buf_ctrl_t *buf_ctrl); typedef unsigned long long(*dms_get_global_lfn)(void *db_handle); typedef unsigned long long(*dms_get_global_scn)(void *db_handle); typedef unsigned long long(*dms_get_global_lsn)(void *db_handle); -typedef unsigned long long(*dms_get_global_flushed_lfn)(void *db_handle); +typedef void(*dms_get_global_flushed_lfn)(void *db_handle, unsigned char *node_id, unsigned long long *node_lfn, + unsigned long long *node_data, unsigned int len); typedef int(*dms_read_local_page4transfer)(void *db_handle, char pageid[DMS_PAGEID_SIZE], dms_lock_mode_t mode, dms_buf_ctrl_t **buf_ctrl); typedef int(*dms_try_read_local_page)(void *db_handle, char pageid[DMS_PAGEID_SIZE], @@ -980,6 +982,8 @@ typedef void (*dms_set_online_list)(void *db_handle, unsigned long long online_l typedef int (*dms_standby_update_remove_node_ctrl)(void *db_handle, unsigned long long online_list); typedef int (*dms_standby_stop_thread)(void *db_handle, unsigned long long online_list, unsigned int reformer_id); typedef int (*dms_standby_reload_node_ctrl)(void *db_handle); +typedef int (*dms_standby_stop_server)(void *db_handle); +typedef int (*dms_standby_resume_server)(void *db_handle); typedef int (*dms_start_lrpl)(void *db_handle, int is_reformer); typedef int (*dms_stop_lrpl)(void *db_handle, int is_reformer); typedef int (*dms_az_switchover_demote_phase1)(void *db_handle); @@ -1169,6 +1173,8 @@ typedef struct st_dms_callback { dms_standby_update_remove_node_ctrl standby_update_remove_node_ctrl; dms_standby_stop_thread standby_stop_thread; dms_standby_reload_node_ctrl standby_reload_node_ctrl; + dms_standby_stop_server standby_stop_server; + dms_standby_resume_server standby_resume_server; dms_start_lrpl start_lrpl; dms_stop_lrpl stop_lrpl;