zpc_gitlink
/
openGauss-server
forked from huawei/openGauss-server
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!1392 修复视图时间戳出错的问题 

Merge pull request !1392 from Cross-罗/new_view
This commit is contained in:
opengauss-bot 2022-01-18 13:13:15 +00:00 committed by Gitee
parent f5e1bf0ef7 f2c925df9a
commit c3b98cd084
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gausskernel/process/postmaster/pgarch.cpp
View File

@ -698,7 +698,7 @@ static inline void pgarch_UpdateArchiveLastLsn(XLogRecPtr targetLsn)
t_thrd.arch.last_arch_time = TIME_GET_MILLISEC(tv);
t_thrd.arch.pitr_task_last_lsn = targetLsn;
g_instance.archive_obs_cxt.pitr_task_last_lsn = t_thrd.arch.pitr_task_last_lsn;
g_instance.archive_obs_cxt.last_arch_time = t_thrd.arch.last_arch_time;
g_instance.archive_obs_cxt.last_arch_timestamp = GetCurrentTimestamp();
}
/*
@ -1291,7 +1291,7 @@ Datum gs_get_archive_status(PG_FUNCTION_ARGS)
int ret = 0;
Datum values[ARCHIVE_STATUS_COLS];
XLogRecPtr last_arch_lsn = g_instance.archive_obs_cxt.pitr_task_last_lsn;
long last_arch_time = g_instance.archive_obs_cxt.last_arch_time;
long last_arch_time = g_instance.archive_obs_cxt.last_arch_timestamp;
/* get the ip address of standby */
char remoteip[IP_LEN] = {0};
errno_t rc = strncpy_s(remoteip, IP_LEN, (char *)walsnd->wal_sender_channel.remotehost, IP_LEN - 1);

2
src/gausskernel/process/threadpool/knl_instance.cpp
View File

@ -489,7 +489,7 @@ static void knl_g_archive_obs_init(knl_g_archive_obs_context *archive_obs_cxt)
archive_obs_cxt->archive_slot = (ReplicationSlot*)MemoryContextAllocZero(
INSTANCE_GET_MEM_CXT_GROUP(MEMORY_CONTEXT_STORAGE), sizeof(ReplicationSlot));
archive_obs_cxt->sync_walsender_idx = -1;
archive_obs_cxt->last_arch_time = 0;
archive_obs_cxt->last_arch_timestamp = 0;
archive_obs_cxt->pitr_task_last_lsn = InvalidXLogRecPtr;
}

2
src/include/knl/knl_instance.h
View File

@ -738,7 +738,7 @@ typedef struct knl_g_archive_obs_context {
/* used to show the archive status */
volatile int sync_walsender_idx;
volatile long last_arch_time;
volatile long last_arch_timestamp;
volatile XLogRecPtr pitr_task_last_lsn;
/*