From b4dc579280d07b71bf959b64aa23c0c60c6a28e5 Mon Sep 17 00:00:00 2001 From: gurkanindibay Date: Mon, 8 Jan 2024 10:47:49 +0300 Subject: [PATCH] Fixes review issues --- src/backend/distributed/commands/comment.c | 2 +- .../distributed/deparser/deparse_comment_stmts.c | 12 ++++++------ src/include/distributed/comment.h | 7 +------ 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/backend/distributed/commands/comment.c b/src/backend/distributed/commands/comment.c index e15b4cbec..da8f26acb 100644 --- a/src/backend/distributed/commands/comment.c +++ b/src/backend/distributed/commands/comment.c @@ -33,7 +33,7 @@ GetCommentPropagationCommands(Oid oid, char *objectName, ObjectType objectType) /* Get the comment for the database */ char *comment = GetCommentForObject(oid); - char *commentObjectType = ObjectTypeInfos[objectType].name; + char const *commentObjectType = ObjectTypeInfos[objectType]; /* Create the SQL command to propagate the comment to other nodes */ if (comment != NULL) diff --git a/src/backend/distributed/deparser/deparse_comment_stmts.c b/src/backend/distributed/deparser/deparse_comment_stmts.c index d102eb655..2bfb15908 100644 --- a/src/backend/distributed/deparser/deparse_comment_stmts.c +++ b/src/backend/distributed/deparser/deparse_comment_stmts.c @@ -29,12 +29,12 @@ #include "distributed/log_utils.h" -const ObjectTypeInfo ObjectTypeInfos[] = +const char *ObjectTypeInfos[] = { - [OBJECT_DATABASE] = { "DATABASE", T_String }, - [OBJECT_ROLE] = { "ROLE", T_String }, - [OBJECT_TSCONFIGURATION] = { "TEXT SEARCH CONFIGURATION", T_List }, - [OBJECT_TSDICTIONARY] = { "TEXT SEARCH DICTIONARY", T_List }, + [OBJECT_DATABASE] = "DATABASE", + [OBJECT_ROLE] = "ROLE", + [OBJECT_TSCONFIGURATION] = "TEXT SEARCH CONFIGURATION", + [OBJECT_TSDICTIONARY] = "TEXT SEARCH DICTIONARY", /* When support for propagating comments to new objects is introduced, an entry for each * statement type should be added to this list. The first element in each entry is the 'object_type' keyword @@ -66,7 +66,7 @@ DeparseCommentStmt(Node *node) errmsg("unknown object type"))); } - const char *objectType = ObjectTypeInfos[stmt->objtype].name; + const char *objectType = ObjectTypeInfos[stmt->objtype]; char *comment = stmt->comment != NULL ? quote_literal_cstr(stmt->comment) : "NULL"; diff --git a/src/include/distributed/comment.h b/src/include/distributed/comment.h index 2ee239a2a..7b3c0834a 100644 --- a/src/include/distributed/comment.h +++ b/src/include/distributed/comment.h @@ -15,13 +15,8 @@ #include "nodes/parsenodes.h" -typedef struct -{ - char *name; - int type; -} ObjectTypeInfo; -extern const ObjectTypeInfo ObjectTypeInfos[]; +extern const char *ObjectTypeInfos[]; extern List * GetCommentPropagationCommands(Oid oid, char *objectName, ObjectType