Resolve few simple rebase markers from pg_upgrade

Author: reshke

src/bin/pg_upgrade/Makefile

@@ -54,31 +54,21 @@ uninstall:
 clean distclean maintainer-clean:
 	rm -f pg_upgrade$(X) $(OBJS)
 	rm -rf delete_old_cluster.sh log/ tmp_check/ \
-<<<<<<< HEAD
 		   reindex_hash.sql \
 		   clusterConfigPostgresAddonsFile clusterConfigFile gpdemo-env.sh \
 		   hostfile regression.diffs aomd_filehandler.c
 
 greenplum/aomd_filehandler.c: $(top_srcdir)/src/backend/access/appendonly/aomd_filehandler.c
 	rm -f $@ && cd greenplum && $(LN_S) ../$< aomd_filehandler.c
-=======
-	       reindex_hash.sql
->>>>>>> REL_16_9
 
 export with_icu
 
 check:
-<<<<<<< HEAD
+#	$(prove_check)
 	# ignore pg_upgarde to make CI happy, issue: https://github.com/apache/cloudberry/issues/262
 
-#check: test_gpdb.sh all
-#	bash $< -C -r -s -o $(top_builddir)/gpAux/gpdemo/datadirs/ -b $(DESTDIR)$(bindir)
-
 perfcheck: test_gpdb.sh all
 	bash $< -p -r -o $(top_builddir)/gpAux/gpdemo/datadirs/ -b $(DESTDIR)$(bindir)
-=======
-	$(prove_check)
->>>>>>> REL_16_9
 
 installcheck:
 	$(prove_installcheck)

src/bin/pg_upgrade/check.c

@@ -11,10 +11,7 @@
 
 #include "catalog/pg_authid_d.h"
 #include "catalog/pg_collation.h"
-<<<<<<< HEAD
 #include "common/kmgr_utils.h"
-=======
->>>>>>> REL_16_9
 #include "fe_utils/string_utils.h"
 #include "mb/pg_wchar.h"
 #include "pg_upgrade.h"

src/bin/pg_upgrade/exec.c

@@ -56,13 +56,8 @@ get_bin_version(ClusterInfo *cluster)
 		pg_fatal("could not get pg_ctl version data using %s: %s",
 				 cmd, wait_result_to_str(rc));
 
-<<<<<<< HEAD
 	if (sscanf(cmd_output, "%*s (%s Database) %d.%d", dbstring, &v1, &v2) < 1)
-		pg_fatal("could not get pg_ctl version output from %s\n", cmd);
-=======
-	if (sscanf(cmd_output, "%*s %*s %d.%d", &v1, &v2) < 1)
 		pg_fatal("could not get pg_ctl version output from %s", cmd);
->>>>>>> REL_16_9
 
 	if (strcmp("Greenplum", dbstring) && strcmp("Cloudberry", dbstring))
 		pg_fatal("could not upgrade from non Greenplum/Cloudberry version: %s\n", dbstring);
@@ -444,19 +439,12 @@ check_bin_dir(ClusterInfo *cluster, bool check_versions)
 static void
 check_exec(const char *dir, const char *program, bool check_version)
 {
-<<<<<<< HEAD
-	char	path[MAXPGPATH];
-	char	line[MAXPGPATH];
-	char	cmd[MAXPGPATH];
-	char	versionstr[128];
-	char	gp_versionstr[128];
-	int		ret;
-=======
 	char		path[MAXPGPATH];
 	char		line[MAXPGPATH];
 	char		cmd[MAXPGPATH];
 	char		versionstr[128];
->>>>>>> REL_16_9
+	char		gp_versionstr[128];
+	int			ret;
 
 	snprintf(path, sizeof(path), "%s/%s", dir, program);
 
@@ -476,14 +464,8 @@ check_exec(const char *dir, const char *program, bool check_version)
 		snprintf(versionstr, sizeof(versionstr), "%s (PostgreSQL) " PG_VERSION, program);
 		snprintf(gp_versionstr, sizeof(versionstr), "%s (Apache Cloudberry) " PG_VERSION, program);
 
-<<<<<<< HEAD
 		if (strcmp(line, versionstr) != 0 && strcmp(line, gp_versionstr) != 0)
-			pg_fatal("check for \"%s\" failed: incorrect version: found \"%s\", expected \"%s\" or \"%s\"\n",
+			pg_fatal("check for \"%s\" failed: incorrect version: found \"%s\", expected \"%s\" or \"%s\"",
 					 path, line, versionstr, gp_versionstr);
-=======
-		if (strcmp(line, versionstr) != 0)
-			pg_fatal("check for \"%s\" failed: incorrect version: found \"%s\", expected \"%s\"",
-					 path, line, versionstr);
->>>>>>> REL_16_9
 	}
 }

src/bin/pg_upgrade/file.c

@@ -63,12 +63,7 @@ cloneFile(const char *src, const char *dst,
 		int			save_errno = errno;
 
 		unlink(dst);
-<<<<<<< HEAD
-		pg_fatal("error while cloning relation \"%s.%s\" (\"%s\" to \"%s\"): %s\n",
-=======
-
 		pg_fatal("error while cloning relation \"%s.%s\" (\"%s\" to \"%s\"): %s",
->>>>>>> REL_16_9
 				 schemaName, relName, src, dst, strerror(save_errno));
 	}