diff options
| author | Alexander Korotkov <akorotkov@postgresql.org> | 2024-04-11 15:47:53 +0300 |
|---|---|---|
| committer | Alexander Korotkov <akorotkov@postgresql.org> | 2024-04-11 16:01:30 +0300 |
| commit | da841aa4dc279bb0053de56121c927ec943edff3 (patch) | |
| tree | efbd41861037fd9b4f91460309b6cccb527a9955 /src/backend/commands/copyfrom.c | |
| parent | bc1e2092ebb857802a9713d0d3588079e2f0216a (diff) | |
Revert: Let table AM insertion methods control index insertion
This commit reverts b1484a3f19 per review by Andres Freund.
Discussion: https://postgr.es/m/20240410165236.rwyrny7ihi4ddxw4%40awork3.anarazel.de
Diffstat (limited to 'src/backend/commands/copyfrom.c')
| -rw-r--r-- | src/backend/commands/copyfrom.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/backend/commands/copyfrom.c b/src/backend/commands/copyfrom.c index 9d2900041e6..06bc14636d3 100644 --- a/src/backend/commands/copyfrom.c +++ b/src/backend/commands/copyfrom.c @@ -395,7 +395,6 @@ CopyMultiInsertBufferFlush(CopyMultiInsertInfo *miinfo, bool line_buf_valid = cstate->line_buf_valid; uint64 save_cur_lineno = cstate->cur_lineno; MemoryContext oldcontext; - bool insertIndexes; Assert(buffer->bistate != NULL); @@ -415,8 +414,7 @@ CopyMultiInsertBufferFlush(CopyMultiInsertInfo *miinfo, nused, mycid, ti_options, - buffer->bistate, - &insertIndexes); + buffer->bistate); MemoryContextSwitchTo(oldcontext); for (i = 0; i < nused; i++) @@ -425,7 +423,7 @@ CopyMultiInsertBufferFlush(CopyMultiInsertInfo *miinfo, * If there are any indexes, update them for all the inserted * tuples, and run AFTER ROW INSERT triggers. */ - if (insertIndexes && resultRelInfo->ri_NumIndices > 0) + if (resultRelInfo->ri_NumIndices > 0) { List *recheckIndexes; @@ -1265,14 +1263,11 @@ CopyFrom(CopyFromState cstate) } else { - bool insertIndexes; - /* OK, store the tuple and create index entries for it */ table_tuple_insert(resultRelInfo->ri_RelationDesc, - myslot, mycid, ti_options, bistate, - &insertIndexes); + myslot, mycid, ti_options, bistate); - if (insertIndexes && resultRelInfo->ri_NumIndices > 0) + if (resultRelInfo->ri_NumIndices > 0) recheckIndexes = ExecInsertIndexTuples(resultRelInfo, myslot, estate, |