diff options
| author | Michael Paquier <michael@paquier.xyz> | 2024-02-14 10:07:22 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2024-02-14 10:07:22 +0900 |
| commit | 06bd311bce24083c76d9741ae89c98750aaf4b41 (patch) | |
| tree | 0a28e736dc3af52c13d5bb80d36338fe7768fe02 /src/backend/commands/copyfromparse.c | |
| parent | d0071f922808981e2371351c46da5bb3c49554b2 (diff) | |
| download | postgresql-06bd311bce24083c76d9741ae89c98750aaf4b41.tar.gz postgresql-06bd311bce24083c76d9741ae89c98750aaf4b41.zip | |
Revert "Refactor CopyReadAttributes{CSV,Text}() to use a callback in COPY FROM"
This reverts commit 95fb5b49024, for reasons similar to what led to
1aa8324b81fa. In this case, the callback was called once per row, which
is less worse than the previous callback introduced for COPY TO called
once per argument for each row, still the patch set discussed to plug in
custom routines to the COPY paths would be able to know which subroutine
to use depending on its CopyFromState, so this led to a suboptimal
approach at the end.
For now, this part is reverted to consider better which approach to use.
Discussion: https://postgr.es/m/20240206014125.qofww7ew3dx3v3uk@awork3.anarazel.de
Diffstat (limited to 'src/backend/commands/copyfromparse.c')
| -rw-r--r-- | src/backend/commands/copyfromparse.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/backend/commands/copyfromparse.c b/src/backend/commands/copyfromparse.c index 906756362e9..7cacd0b752c 100644 --- a/src/backend/commands/copyfromparse.c +++ b/src/backend/commands/copyfromparse.c @@ -25,10 +25,10 @@ * is copied into 'line_buf', with quotes and escape characters still * intact. * - * 4. CopyReadAttributesText/CSV() function (via copy_read_attribute) takes - * the input line from 'line_buf', and splits it into fields, unescaping - * the data as required. The fields are stored in 'attribute_buf', and - * 'raw_fields' array holds pointers to each field. + * 4. CopyReadAttributesText/CSV() function takes the input line from + * 'line_buf', and splits it into fields, unescaping the data as required. + * The fields are stored in 'attribute_buf', and 'raw_fields' array holds + * pointers to each field. * * If encoding conversion is not required, a shortcut is taken in step 2 to * avoid copying the data unnecessarily. The 'input_buf' pointer is set to @@ -152,6 +152,8 @@ static const char BinarySignature[11] = "PGCOPY\n\377\r\n\0"; /* non-export function prototypes */ static bool CopyReadLine(CopyFromState cstate); static bool CopyReadLineText(CopyFromState cstate); +static int CopyReadAttributesText(CopyFromState cstate); +static int CopyReadAttributesCSV(CopyFromState cstate); static Datum CopyReadBinaryAttribute(CopyFromState cstate, FmgrInfo *flinfo, Oid typioparam, int32 typmod, bool *isnull); @@ -773,7 +775,10 @@ NextCopyFromRawFields(CopyFromState cstate, char ***fields, int *nfields) { int fldnum; - fldct = cstate->copy_read_attributes(cstate); + if (cstate->opts.csv_mode) + fldct = CopyReadAttributesCSV(cstate); + else + fldct = CopyReadAttributesText(cstate); if (fldct != list_length(cstate->attnumlist)) ereport(ERROR, @@ -825,7 +830,10 @@ NextCopyFromRawFields(CopyFromState cstate, char ***fields, int *nfields) return false; /* Parse the line into de-escaped field values */ - fldct = cstate->copy_read_attributes(cstate); + if (cstate->opts.csv_mode) + fldct = CopyReadAttributesCSV(cstate); + else + fldct = CopyReadAttributesText(cstate); *fields = cstate->raw_fields; *nfields = fldct; @@ -1494,7 +1502,7 @@ GetDecimalFromHex(char hex) * * The return value is the number of fields actually read. */ -int +static int CopyReadAttributesText(CopyFromState cstate) { char delimc = cstate->opts.delim[0]; @@ -1748,7 +1756,7 @@ CopyReadAttributesText(CopyFromState cstate) * CopyReadAttributesText, except we parse the fields according to * "standard" (i.e. common) CSV usage. */ -int +static int CopyReadAttributesCSV(CopyFromState cstate) { char delimc = cstate->opts.delim[0]; |