doc/src/sgml/config.sgml

@@ -2303,8 +2303,8 @@ include_dir 'conf.d'
        </term>
        <listitem>
         <para>
-         This is the accumulated cost that will cause the vacuuming process to sleep
+         The accumulated cost that will cause the vacuuming process to sleep.
-         for <varname>vacuum_cost_delay</varname>.  The default is 200.
+         The default value is 200.
         </para>
        </listitem>
       </varlistentry>
@@ -2364,7 +2364,7 @@ include_dir 'conf.d'
          <varname>bgwriter_delay</varname>.
          If this value is specified without units, it is taken as milliseconds.
          The default value is 200
-         milliseconds (<literal>200ms</literal>). Note that on some systems, the
+         milliseconds (<literal>200ms</literal>). Note that on many systems, the
          effective resolution of sleep delays is 10 milliseconds; setting
          <varname>bgwriter_delay</varname> to a value that is not a multiple of 10
          might have the same results as setting it to the next higher multiple
@@ -3258,7 +3258,7 @@ include_dir 'conf.d'
         flushed to disk.
         If this value is specified without units, it is taken as milliseconds.
         The default value is 200 milliseconds (<literal>200ms</literal>).  Note that
-        on some systems, the effective resolution of sleep delays is 10
+        on many systems, the effective resolution of sleep delays is 10
         milliseconds; setting <varname>wal_writer_delay</varname> to a value that is
         not a multiple of 10 might have the same results as setting it to the
         next higher multiple of 10. This parameter can only be set in the

doc/src/sgml/wal.sgml

@@ -86,7 +86,7 @@
     <listitem>
       <para>
         On <productname>FreeBSD</productname>, IDE drives can be queried using
-        <command>camcontrol identify</command> and write caching turned off using
+        <command>atacontrol</command> and write caching turned off using
         <literal>hw.ata.wc=0</literal> in <filename>/boot/loader.conf</filename>;
         SCSI drives can be queried using <command>camcontrol identify</command>,
         and the write cache both queried and changed using

src/backend/replication/logical/origin.c

@@ -1144,7 +1144,6 @@ replorigin_session_setup(RepOriginId node, int acquired_by)
 
 		/* ok, found slot */
 		session_replication_state = curstate;
-		break;
 	}
 
 

src/fe_utils/print.c

@@ -1401,7 +1401,7 @@ print_aligned_vertical(const printTableContent *cont,
 	}
 
 	/* find longest data cell */
-	for (ptr = cont->cells; *ptr; ptr++)
+	for (i = 0, ptr = cont->cells; *ptr; ptr++, i++)
 	{
 		int			width,
 					height,
@@ -3172,8 +3172,6 @@ void
 printTableInit(printTableContent *const content, const printTableOpt *opt,
 			   const char *title, const int ncolumns, const int nrows)
 {
-	uint64		total_cells;
-
 	content->opt = opt;
 	content->title = title;
 	content->ncolumns = ncolumns;
@@ -3181,16 +3179,7 @@ printTableInit(printTableContent *const content, const printTableOpt *opt,
 
 	content->headers = pg_malloc0((ncolumns + 1) * sizeof(*content->headers));
 
-	total_cells = (uint64) ncolumns * nrows;
+	content->cells = pg_malloc0((ncolumns * nrows + 1) * sizeof(*content->cells));
-	/* Catch possible overflow.  Using >= here allows adding 1 below */
-	if (total_cells >= SIZE_MAX / sizeof(*content->cells))
-	{
-		fprintf(stderr, _("Cannot print table contents: number of cells %lld is equal to or exceeds maximum %lld.\n"),
-				(long long int) total_cells,
-				(long long int) (SIZE_MAX / sizeof(*content->cells)));
-		exit(EXIT_FAILURE);
-	}
-	content->cells = pg_malloc0((total_cells + 1) * sizeof(*content->cells));
 
 	content->cellmustfree = NULL;
 	content->footers = NULL;
@@ -3260,17 +3249,15 @@ void
 printTableAddCell(printTableContent *const content, char *cell,
 				  const bool translate, const bool mustfree)
 {
-	uint64		total_cells;
-
 #ifndef ENABLE_NLS
 	(void) translate;			/* unused parameter */
 #endif
 
-	total_cells = (uint64) content->ncolumns * content->nrows;
+	if (content->cellsadded >= content->ncolumns * content->nrows)
-	if (content->cellsadded >= total_cells)
 	{
-		fprintf(stderr, _("Cannot add cell to table content: total cell count of %lld exceeded.\n"),
+		fprintf(stderr, _("Cannot add cell to table content: "
-				(long long int) total_cells);
+						  "total cell count of %d exceeded.\n"),
+				content->ncolumns * content->nrows);
 		exit(EXIT_FAILURE);
 	}
 
@@ -3286,7 +3273,7 @@ printTableAddCell(printTableContent *const content, char *cell,
 	{
 		if (content->cellmustfree == NULL)
 			content->cellmustfree =
-				pg_malloc0((total_cells + 1) * sizeof(bool));
+				pg_malloc0((content->ncolumns * content->nrows + 1) * sizeof(bool));
 
 		content->cellmustfree[content->cellsadded] = true;
 	}
@@ -3354,10 +3341,9 @@ printTableCleanup(printTableContent *const content)
 {
 	if (content->cellmustfree)
 	{
-		uint64		total_cells;
+		int			i;
 
-		total_cells = (uint64) content->ncolumns * content->nrows;
+		for (i = 0; i < content->nrows * content->ncolumns; i++)
-		for (uint64 i = 0; i < total_cells; i++)
 		{
 			if (content->cellmustfree[i])
 				free(unconstify(char *, content->cells[i]));

src/include/fe_utils/print.h

@@ -171,7 +171,7 @@ typedef struct printTableContent
 	const char **cells;			/* NULL-terminated array of cell content
 								 * strings */
 	const char **cell;			/* Pointer to the last added cell */
-	uint64		cellsadded;		/* Number of cells added this far */
+	long		cellsadded;		/* Number of cells added this far */
 	bool	   *cellmustfree;	/* true for cells that need to be free()d */
 	printTableFooter *footers;	/* Pointer to the first footer */
 	printTableFooter *footer;	/* Pointer to the last added footer */

src/test/regress/expected/opr_sanity.out

@@ -1920,7 +1920,7 @@ WHERE p1.oid = a1.amhandler AND a1.amtype = 'i' AND
 -- Check for table amhandler functions with the wrong signature
 SELECT a1.oid, a1.amname, p1.oid, p1.proname
 FROM pg_am AS a1, pg_proc AS p1
-WHERE p1.oid = a1.amhandler AND a1.amtype = 't' AND
+WHERE p1.oid = a1.amhandler AND a1.amtype = 's' AND
     (p1.prorettype != 'table_am_handler'::regtype
      OR p1.proretset
      OR p1.pronargs != 1

src/test/regress/sql/opr_sanity.sql

@@ -1223,7 +1223,7 @@ WHERE p1.oid = a1.amhandler AND a1.amtype = 'i' AND
 
 SELECT a1.oid, a1.amname, p1.oid, p1.proname
 FROM pg_am AS a1, pg_proc AS p1
-WHERE p1.oid = a1.amhandler AND a1.amtype = 't' AND
+WHERE p1.oid = a1.amhandler AND a1.amtype = 's' AND
     (p1.prorettype != 'table_am_handler'::regtype
      OR p1.proretset
      OR p1.pronargs != 1