Fix small error in COPY FROM progress reporting.

hlinnaka · hlinnaka · commit 2f86ab305e7f · 2021-02-04T17:40:33.000+02:00
The # of bytes processed was accumulated slightly incorrectly. After
loading more data to the input buffer, we added the number of bytes in
the buffer to the sum. But in case of multi-byte characters or escapes,
there can be a few unprocessed bytes left over from previous load in the
buffer. Those bytes got counted twice.
diff --git a/src/backend/commands/copyfromparse.c b/src/backend/commands/copyfromparse.c
@@ -386,7 +386,7 @@ CopyLoadRawBuf(CopyFromState cstate)
 	cstate->raw_buf[nbytes] = '\0';
 	cstate->raw_buf_index = 0;
 	cstate->raw_buf_len = nbytes;
-	cstate->bytes_processed += nbytes;
+	cstate->bytes_processed += inbytes;
 	pgstat_progress_update_param(PROGRESS_COPY_BYTES_PROCESSED, cstate->bytes_processed);
 	return (inbytes > 0);
 }

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ CopyLoadRawBuf(CopyFromState cstate)`
`386`	`386`	`cstate->raw_buf[nbytes] = '\0';`
`387`	`387`	`cstate->raw_buf_index = 0;`
`388`	`388`	`cstate->raw_buf_len = nbytes;`
`389`		`- cstate->bytes_processed += nbytes;`
	`389`	`+ cstate->bytes_processed += inbytes;`
`390`	`390`	`pgstat_progress_update_param(PROGRESS_COPY_BYTES_PROCESSED, cstate->bytes_processed);`
`391`	`391`	`return (inbytes > 0);`
`392`	`392`	`}`