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 49d30b09965 Fix conflict for interface
49d30b09965 is described below
commit 49d30b09965dada1313449751909ead1c1a87e44
Author: Jinbao Chen <chenjinbao1...@gmail.com>
AuthorDate: Sun Sep 28 10:53:56 2025 +0800
Fix conflict for interface
---
src/interfaces/ecpg/include/ecpglib.h | 10 ----------
src/interfaces/libpq/libpq-fe.h | 4 ----
src/interfaces/libpq/libpq-int.h | 13 -------------
src/interfaces/libpq/pqexpbuffer.h | 4 ----
4 files changed, 31 deletions(-)
diff --git a/src/interfaces/ecpg/include/ecpglib.h
b/src/interfaces/ecpg/include/ecpglib.h
index 04663b1a3e1..bccdd76779a 100644
--- a/src/interfaces/ecpg/include/ecpglib.h
+++ b/src/interfaces/ecpg/include/ecpglib.h
@@ -78,15 +78,6 @@ void sqlprint(void);
/* dynamic SQL */
-<<<<<<< HEAD
-bool ECPGdo_descriptor(int, const char *, const char *, const char
*);
-bool ECPGdeallocate_desc(int, const char *);
-bool ECPGallocate_desc(int, const char *);
-bool ECPGget_desc_header(int, const char *, int *);
-bool ECPGget_desc(int, const char *, int, ...);
-bool ECPGset_desc_header(int, const char *, int);
-bool ECPGset_desc(int, const char *, int, ...);
-=======
bool ECPGdo_descriptor(int line, const char *connection,
const char
*descriptor, const char *query);
bool ECPGdeallocate_desc(int line, const char *name);
@@ -95,7 +86,6 @@ bool ECPGget_desc_header(int lineno, const char
*desc_name, int *count);
bool ECPGget_desc(int lineno, const char *desc_name, int index,...);
bool ECPGset_desc_header(int lineno, const char *desc_name, int
count);
bool ECPGset_desc(int lineno, const char *desc_name, int index,...);
->>>>>>> REL_16_9
void ECPGset_noind_null(enum ECPGttype type, void *ptr);
bool ECPGis_noind_null(enum ECPGttype type, const void *ptr);
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index 60a7bb60fcb..6d16969a161 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -4,12 +4,8 @@
* This file contains definitions for structures and
* externs for functions used by frontend postgres applications.
*
-<<<<<<< HEAD
* Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
- * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
-=======
* Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
->>>>>>> REL_16_9
* Portions Copyright (c) 1994, Regents of the University of California
*
* src/interfaces/libpq/libpq-fe.h
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index ed8e66fcedc..ef4b875d7f4 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -9,12 +9,8 @@
* more likely to break across PostgreSQL releases than code that uses
* only the official API.
*
-<<<<<<< HEAD
* Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
- * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
-=======
* Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
->>>>>>> REL_16_9
* Portions Copyright (c) 1994, Regents of the University of California
*
* src/interfaces/libpq/libpq-int.h
@@ -754,11 +750,7 @@ extern pgthreadlock_t pg_g_threadlock;
/* === in fe-exec.c === */
-<<<<<<< HEAD
-extern void pqSetResultError(PGresult *res, PQExpBuffer errorMessage);
-=======
extern void pqSetResultError(PGresult *res, PQExpBuffer errorMessage, int
offset);
->>>>>>> REL_16_9
extern void *pqResultAlloc(PGresult *res, size_t nBytes, bool isBinary);
extern char *pqResultStrdup(PGresult *res, const char *str);
extern void pqClearAsyncResult(PGconn *conn);
@@ -770,7 +762,6 @@ extern void pqSaveMessageField(PGresult *res, char code,
extern void pqSaveParameterStatus(PGconn *conn, const char *name,
const char
*value);
extern int pqRowProcessor(PGconn *conn, const char **errmsgp);
-<<<<<<< HEAD
extern bool PQsendQueryStart(PGconn *conn, bool newQuery);
@@ -791,10 +782,6 @@ extern PGresult *pqFunctionCall2(PGconn *conn, Oid fnid,
const
PQArgBlock *args, int nargs);
extern void pqCommandQueueAdvance(PGconn *conn);
-=======
-extern void pqCommandQueueAdvance(PGconn *conn, bool isReadyForQuery,
- bool gotSync);
->>>>>>> REL_16_9
extern int PQsendQueryContinue(PGconn *conn, const char *query);
diff --git a/src/interfaces/libpq/pqexpbuffer.h
b/src/interfaces/libpq/pqexpbuffer.h
index ac30e39628e..313c0e774e5 100644
--- a/src/interfaces/libpq/pqexpbuffer.h
+++ b/src/interfaces/libpq/pqexpbuffer.h
@@ -15,12 +15,8 @@
* a usable vsnprintf(), then a copy of our own implementation of it will
* be linked into libpq.
*
-<<<<<<< HEAD
* Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
- * Portions Copyright (c) 1996-2021, PostgreSQL Global Development Group
-=======
* Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
->>>>>>> REL_16_9
* Portions Copyright (c) 1994, Regents of the University of California
*
* src/interfaces/libpq/pqexpbuffer.h
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cloudberry.apache.org
For additional commands, e-mail: commits-h...@cloudberry.apache.org
