hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!3040 社区dss/dms commit点更新

Browse Source 
Merge pull request !3040 from 陈志凯/master
This commit is contained in:
opengauss-bot
2023-03-08 01:06:21 +00:00
committed by Gitee
parent 918d319bd1 8148d0a19d
commit 9e748bc12d
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gausskernel/ddes/ddes_commit_id
View File

@ -1,2 +1,2 @@
dms_commit_id=4dad7c5286ed4a1975f5e1e101b0c533cbb00880
dss_commit_id=38705ea061f9f701c5dd930518edfb320c8bccce
dms_commit_id=e3e57f04172da967232eb5ec593e5576ee1563a4
dss_commit_id=2b1567f18e8d78c0473b781b97cae963a06d1735

8
src/gausskernel/ddes/script/dss_contrl.sh
View File

@ -362,10 +362,10 @@ function Reg()
log "can't find inst id. Aborting."
exit 1
fi
dsscmd reghl -i ${LOCAL_INSTANCE_ID} -D ${DSS_HOME} >> /dev/null 2>&1
dsscmd reghl -D ${DSS_HOME} >> /dev/null 2>&1
if [[ $? != 0 ]]
then
log "dsscmd reghl -i ${LOCAL_INSTANCE_ID} -D ${DSS_HOME} fail."
log "dsscmd reghl -D ${DSS_HOME} fail."
exit 1
fi
log "register success."
@ -381,7 +381,7 @@ function Unreg()
fi
if [[ ${LOCAL_INSTANCE_ID} == ${INSTANCE_ID} ]]
then
dsscmd unreghl -i ${LOCAL_INSTANCE_ID} -D ${DSS_HOME} >> /dev/null 2>&1
dsscmd unreghl -D ${DSS_HOME} >> /dev/null 2>&1
else
pid=$(program_pid dssserver ${DSS_HOME})
if [[ -z ${pid} ]]
@ -394,7 +394,7 @@ function Unreg()
if [[ $? != 0 ]]
then
log "dsscmd kickh -i ${INSTANCE_ID} -D ${DSS_HOME} fail, or dsscmd unreghl -i ${LOCAL_INSTANCE_ID} -D ${DSS_HOME} fail."
log "dsscmd kickh -i ${INSTANCE_ID} -D ${DSS_HOME} fail, or dsscmd unreghl -D ${DSS_HOME} fail."
exit 1
fi
log "unregister ${INSTANCE_ID} success."

17
src/include/ddes/dms/dms_api.h
View File

@ -286,7 +286,13 @@ typedef struct st_dms_buf_ctrl {
unsigned char seg_fileno;
unsigned int seg_blockno;
#endif
}dms_buf_ctrl_t;
} dms_buf_ctrl_t;
typedef struct st_dms_ctrl_info {
dms_buf_ctrl_t ctrl;
unsigned long long lsn;
unsigned char is_dirty;
} dms_ctrl_info_t;
typedef enum en_dms_page_latch_mode {
DMS_PAGE_LATCH_MODE_S = 1,
@ -301,7 +307,7 @@ typedef enum en_dms_page_latch_mode {
#define DMS_ENTER_PAGE_TRY (unsigned char)8 // try to read from buffer, don't read from disk
#define DMS_ENTER_PAGE_LRU_STATS_SCAN (unsigned char)0x10 // add to stats LRU list
#define DMS_ENTER_PAGE_LRU_HIGH_AGE (unsigned char)0x20 // decrease possibility to be recycled of page
#define DMS_ENTER_PAGE_LOCAL (unsigned char)0x40 // check local page without redo log
#define DMS_ENTER_PAGE_LOCAL (unsigned char)0x40 // check local page without redo log, use carefully
#define DMS_ENTER_PAGE_REMOTE (unsigned char)0x80 // remote access mode
// pack read page parameters together
@ -486,6 +492,7 @@ typedef int(*dms_confirm_converting)(void *db_handle, char *pageid, unsigned cha
typedef int(*dms_confirm_owner)(void *db_handle, char *pageid, unsigned char *lock_mode, unsigned char *is_edp,
unsigned long long *lsn);
typedef int(*dms_flush_copy)(void *db_handle, char *pageid);
typedef int(*dms_need_flush)(void *db_handle, char *pageid);
typedef int(*dms_edp_lsn)(void *db_handle, char *pageid, unsigned long long *lsn);
typedef int(*dms_disk_lsn)(void *db_handle, char *pageid, unsigned long long *lsn);
typedef int(*dms_recovery)(void *db_handle, void *recovery_list, int is_reformer);
@ -573,7 +580,8 @@ typedef char *(*dms_display_pageid)(char *display_buf, unsigned int count, char
typedef char *(*dms_display_xid)(char *display_buf, unsigned int count, char *xid);
typedef char *(*dms_display_rowid)(char *display_buf, unsigned int count, char *rowid);
typedef int (*dms_drc_buf_res_rebuild)(void *db_handle);
typedef int (*dms_drc_buf_res_rebuild_parallel)(void *db_handle, unsigned char thread_index, unsigned char thread_num);
typedef int (*dms_drc_buf_res_rebuild_parallel)(void *db_handle, unsigned char thread_index, unsigned char thread_num,
unsigned char for_rebuild);
typedef unsigned char(*dms_ckpt_session)(void *db_handle);
typedef void (*dms_check_if_build_complete)(void *db_handle, unsigned int *build_complete);
typedef int (*dms_db_is_primary)(void *db_handle);
@ -622,6 +630,7 @@ typedef struct st_dms_callback {
dms_confirm_owner confirm_owner;
dms_confirm_converting confirm_converting;
dms_flush_copy flush_copy;
dms_need_flush need_flush;
dms_edp_lsn edp_lsn;
dms_disk_lsn disk_lsn;
dms_recovery recovery;
@ -803,7 +812,7 @@ typedef struct st_logger_param {
#define DMS_LOCAL_MINOR_VER_WEIGHT 1000
#define DMS_LOCAL_MAJOR_VERSION 0
#define DMS_LOCAL_MINOR_VERSION 0
#define DMS_LOCAL_VERSION 52
#define DMS_LOCAL_VERSION 54
#ifdef __cplusplus
}