database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-21 05:21:08 +03:00
Code Activity

Revert: Let table AM insertion methods control index insertion

Browse Source 
This commit reverts b1484a3f19 per review by Andres Freund.

Discussion: https://postgr.es/m/20240410165236.rwyrny7ihi4ddxw4%40awork3.anarazel.de
This commit is contained in:
Alexander Korotkov
2024-04-11 15:47:53 +03:00
parent bc1e2092eb
commit da841aa4dc
12 changed files with 28 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/commands/copyfrom.c
View File

@@ -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,