Resolve rebase markers in pg_waldump

Author: reshke

src/bin/pg_waldump/Makefile

@@ -17,13 +17,9 @@ OBJS = \
 	compat.o \
 	pg_waldump.o \
 	rmgrdesc.o \
-<<<<<<< HEAD
 	$(PAX_OBJS) \
-	xlogreader.o
-=======
 	xlogreader.o \
 	xlogstats.o
->>>>>>> REL_16_9
 
 override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
 
@@ -39,7 +35,6 @@ pg_waldump: $(OBJS) | submake-libpgport
 xlogreader.c: % : $(top_srcdir)/src/backend/access/transam/%
 	rm -f $@ && $(LN_S) $< .
 
-<<<<<<< HEAD
 ifeq ($(enable_pax), yes)
 paxc_desc.c: % : $(top_srcdir)/contrib/pax_storage/src/cpp/storage/wal/%
 	rm -f $@ && $(LN_S) $< $@
@@ -51,10 +46,8 @@ rmgrdesc.o: paxc_desc.h
 
 paxc_desc.o: paxc_desc.h
 endif
-=======
 xlogstats.c: % : $(top_srcdir)/src/backend/access/transam/%
 	rm -f $@ && $(LN_S) $< .
->>>>>>> REL_16_9
 
 $(RMGRDESCSOURCES): % : $(top_srcdir)/src/backend/access/rmgrdesc/%
 	rm -f $@ && $(LN_S) $< .
@@ -69,11 +62,7 @@ uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_waldump$(X)'
 
 clean distclean maintainer-clean:
-<<<<<<< HEAD
-	rm -f pg_waldump$(X) $(OBJS) $(RMGRDESCSOURCES) xlogreader.c paxc_desc.c paxc_desc.h
-=======
-	rm -f pg_waldump$(X) $(OBJS) $(RMGRDESCSOURCES) xlogreader.c xlogstats.c
->>>>>>> REL_16_9
+	rm -f pg_waldump$(X) $(OBJS) $(RMGRDESCSOURCES) xlogreader.c paxc_desc.c paxc_desc.h xlogstats.c
 	rm -rf tmp_check
 
 check:

src/bin/pg_waldump/pg_waldump.c

@@ -258,19 +258,11 @@ search_directory(const char *directory, const char *fname)
 						 fname, WalSegSz);
 		}
 		else if (r < 0)
-<<<<<<< HEAD
-			fatal_error("could not read file \"%s\": %m",
-						fname);
-		else
-			fatal_error("could not read file \"%s\": read %d of %zu",
-						fname, r, (Size) XLOG_BLCKSZ);
-=======
 			pg_fatal("could not read file \"%s\": %m",
 					 fname);
 		else
 			pg_fatal("could not read file \"%s\": read %d of %d",
 					 fname, r, XLOG_BLCKSZ);
->>>>>>> REL_16_9
 		close(fd);
 		return true;
 	}
@@ -649,11 +641,7 @@ XLogDumpDisplayStats(XLogDumpConfig *config, XLogStats *stats)
 	 * calculate column totals.
 	 */
 
-<<<<<<< HEAD
-	for (ri = 0; ri < RM_MAX_ID; ri++)
-=======
 	for (ri = 0; ri <= RM_MAX_ID; ri++)
->>>>>>> REL_16_9
 	{
 		if (!RmgrIdIsValid(ri))
 			continue;
@@ -969,8 +957,6 @@ main(int argc, char **argv)
 							pg_log_error("custom resource manager \"%s\" does not exist",
 										 optarg);
 							goto bad_argument;
-<<<<<<< HEAD
-=======
 						}
 						config.filter_by_rmgr[rmid] = true;
 						config.filter_by_rmgr_enabled = true;
@@ -992,31 +978,8 @@ main(int argc, char **argv)
 							pg_log_error("resource manager \"%s\" does not exist",
 										 optarg);
 							goto bad_argument;
->>>>>>> REL_16_9
-						}
-						config.filter_by_rmgr = rmid;
-					}
-<<<<<<< HEAD
-					else
-					{
-						/* then look for builtin rmgrs */
-						for (rmid = 0; rmid <= RM_MAX_BUILTIN_ID; rmid++)
-						{
-							if (pg_strcasecmp(optarg, GetRmgrDesc(rmid)->rm_name) == 0)
-							{
-								config.filter_by_rmgr = rmid;
-								break;
-							}
-						}
-						if (rmid > RM_MAX_BUILTIN_ID)
-						{
-							pg_log_error("resource manager \"%s\" does not exist",
-										 optarg);
-							goto bad_argument;
 						}
 					}
-=======
->>>>>>> REL_16_9
 				}
 				break;
 			case 'R':

src/bin/pg_waldump/rmgrdesc.c

@@ -32,16 +32,13 @@
 #include "storage/standbydefs.h"
 #include "utils/relmapper.h"
 
-<<<<<<< HEAD
 #include "access/bitmap_xlog.h"
 #include "access/distributedlog.h"
 #include "cdb/cdbappendonlyxlog.h"
 #ifdef USE_PAX_STORAGE
 #include "paxc_desc.h"
 #endif
 
-=======
->>>>>>> REL_16_9
 #define PG_RMGR(symname,name,redo,desc,identify,startup,cleanup,mask,decode) \
 	{ name, desc, identify},
 
@@ -51,13 +48,8 @@ static const RmgrDescData RmgrDescTable[RM_N_BUILTIN_IDS] = {
 
 #define CUSTOM_NUMERIC_NAME_LEN sizeof("custom###")
 
-<<<<<<< HEAD
-static char CustomNumericNames[RM_N_CUSTOM_IDS][CUSTOM_NUMERIC_NAME_LEN] = {0};
-static RmgrDescData CustomRmgrDesc[RM_N_CUSTOM_IDS] = {0};
-=======
 static char CustomNumericNames[RM_N_CUSTOM_IDS][CUSTOM_NUMERIC_NAME_LEN] = {{0}};
 static RmgrDescData CustomRmgrDesc[RM_N_CUSTOM_IDS] = {{0}};
->>>>>>> REL_16_9
 static bool CustomRmgrDescInitialized = false;
 
 /*
@@ -95,15 +87,12 @@ initialize_custom_rmgrs(void)
 		CustomRmgrDesc[i].rm_desc = default_desc;
 		CustomRmgrDesc[i].rm_identify = default_identify;
 	}
-<<<<<<< HEAD
 
 #ifdef USE_PAX_STORAGE
 	CustomRmgrDesc[PAX_RMGR_ID - RM_MIN_CUSTOM_ID].rm_name = "pax";
 	CustomRmgrDesc[PAX_RMGR_ID - RM_MIN_CUSTOM_ID].rm_desc = pax_rmgr_desc;
 	CustomRmgrDesc[PAX_RMGR_ID - RM_MIN_CUSTOM_ID].rm_identify = pax_rmgr_identify;
 #endif
-=======
->>>>>>> REL_16_9
 	CustomRmgrDescInitialized = true;
 }