From 09d8dd20f3a77a0c9de24733cb61dfa1f6dc10b4 Mon Sep 17 00:00:00 2001 From: "song.wu" Date: Tue, 12 Nov 2024 11:37:17 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=20#IB3O0M=20fix=20code=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=87=A0=E5=A4=846.0.0=20=E4=B8=AD=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=EF=BC=88cherry=20picked=20commit=20from?= =?UTF-8?q?=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/backend/catalog/namespace.cpp | 2 +- src/gausskernel/process/postmaster/barrier_preparse.cpp | 2 -- src/lib/elog/elog.cpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/common/backend/catalog/namespace.cpp b/src/common/backend/catalog/namespace.cpp index d6a8fde89..57c50294c 100644 --- a/src/common/backend/catalog/namespace.cpp +++ b/src/common/backend/catalog/namespace.cpp @@ -306,7 +306,7 @@ Oid RangeVarGetRelidExtended(const RangeVar* relation, LOCKMODE lockmode, bool m if (isSupportSynonym) { pfree_ext(errDetail); errDetail = RelnameGetRelidExtended(relation->relname, &relId, refSynOid, detailInfo); - if (relId != NULL && OidIsValid(relId)) { + if (OidIsValid(relId)) { Oid namespaceId = get_rel_namespace(relId); LookupExplicitNamespace(get_namespace_name(namespaceId)); } diff --git a/src/gausskernel/process/postmaster/barrier_preparse.cpp b/src/gausskernel/process/postmaster/barrier_preparse.cpp index 9f318c9a9..f7dba7fbc 100644 --- a/src/gausskernel/process/postmaster/barrier_preparse.cpp +++ b/src/gausskernel/process/postmaster/barrier_preparse.cpp @@ -489,8 +489,6 @@ Datum gs_get_preparse_location(PG_FUNCTION_ARGS) bool nulls[3] = {0}; HeapTuple tuple; Datum result; - char location[MAXFNAMELEN * 3] = {0}; - errno_t rc = EOK; const int COLUMN_NUM = 3; tupdesc = CreateTemplateTupleDesc(COLUMN_NUM, false); diff --git a/src/lib/elog/elog.cpp b/src/lib/elog/elog.cpp index fc33eea61..7ae7df654 100644 --- a/src/lib/elog/elog.cpp +++ b/src/lib/elog/elog.cpp @@ -349,7 +349,7 @@ static void remove_oldest_log(const char *prefix_name, const char *log_path, int rc = snprintf_s(pathname, MAXPGPATH, MAXPGPATH - 1, "%s/%s", log_path, de->d_name); securec_check_ss_c(rc, "\0", "\0"); if (stat(pathname, &fst) < 0) { - printf(_("%s: could not stat file %s\n"), prefix_name, pathname, gs_strerror(errno)); + printf(_("%s: could not stat file %s! %s\n"), prefix_name, pathname, gs_strerror(errno)); continue; }