NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commite55f025

committed

Refactor CopyFrom() in copyfrom.c.

This commit simplifies CopyFrom() by removing the unnecessary local variable'skipped', which tracked the number of rows skipped due to on_error = 'ignore'.That count is already handled by cstate->num_errors, so the 'skipped' variablewas redundant.Additionally, the condition on_error != COPY_ON_ERROR_STOP is removed.Since on_error == COPY_ON_ERROR_IGNORE is already checked, and on_erroronly has two values (ignore and stop), the additional check was redundantand made the logic harder to read. Seemingly this was introducedin preparation for a future patch, but the current checks don’t offerclear value and have been removed to improve readability.Author: Atsushi TorikoshiReviewed-by: Masahiko Sawada, Fujii MasaoDiscussion:https://postgr.es/m/ab59dad10490ea3734cf022b16c24cfd@oss.nttdata.com

1 parenta1c4c8a commite55f025Copy full SHA for e55f025

File tree

1 file changed

-13

lines changed

src/backend/commands
- copyfrom.c

1 file changed

-13

lines changed

`‎src/backend/commands/copyfrom.c`

Lines changed: 8 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,6 @@ CopyFrom(CopyFromState cstate)`
`657`	`657`	`CopyMultiInsertInfomultiInsertInfo= {0};/* pacify compiler */`
`658`	`658`	`int64processed=0;`
`659`	`659`	`int64excluded=0;`
`660`		`-int64skipped=0;`
`661`	`660`	`boolhas_before_insert_row_trig;`
`662`	`661`	`boolhas_instead_insert_row_trig;`
`663`	`662`	`boolleafpart_use_multi_insert= false;`
`@@ -1004,26 +1003,22 @@ CopyFrom(CopyFromState cstate)`
`1004`	`1003`	`if (!NextCopyFrom(cstate,econtext,myslot->tts_values,myslot->tts_isnull))`
`1005`	`1004`	`break;`
`1006`	`1005`
`1007`		`-if (cstate->opts.on_error!=COPY_ON_ERROR_STOP&&`
	`1006`	`+if (cstate->opts.on_error==COPY_ON_ERROR_IGNORE&&`
`1008`	`1007`	`cstate->escontext->error_occurred)`
`1009`	`1008`	`{`
`1010`	`1009`	`/*`
`1011`		`- * Soft error occurred, skip this tuple and deal with error`
`1012`		`- * information according to ON_ERROR.`
	`1010`	`+ * Soft error occurred, skip this tuple and just make`
	`1011`	`+ * ErrorSaveContext ready for the next NextCopyFrom. Since we`
	`1012`	`+ * don't set details_wanted and error_data is not to be filled,`
	`1013`	`+ * just resetting error_occurred is enough.`
`1013`	`1014`	`*/`
`1014`		`-if (cstate->opts.on_error==COPY_ON_ERROR_IGNORE)`
`1015`		`-`
`1016`		`-/*`
`1017`		`- * Just make ErrorSaveContext ready for the next NextCopyFrom.`
`1018`		`- * Since we don't set details_wanted and error_data is not to`
`1019`		`- * be filled, just resetting error_occurred is enough.`
`1020`		`- */`
`1021`		`-cstate->escontext->error_occurred= false;`
	`1015`	`+cstate->escontext->error_occurred= false;`
`1022`	`1016`
`1023`	`1017`	`/* Report that this tuple was skipped by the ON_ERROR clause */`
`1024`	`1018`	`pgstat_progress_update_param(PROGRESS_COPY_TUPLES_SKIPPED,`
`1025`		`-++skipped);`
	`1019`	`+cstate->num_errors);`
`1026`	`1020`
	`1021`	`+/* Repeat NextCopyFrom() until no soft error occurs */`
`1027`	`1022`	`continue;`
`1028`	`1023`	`}`
`1029`	`1024`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite55f025

File tree

1 file changed

1 file changed

`‎src/backend/commands/copyfrom.c`

0 commit comments