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 9fc9200002e Fix conflict for guc
9fc9200002e is described below
commit 9fc9200002ea0fcc2b6615146369c19c94d97131
Author: Jinbao Chen <[email protected]>
AuthorDate: Mon Sep 15 10:52:41 2025 +0800
Fix conflict for guc
---
src/backend/utils/misc/guc-file.l | 3 ---
src/backend/utils/misc/guc.c | 17 -----------------
2 files changed, 20 deletions(-)
diff --git a/src/backend/utils/misc/guc-file.l
b/src/backend/utils/misc/guc-file.l
index dd339eb8b32..a0fc3b0203b 100644
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -172,7 +172,6 @@ ProcessConfigFile(GucContext context)
}
/*
-<<<<<<< HEAD
* This function handles both actual config file (re)loads and execution of
* show_all_file_settings() (i.e., the pg_file_settings view). In the latter
* case we don't apply any of the settings, but we make all the usual validity
@@ -561,8 +560,6 @@ AbsoluteConfigLocation(const char *location, const char
*calling_file)
}
/*
-=======
->>>>>>> REL_16_9
* Read and parse a single configuration file. This function recurses
* to handle "include" directives.
*
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 9e3d0ce975e..4f488affc05 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -5582,8 +5582,6 @@ get_explain_guc_options(int *num, bool verbose, bool
settings)
struct config_generic *conf = dlist_container(struct
config_generic,
nondef_link, iter.cur);
bool modified;
-<<<<<<< HEAD
- struct config_generic *conf = guc_variables[i];
bool explain = false;
bool gp_guc_explain = false;
@@ -5614,8 +5612,6 @@ get_explain_guc_options(int *num, bool verbose, bool
settings)
break;
}
}
-=======
->>>>>>> REL_16_9
/* return only parameters marked for inclusion in explain */
if ((conf->flags & GUC_EXPLAIN) && settings)
@@ -5665,22 +5661,9 @@ get_explain_guc_options(int *num, bool verbose, bool
settings)
{
struct config_string *lconf =
(struct config_string *) conf;
-<<<<<<< HEAD
modified =
(strcmp(lconf->boot_val, *(lconf->variable)) != 0);
}
break;
-=======
- if (lconf->boot_val == NULL &&
- *lconf->variable == NULL)
- modified = false;
- else if (lconf->boot_val == NULL ||
- *lconf->variable ==
NULL)
- modified = true;
- else
- modified =
(strcmp(lconf->boot_val, *(lconf->variable)) != 0);
- }
- break;
->>>>>>> REL_16_9
case PGC_ENUM:
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
