This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 957cfe37410 Fix some compile errors for cdb
957cfe37410 is described below
commit 957cfe37410d514fb7245606bb618a81de7e8914
Author: Jinbao Chen <[email protected]>
AuthorDate: Thu Oct 2 17:21:16 2025 +0800
Fix some compile errors for cdb
---
src/backend/catalog/aclchk.c | 17 ++++-------------
src/backend/cdb/cdbappendonlystoragewrite.c | 2 +-
src/backend/cdb/cdbbufferedappend.c | 4 ++--
src/backend/cdb/dispatcher/cdbconn.c | 2 +-
src/backend/cdb/dispatcher/cdbdisp_query.c | 3 ---
src/backend/cdb/dispatcher/cdbgang.c | 21 ++++++++++-----------
src/backend/cdb/endpoint/cdbendpointutils.c | 5 ++---
src/backend/cdb/motion/cdbmotion.c | 1 +
src/backend/cdb/motion/tupleremap.c | 2 +-
src/backend/utils/misc/guc.c | 24 +++---------------------
src/include/cdb/cdbappendonlystorageread.h | 2 +-
src/include/cdb/cdbbufferedappend.h | 4 ++--
src/include/utils/acl.h | 29 ++---------------------------
src/include/utils/guc.h | 1 +
14 files changed, 31 insertions(+), 86 deletions(-)
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index f4b495503aa..1b62530d92e 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -172,8 +172,6 @@ static AclMode pg_parameter_acl_aclmask(Oid acl_oid, Oid
roleid,
AclMode mask, AclMaskHow how);
static AclMode pg_largeobject_aclmask_snapshot(Oid lobj_oid, Oid roleid,
AclMode mask, AclMaskHow how, Snapshot snapshot);
-static AclMode pg_namespace_aclmask(Oid nsp_oid, Oid roleid,
- AclMode
mask, AclMaskHow how);
static AclMode pg_type_aclmask(Oid type_oid, Oid roleid,
AclMode mask,
AclMaskHow how);
static void recordExtensionInitPriv(Oid objoid, Oid classoid, int objsubid,
@@ -914,10 +912,12 @@ objectNamesToOids(ObjectType objtype, List *objnames,
bool is_grant)
case OBJECT_EXTPROTOCOL:
foreach(cell, objnames)
{
- char *ptcname = strVal(lfirst(cell));
- Oid ptcid =
get_extprotocol_oid(ptcname, false);
+ char *ptcname = strVal(lfirst(cell));
+ Oid ptcid = get_extprotocol_oid(ptcname, false);
objects = lappend_oid(objects, ptcid);
+ }
+ break;
case OBJECT_PARAMETER_ACL:
foreach(cell, objnames)
{
@@ -2413,15 +2413,6 @@ ExecGrant_common(InternalGrant *istmt, Oid classid,
AclMode default_privs,
/* Update initial privileges for extensions */
recordExtensionInitPriv(objectid, classid, 0, new_acl);
- /* MPP-6929: metadata tracking */
- if (Gp_role == GP_ROLE_DISPATCH)
- MetaTrackUpdObject(DatabaseRelationId,
- datId,
- GetUserId(), /* not
grantorId, */
- "PRIVILEGE",
- (istmt->is_grant) ?
"GRANT" : "REVOKE"
- );
-
/* Update the shared dependency ACL info */
updateAclDependencies(classid,
objectid, 0,
diff --git a/src/backend/cdb/cdbappendonlystoragewrite.c
b/src/backend/cdb/cdbappendonlystoragewrite.c
index 4ab94b50684..88920aa3154 100755
--- a/src/backend/cdb/cdbappendonlystoragewrite.c
+++ b/src/backend/cdb/cdbappendonlystoragewrite.c
@@ -281,7 +281,7 @@
AppendOnlyStorageWrite_TransactionCreateFile(AppendOnlyStorageWrite *storageWrit
* a file exists in master but not in mirror, even if it's empty.
*/
if (storageWrite->needsWAL)
- xlog_ao_insert(relFileNode->node, segmentFileNum, 0, NULL, 0);
+ xlog_ao_insert(relFileNode->locator, segmentFileNum, 0, NULL,
0);
}
/*
diff --git a/src/backend/cdb/cdbbufferedappend.c
b/src/backend/cdb/cdbbufferedappend.c
index dac215be58d..7fe5e19a82a 100644
--- a/src/backend/cdb/cdbbufferedappend.c
+++ b/src/backend/cdb/cdbbufferedappend.c
@@ -115,7 +115,7 @@ BufferedAppendInit(BufferedAppend *bufferedAppend,
void
BufferedAppendSetFile(BufferedAppend *bufferedAppend,
File file,
- RelFileNodeBackend relFileNode,
+ RelFileLocatorBackend relFileNode,
int32 segmentFileNum,
char *filePathName,
int64 eof,
@@ -198,7 +198,7 @@ BufferedAppendWrite(BufferedAppend *bufferedAppend, bool
needsWAL)
* record after writing to file works fine.
*/
if (needsWAL)
- xlog_ao_insert(bufferedAppend->relFileNode.node,
bufferedAppend->segmentFileNum,
+ xlog_ao_insert(bufferedAppend->relFileNode.locator,
bufferedAppend->segmentFileNum,
bufferedAppend->largeWritePosition,
largeWriteMemory, bytestotal);
bufferedAppend->largeWritePosition += bufferedAppend->largeWriteLen;
diff --git a/src/backend/cdb/dispatcher/cdbconn.c
b/src/backend/cdb/dispatcher/cdbconn.c
index e9f2fc157b1..c30c0bd4aee 100644
--- a/src/backend/cdb/dispatcher/cdbconn.c
+++ b/src/backend/cdb/dispatcher/cdbconn.c
@@ -849,7 +849,7 @@ forwardQENotices(void)
if (notice->message)
appendStringInfoString(&buf,
notice->message);
else
- appendStringInfoString(&buf, _("missing
error text"));
+ appendStringInfoString(&buf, ("missing
error text"));
appendStringInfoChar(&buf, '\n');
diff --git a/src/backend/cdb/dispatcher/cdbdisp_query.c
b/src/backend/cdb/dispatcher/cdbdisp_query.c
index 99f5179e756..004050f018b 100644
--- a/src/backend/cdb/dispatcher/cdbdisp_query.c
+++ b/src/backend/cdb/dispatcher/cdbdisp_query.c
@@ -526,9 +526,6 @@ cdbdisp_dispatchCommandInternal(DispatchCommandQueryParms
*pQueryParms,
ThrowErrorData(qeError);
}
- /* collect pgstat from QEs for current transaction level */
- pgstat_combine_from_qe(pr, -1);
-
cdbdisp_returnResults(pr, cdb_pgresults);
cdbdisp_destroyDispatcherState(ds);
diff --git a/src/backend/cdb/dispatcher/cdbgang.c
b/src/backend/cdb/dispatcher/cdbgang.c
index 780ddef0f42..f226073e1a3 100644
--- a/src/backend/cdb/dispatcher/cdbgang.c
+++ b/src/backend/cdb/dispatcher/cdbgang.c
@@ -17,6 +17,7 @@
#include "miscadmin.h" /* MyProcPid */
#include "pgstat.h" /* pgstat_report_sessionid() */
#include "utils/memutils.h"
+#include "utils/guc_tables.h"
#include "access/xact.h"
#include "catalog/namespace.h"
@@ -25,7 +26,6 @@
#include "nodes/execnodes.h" /* CdbProcess, Slice, SliceTable */
#include "postmaster/postmaster.h"
#include "tcop/tcopprot.h"
-#include "utils/int8.h"
#include "utils/sharedsnapshot.h"
#include "tcop/pquery.h"
@@ -174,7 +174,7 @@ segment_failure_due_to_recovery(const char *error_message)
if (error_message == NULL)
return false;
- fatal = _("FATAL");
+ fatal = ("FATAL");
fatal_len = strlen(fatal);
/*
@@ -188,15 +188,15 @@ segment_failure_due_to_recovery(const char *error_message)
ptr = strstr(error_message, fatal);
if ((ptr != NULL) && ptr[fatal_len] == ':')
{
- if (strstr(error_message, _(POSTMASTER_IN_RESET_MSG)))
+ if (strstr(error_message, (POSTMASTER_IN_RESET_MSG)))
{
return true;
}
- if (strstr(error_message, _(POSTMASTER_IN_STARTUP_MSG)))
+ if (strstr(error_message, (POSTMASTER_IN_STARTUP_MSG)))
{
return true;
}
- if (strstr(error_message, _(POSTMASTER_IN_RECOVERY_MSG)))
+ if (strstr(error_message, (POSTMASTER_IN_RECOVERY_MSG)))
{
return true;
}
@@ -217,12 +217,12 @@ segment_failure_due_to_missing_writer(const char
*error_message)
if (error_message == NULL)
return false;
- fatal = _("FATAL");
+ fatal = ("FATAL");
fatal_len = strlen(fatal);
ptr = strstr(error_message, fatal);
if ((ptr != NULL) && ptr[fatal_len] == ':' &&
- strstr(error_message, _(WRITER_IS_MISSING_MSG)))
+ strstr(error_message, (WRITER_IS_MISSING_MSG)))
return true;
return false;
@@ -239,7 +239,7 @@ segment_failure_due_to_fault_injector(const char
*error_message)
if (error_message == NULL)
return false;
- fatal = _("FATAL");
+ fatal = ("FATAL");
fatal_len = strlen(fatal);
ptr = strstr(error_message, fatal);
@@ -545,8 +545,7 @@ cdbgang_parse_gpqeid_params(struct Port *port
pg_attribute_unused(),
if (gpqeid_next_param(&cp, &np))
{
#ifdef HAVE_INT64_TIMESTAMP
- if (!scanint8(cp, true, &PgStartTime))
- goto bad;
+ PgStartTime = pg_strtoint64(cp);
#else
PgStartTime = strtod(cp, NULL);
#endif
@@ -803,7 +802,7 @@ GpDropTempTables(void)
gp_session_id = newSessionId;
gp_command_count = 0;
- pgstat_report_sessionid(newSessionId);
+ //pgstat_report_sessionid(newSessionId);
/* Update the slotid for our singleton reader. */
if (SharedLocalSnapshotSlot != NULL)
diff --git a/src/backend/cdb/endpoint/cdbendpointutils.c
b/src/backend/cdb/endpoint/cdbendpointutils.c
index 113b7b79f85..56cd405c9d1 100644
--- a/src/backend/cdb/endpoint/cdbendpointutils.c
+++ b/src/backend/cdb/endpoint/cdbendpointutils.c
@@ -217,8 +217,7 @@ gp_get_endpoints(PG_FUNCTION_ARGS)
Datum values[9];
bool nulls[9];
HeapTuple tuple;
- int res_number,
- idx;
+ int res_number;
if (SRF_IS_FIRSTCALL())
{
@@ -314,7 +313,7 @@ gp_get_endpoints(PG_FUNCTION_ARGS)
}
if (cnt != 0)
{
- idx = all_info->total_num;
+ int idx = all_info->total_num;
all_info->total_num += cnt;
if (all_info->infos)
diff --git a/src/backend/cdb/motion/cdbmotion.c
b/src/backend/cdb/motion/cdbmotion.c
index 24b112cd1bd..16eb7e766f3 100644
--- a/src/backend/cdb/motion/cdbmotion.c
+++ b/src/backend/cdb/motion/cdbmotion.c
@@ -26,6 +26,7 @@
#include "cdb/ml_ipc.h"
#include "cdb/tupleremap.h"
#include "cdb/tupser.h"
+#include "utils/guc.h"
#include "utils/memutils.h"
#include "utils/typcache.h"
diff --git a/src/backend/cdb/motion/tupleremap.c
b/src/backend/cdb/motion/tupleremap.c
index cc3003ccb1d..d46a0ad39c4 100644
--- a/src/backend/cdb/motion/tupleremap.c
+++ b/src/backend/cdb/motion/tupleremap.c
@@ -483,7 +483,7 @@ TRRemapRange(TupleRemapper *remapper, RangeRemapInfo
*remapinfo,
{
/* Reserialize. */
*changed = true;
- range = range_serialize(remapinfo->typcache, &lower, &upper,
empty);
+ range = range_serialize(remapinfo->typcache, &lower, &upper,
empty, NULL);
return RangeTypePGetDatum(range);
}
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 4f488affc05..589ea0bf1ea 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -926,29 +926,11 @@ discard_stack_value(struct config_generic *gconf,
config_var_value *val)
* The array length is returned into *num_vars.
*/
struct config_generic **
-get_guc_variables(int *num_vars)
+get_guc_variables(void)
{
- struct config_generic **result;
- HASH_SEQ_STATUS status;
- GUCHashEntry *hentry;
- int i;
-
- *num_vars = hash_get_num_entries(guc_hashtab);
- result = palloc(sizeof(struct config_generic *) * *num_vars);
-
- /* Extract pointers from the hash table */
- i = 0;
- hash_seq_init(&status, guc_hashtab);
- while ((hentry = (GUCHashEntry *) hash_seq_search(&status)) != NULL)
- result[i++] = hentry->gucvar;
- Assert(i == *num_vars);
-
- /* Sort by name */
- qsort(result, *num_vars,
- sizeof(struct config_generic *), guc_var_compare);
-
- return result;
+ return guc_variables;
}
+
int get_num_guc_variables(void)
{
return num_guc_variables;
diff --git a/src/include/cdb/cdbappendonlystorageread.h
b/src/include/cdb/cdbappendonlystorageread.h
index 818649424ce..ae7ea1c5247 100755
--- a/src/include/cdb/cdbappendonlystorageread.h
+++ b/src/include/cdb/cdbappendonlystorageread.h
@@ -174,7 +174,7 @@ typedef struct AppendOnlyStorageRead
*/
char *segmentFileName;
- RelFileNode relFileNode;
+ RelFileLocator relFileNode;
/*
* The number of blocks read since the beginning of the segment file.
diff --git a/src/include/cdb/cdbbufferedappend.h
b/src/include/cdb/cdbbufferedappend.h
index 27950032c98..c8f80e82eda 100644
--- a/src/include/cdb/cdbbufferedappend.h
+++ b/src/include/cdb/cdbbufferedappend.h
@@ -73,7 +73,7 @@ typedef struct BufferedAppend
* File level members.
*/
File file;
- RelFileNodeBackend relFileNode;
+ RelFileLocatorBackend relFileNode;
int32 segmentFileNum;
char *filePathName;
int64 fileLen;
@@ -112,7 +112,7 @@ extern void BufferedAppendInit(
extern void BufferedAppendSetFile(
BufferedAppend *bufferedAppend,
File file,
- RelFileNodeBackend relfilenode,
+ RelFileLocatorBackend relfilenode,
int32 segmentFileNum,
char *filePathName,
int64 eof,
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index 56ac623df96..2d79448f85a 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -240,33 +240,10 @@ extern void ExecAlterDefaultPrivilegesStmt(ParseState
*pstate, AlterDefaultPrivi
extern void RemoveRoleFromObjectACL(Oid roleid, Oid classid, Oid objid);
-extern AclMode pg_class_aclmask(Oid table_oid, Oid roleid,
- AclMode mask,
AclMaskHow how);
-extern AclMode pg_class_aclmask_ext(Oid table_oid, Oid roleid,
- AclMode
mask, AclMaskHow how,
- bool
*is_missing);
-extern AclMode pg_database_aclmask(Oid db_oid, Oid roleid,
- AclMode
mask, AclMaskHow how);
-extern AclMode pg_proc_aclmask(Oid proc_oid, Oid roleid,
- AclMode mask,
AclMaskHow how);
-extern AclMode pg_language_aclmask(Oid lang_oid, Oid roleid,
- AclMode
mask, AclMaskHow how);
-extern AclMode pg_largeobject_aclmask_snapshot(Oid lobj_oid, Oid roleid,
-
AclMode mask, AclMaskHow how, Snapshot snapshot);
extern AclMode pg_namespace_aclmask(Oid nsp_oid, Oid roleid,
AclMode
mask, AclMaskHow how);
-extern AclMode pg_tablespace_aclmask(Oid spc_oid, Oid roleid,
-
AclMode mask, AclMaskHow how);
-extern AclMode pg_foreign_data_wrapper_aclmask(Oid fdw_oid, Oid roleid,
-
AclMode mask, AclMaskHow how);
-extern AclMode pg_foreign_server_aclmask(Oid srv_oid, Oid roleid,
-
AclMode mask, AclMaskHow how);
-extern AclMode gp_storage_server_aclmask(Oid srv_oid, Oid roleid,
-
AclMode mask, AclMaskHow how);
extern AclMode pg_extprotocol_aclmask(Oid ptc_oid, Oid roleid,
AclMode mask, AclMaskHow how);
-extern AclMode pg_type_aclmask(Oid type_oid, Oid roleid,
- AclMode mask,
AclMaskHow how);
/* generic function */
extern AclResult object_aclcheck(Oid classid, Oid objectid, Oid roleid,
AclMode mode);
@@ -288,11 +265,8 @@ extern AclResult pg_largeobject_aclcheck_snapshot(Oid
lobj_oid, Oid roleid,
AclMode mode, Snapshot snapshot);
extern AclResult pg_namespace_aclcheck(Oid nsp_oid, Oid roleid, AclMode mode);
extern AclResult pg_tablespace_aclcheck(Oid spc_oid, Oid roleid, AclMode mode);
-extern AclResult pg_foreign_data_wrapper_aclcheck(Oid fdw_oid, Oid roleid,
AclMode mode);
-extern AclResult pg_foreign_server_aclcheck(Oid srv_oid, Oid roleid, AclMode
mode);
extern AclResult gp_storage_server_aclcheck(Oid srv_oid, Oid roleid, AclMode
mode);
extern AclResult pg_extprotocol_aclcheck(Oid ptc_oid, Oid roleid, AclMode
mode);
-extern AclResult pg_type_aclcheck(Oid type_oid, Oid roleid, AclMode mode);
extern void aclcheck_error(AclResult aclerr, ObjectType objtype,
const char *objectname);
@@ -301,7 +275,8 @@ extern void aclcheck_error_col(AclResult aclerr, ObjectType
objtype,
const char
*objectname, const char *colname);
extern void aclcheck_error_type(AclResult aclerr, Oid typeOid);
-
+extern AclMode pg_class_aclmask(Oid table_oid, Oid roleid,
+ AclMode mask,
AclMaskHow how);
extern void recordExtObjInitPriv(Oid objoid, Oid classoid);
extern void removeExtObjInitPriv(Oid objoid, Oid classoid);
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 385909aa6d9..88066f8ca99 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -744,6 +744,7 @@ extern void MarkGUCPrefixReserved(const char *className);
/* old name for MarkGUCPrefixReserved, for backwards compatibility: */
#define EmitWarningsOnPlaceholders(className) MarkGUCPrefixReserved(className)
+extern struct config_generic **get_guc_variables(void);
extern const char *GetConfigOption(const char *name, bool missing_ok,
bool
restrict_privileged);
extern const char *GetConfigOptionResetString(const char *name);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
