From 98bcf174c7a80ad96c2bfbb10b687d87115615a0 Mon Sep 17 00:00:00 2001 From: Yanwen Jin Date: Mon, 16 May 2022 12:06:30 -0700 Subject: [PATCH] Fix some build errors --- src/backend/columnar/columnar_tableam.c | 2 +- src/backend/distributed/commands/extension.c | 4 ++-- .../distributed/sql/downgrades/citus--11.2-1--11.1-1.sql | 2 +- src/include/distributed/commands.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/columnar/columnar_tableam.c b/src/backend/columnar/columnar_tableam.c index f82f236b7..86e5b5fea 100644 --- a/src/backend/columnar/columnar_tableam.c +++ b/src/backend/columnar/columnar_tableam.c @@ -2021,7 +2021,7 @@ columnar_tableam_init() NULL, &EnableVersionChecksColumnar, true, - PGC_USERSET, + PGC_SUSET, GUC_NO_SHOW_ALL, NULL, NULL, NULL); } diff --git a/src/backend/distributed/commands/extension.c b/src/backend/distributed/commands/extension.c index 12e66487a..dede6141c 100644 --- a/src/backend/distributed/commands/extension.c +++ b/src/backend/distributed/commands/extension.c @@ -984,7 +984,7 @@ AlterExtensionUpdateStmtObjectAddress(Node *node, bool missing_ok) * per given extension name and extension verision */ void -CreateExtensionWithVersion(const char *extname, const char *extVersion) +CreateExtensionWithVersion(const char *extname, char *extVersion) { CreateExtensionStmt *createExtensionStmt = makeNode(CreateExtensionStmt); @@ -1018,7 +1018,7 @@ CreateExtensionWithVersion(const char *extname, const char *extVersion) * per given extension name and updates extension verision */ void -AlterExtensionUpdateStmt(const char *extname, const char *extVersion) +AlterExtensionUpdateStmt(const char *extname, char *extVersion) { AlterExtensionStmt *alterExtensionStmt = makeNode(AlterExtensionStmt); diff --git a/src/backend/distributed/sql/downgrades/citus--11.2-1--11.1-1.sql b/src/backend/distributed/sql/downgrades/citus--11.2-1--11.1-1.sql index 8b8ccedeb..a42d24607 100644 --- a/src/backend/distributed/sql/downgrades/citus--11.2-1--11.1-1.sql +++ b/src/backend/distributed/sql/downgrades/citus--11.2-1--11.1-1.sql @@ -21,4 +21,4 @@ END$proc$; ALTER EXTENSION citus ADD FUNCTION citus_internal.upgrade_columnar_storage; ALTER EXTENSION citus ADD FUNCTION citus_internal.downgrade_columnar_storage; -ALTER EXTENSION citus ADD FUNCTION citus_internal.columnar_ensure_am_depends_catalog; \ No newline at end of file +ALTER EXTENSION citus ADD FUNCTION citus_internal.columnar_ensure_am_depends_catalog; diff --git a/src/include/distributed/commands.h b/src/include/distributed/commands.h index 7bec572bc..1f89e6544 100644 --- a/src/include/distributed/commands.h +++ b/src/include/distributed/commands.h @@ -205,8 +205,8 @@ extern ObjectAddress AlterExtensionSchemaStmtObjectAddress(Node *stmt, bool missing_ok); extern ObjectAddress AlterExtensionUpdateStmtObjectAddress(Node *stmt, bool missing_ok); -extern void CreateExtensionWithVersion(const char *extname, const char *extVersion); -extern void AlterExtensionUpdateStmt(const char *extname, const char *extVersion); +extern void CreateExtensionWithVersion(const char *extname, char *extVersion); +extern void AlterExtensionUpdateStmt(const char *extname, char *extVersion); /* foreign_constraint.c - forward declarations */ extern bool ConstraintIsAForeignKeyToReferenceTable(char *constraintName,