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 599561e0384 Fix compile errors for access/common
599561e0384 is described below
commit 599561e0384c0a4d36253392903e13a3e03bb915
Author: Jinbao Chen <[email protected]>
AuthorDate: Tue Sep 30 14:46:18 2025 +0800
Fix compile errors for access/common
---
src/backend/access/external/url_curl.c | 6 +++---
src/include/commands/copyfrom_internal.h | 11 -----------
src/include/utils/guc_tables.h | 2 --
3 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/src/backend/access/external/url_curl.c
b/src/backend/access/external/url_curl.c
index 61ffaa7b00f..4c512619776 100644
--- a/src/backend/access/external/url_curl.c
+++ b/src/backend/access/external/url_curl.c
@@ -179,11 +179,11 @@ fill_buffer(URL_CURL_FILE *curl, int want);
*/
#define CURL_EASY_SETOPT(h, opt, val) \
do { \
- int e; \
+ int e2; \
\
- if ((e = curl_easy_setopt(h, opt, val)) != CURLE_OK) \
+ if ((e2 = curl_easy_setopt(h, opt, val)) != CURLE_OK) \
elog(ERROR, "internal error: curl_easy_setopt \"%s\"
error (%d - %s)", \
- CppAsString(opt), e, curl_easy_strerror(e)); \
+ CppAsString(opt), e2, curl_easy_strerror(e2));
\
} while(0)
/*
diff --git a/src/include/commands/copyfrom_internal.h
b/src/include/commands/copyfrom_internal.h
index 10a6d5c2348..c56671c1ea7 100644
--- a/src/include/commands/copyfrom_internal.h
+++ b/src/include/commands/copyfrom_internal.h
@@ -28,17 +28,6 @@ typedef enum CopySource
COPY_CALLBACK /* from callback function */
} CopySource;
-/*
- * Represents the end-of-line terminator type of the input
- */
-typedef enum EolType
-{
- EOL_UNKNOWN,
- EOL_NL,
- EOL_CR,
- EOL_CRNL
-} EolType;
-
/*
* Represents the insert method to be used during COPY FROM.
*/
diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h
index 6a91812f95b..4a4f4c8f0f9 100644
--- a/src/include/utils/guc_tables.h
+++ b/src/include/utils/guc_tables.h
@@ -351,7 +351,6 @@ extern struct config_generic *find_option(const char *name,
bool create_placeholders,
bool skip_errors,
int elevel);
-extern struct config_generic **get_explain_guc_options(int *num);
/* get string value of variable */
extern char *ShowGUCOption(struct config_generic *record, bool use_units);
@@ -360,7 +359,6 @@ extern char *ShowGUCOption(struct config_generic *record,
bool use_units);
extern bool ConfigOptionIsVisible(struct config_generic *conf);
/* get the current set of variables */
-extern struct config_generic **get_guc_variables(int *num_vars);
extern int get_num_guc_variables(void);
extern void build_guc_variables(void);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
