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

!2639 适配dms修改drc版本号判断逻辑

Browse Source 
Merge pull request !2639 from 胡习林/master
This commit is contained in:
opengauss-bot
2022-12-16 10:56:54 +00:00
committed by Gitee
parent baca9249e1 689c0d8783
commit 9d9fd46e69
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gausskernel/ddes/adapter/ss_dms_callback.cpp
View File

@ -646,7 +646,7 @@ static char* CBGetPage(dms_buf_ctrl_t *buf_ctrl)
return (char *)BufHdrGetBlock(buf_desc); return (char *)BufHdrGetBlock(buf_desc);
} }
static int CBInvalidatePage(void *db_handle, char pageid[DMS_PAGEID_SIZE], unsigned long long ver) static int CBInvalidatePage(void *db_handle, char pageid[DMS_PAGEID_SIZE], unsigned int ver)
{ {
bool valid = false; bool valid = false;
int buf_id; int buf_id;
@ -682,11 +682,11 @@ static int CBInvalidatePage(void *db_handle, char pageid[DMS_PAGEID_SIZE], unsig
if (valid) { if (valid) {
(void)LWLockAcquire(buf_desc->content_lock, LW_EXCLUSIVE); (void)LWLockAcquire(buf_desc->content_lock, LW_EXCLUSIVE);
buf_ctrl = GetDmsBufCtrl(buf_id); buf_ctrl = GetDmsBufCtrl(buf_id);
if (ver >= buf_ctrl->ver) { if (ver == buf_ctrl->ver) {
buf_ctrl->lock_mode = (unsigned char)DMS_LOCK_NULL; buf_ctrl->lock_mode = (unsigned char)DMS_LOCK_NULL;
} else { } else {
ereport(WARNING, (errmodule(MOD_DMS), ereport(WARNING, (errmodule(MOD_DMS),
errmsg("[CBInvalidatePage] invalid ver:%llu, buf_ctrl ver:%llu", ver, buf_ctrl->ver))); errmsg("[CBInvalidatePage] invalid ver:%u, buf_ctrl ver:%u", ver, buf_ctrl->ver)));
ret = DMS_ERROR; ret = DMS_ERROR;
} }
LWLockRelease(buf_desc->content_lock); LWLockRelease(buf_desc->content_lock);
@ -1132,7 +1132,7 @@ static int CBConfirmOwner(void *db_handle, char *pageid, unsigned char *lock_mod
} }
static int CBConfirmConverting(void *db_handle, char *pageid, unsigned char smon_chk, static int CBConfirmConverting(void *db_handle, char *pageid, unsigned char smon_chk,
unsigned char *lock_mode, unsigned long long *edp_map, unsigned long long *lsn, unsigned long long *ver) unsigned char *lock_mode, unsigned long long *edp_map, unsigned long long *lsn, unsigned int *ver)
{ {
BufferDesc *buf_desc = NULL; BufferDesc *buf_desc = NULL;
bool valid; bool valid;

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

@ -268,7 +268,7 @@ typedef struct st_dms_buf_ctrl {
unsigned long long edp_scn; // set when become edp, lastest scn when page becomes edp unsigned long long edp_scn; // set when become edp, lastest scn when page becomes edp
unsigned long long edp_map; // records edp instance unsigned long long edp_map; // records edp instance
long long last_ckpt_time; // last time when local edp page is added to group. long long last_ckpt_time; // last time when local edp page is added to group.
unsigned long long ver; unsigned int ver;
#ifdef OPENGAUSS #ifdef OPENGAUSS
int buf_id; int buf_id;
unsigned int state; unsigned int state;
@ -337,6 +337,7 @@ typedef enum en_dms_log_id {
/* /*
* lock mode in DMS, we use it to coordinate concurrent access among different instances. * lock mode in DMS, we use it to coordinate concurrent access among different instances.
* !!!!Attention Do not modify its order
*/ */
typedef enum en_dms_lock_mode { typedef enum en_dms_lock_mode {
DMS_LOCK_NULL = 0, DMS_LOCK_NULL = 0,
@ -458,7 +459,7 @@ typedef int(*dms_save_list_stable)(void *db_handle, unsigned long long list_stab
typedef int(*dms_get_dms_status)(void *db_handle); typedef int(*dms_get_dms_status)(void *db_handle);
typedef void(*dms_set_dms_status)(void *db_handle, int status); typedef void(*dms_set_dms_status)(void *db_handle, int status);
typedef int(*dms_confirm_converting)(void *db_handle, char *pageid, unsigned char smon_chk, typedef int(*dms_confirm_converting)(void *db_handle, char *pageid, unsigned char smon_chk,
unsigned char *lock_mode, unsigned long long *edp_map, unsigned long long *lsn, unsigned long long *ver); unsigned char *lock_mode, unsigned long long *edp_map, unsigned long long *lsn, unsigned int *ver);
typedef int(*dms_confirm_owner)(void *db_handle, char *pageid, unsigned char *lock_mode, unsigned char *is_edp, typedef int(*dms_confirm_owner)(void *db_handle, char *pageid, unsigned char *lock_mode, unsigned char *is_edp,
unsigned long long *lsn); unsigned long long *lsn);
typedef int(*dms_flush_copy)(void *db_handle, char *pageid); typedef int(*dms_flush_copy)(void *db_handle, char *pageid);
@ -494,7 +495,7 @@ typedef unsigned char(*dms_page_is_dirty)(dms_buf_ctrl_t *buf_ctrl);
typedef void(*dms_leave_local_page)(void *db_handle, dms_buf_ctrl_t *buf_ctrl); typedef void(*dms_leave_local_page)(void *db_handle, dms_buf_ctrl_t *buf_ctrl);
typedef void(*dms_get_pageid)(dms_buf_ctrl_t *buf_ctrl, char **pageid, unsigned int *size); typedef void(*dms_get_pageid)(dms_buf_ctrl_t *buf_ctrl, char **pageid, unsigned int *size);
typedef char *(*dms_get_page)(dms_buf_ctrl_t *buf_ctrl); typedef char *(*dms_get_page)(dms_buf_ctrl_t *buf_ctrl);
typedef int (*dms_invalidate_page)(void *db_handle, char pageid[DMS_PAGEID_SIZE], unsigned long long ver); typedef int (*dms_invalidate_page)(void *db_handle, char pageid[DMS_PAGEID_SIZE], unsigned int ver);
typedef void *(*dms_get_db_handle)(unsigned int *db_handle_index); typedef void *(*dms_get_db_handle)(unsigned int *db_handle_index);
typedef void *(*dms_stack_push_cr_cursor)(void *db_handle); typedef void *(*dms_stack_push_cr_cursor)(void *db_handle);
typedef void (*dms_stack_pop_cr_cursor)(void *db_handle); typedef void (*dms_stack_pop_cr_cursor)(void *db_handle);
@ -759,7 +760,7 @@ typedef struct st_dms_profile {
#define DMS_LOCAL_MINOR_VER_WEIGHT 1000 #define DMS_LOCAL_MINOR_VER_WEIGHT 1000
#define DMS_LOCAL_MAJOR_VERSION 0 #define DMS_LOCAL_MAJOR_VERSION 0
#define DMS_LOCAL_MINOR_VERSION 0 #define DMS_LOCAL_MINOR_VERSION 0
#define DMS_LOCAL_VERSION 35 #define DMS_LOCAL_VERSION 36
#ifdef __cplusplus #ifdef __cplusplus
} }