From 40ee83640d925a80d37916d0d7cd9db57db07775 Mon Sep 17 00:00:00 2001 From: luozihao <1165977584@qq.com> Date: Sat, 27 Nov 2021 21:11:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=87=E7=BA=A7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gausskernel/process/postmaster/pgarch.cpp | 2 +- .../rollback_catalog_maindb_92_300.sql | 3 ++- .../rollback_catalog_otherdb_92_300.sql | 3 ++- .../upgrade-post_catalog_maindb_92_300.sql | 4 +++- .../upgrade-post_catalog_otherdb_92_300.sql | 4 +++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/gausskernel/process/postmaster/pgarch.cpp b/src/gausskernel/process/postmaster/pgarch.cpp index 35426e162..57c4c4f1b 100644 --- a/src/gausskernel/process/postmaster/pgarch.cpp +++ b/src/gausskernel/process/postmaster/pgarch.cpp @@ -439,7 +439,7 @@ static void pgarch_MainLoop(void) if (t_thrd.arch.pitr_task_last_lsn == InvalidXLogRecPtr) { initLastTaskLsn(); } - uint32 size; + uint32 size = 0; if (obs_archive_slot->archive_obs->media_type == ARCHIVE_OBS) { size = OBS_XLOG_SLICE_BLOCK_SIZE; } else if (obs_archive_slot->archive_obs->media_type == ARCHIVE_NAS) { diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_300.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_300.sql index be358abde..a77908e19 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_300.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_300.sql @@ -1 +1,2 @@ -DROP VIEW IF EXISTS pg_catalog.gs_archive_status; \ No newline at end of file +DROP VIEW IF EXISTS pg_catalog.gs_archive_status; +DROP FUNCTION IF EXISTS pg_catalog.gs_get_archive_status(); diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_300.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_300.sql index be358abde..a77908e19 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_300.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_300.sql @@ -1 +1,2 @@ -DROP VIEW IF EXISTS pg_catalog.gs_archive_status; \ No newline at end of file +DROP VIEW IF EXISTS pg_catalog.gs_archive_status; +DROP FUNCTION IF EXISTS pg_catalog.gs_get_archive_status(); diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_300.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_300.sql index a21d7c85d..b30ab1cde 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_300.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_300.sql @@ -1 +1,3 @@ -CREATE OR REPLACE VIEW pg_catalog.gs_archive_status AS SELECT * FROM gs_get_archive_status(); \ No newline at end of file +CREATE FUNCTION pg_catalog.gs_get_archive_status(OUT archive_standby TEXT, OUT last_task_lsn TEXT, OUT "last_arch_time" TIMESTAMPTZ, OUT archive_path TEXT) +RETURNS SETOF RECORD LANGUAGE INTERNAL STABLE ROWS 1 STRICT as 'gs_get_archive_status'; +CREATE OR REPLACE VIEW pg_catalog.gs_archive_status AS SELECT * FROM gs_get_archive_status(); diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_300.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_300.sql index a21d7c85d..b30ab1cde 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_300.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_300.sql @@ -1 +1,3 @@ -CREATE OR REPLACE VIEW pg_catalog.gs_archive_status AS SELECT * FROM gs_get_archive_status(); \ No newline at end of file +CREATE FUNCTION pg_catalog.gs_get_archive_status(OUT archive_standby TEXT, OUT last_task_lsn TEXT, OUT "last_arch_time" TIMESTAMPTZ, OUT archive_path TEXT) +RETURNS SETOF RECORD LANGUAGE INTERNAL STABLE ROWS 1 STRICT as 'gs_get_archive_status'; +CREATE OR REPLACE VIEW pg_catalog.gs_archive_status AS SELECT * FROM gs_get_archive_status();