From b1484a3f1910bfd0e254afe40085dfc3351bda8c Mon Sep 17 00:00:00 2001 From: Alexander Korotkov Date: Sat, 30 Mar 2024 22:39:03 +0200 Subject: Let table AM insertion methods control index insertion Previously, the executor did index insert unconditionally after calling table AM interface methods tuple_insert() and multi_insert(). This commit introduces the new parameter insert_indexes for these two methods. Setting '*insert_indexes' to true saves the current logic. Setting it to false indicates that table AM cares about index inserts itself and doesn't want the caller to do that. Discussion: https://postgr.es/m/CAPpHfdurb9ycV8udYqM%3Do0sPS66PJ4RCBM1g-bBpvzUfogY0EA%40mail.gmail.com Reviewed-by: Pavel Borisov, Matthias van de Meent, Mark Dilger --- src/backend/commands/copyfrom.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/backend/commands/copyfrom.c') diff --git a/src/backend/commands/copyfrom.c b/src/backend/commands/copyfrom.c index 8908a440e19..b6736369771 100644 --- a/src/backend/commands/copyfrom.c +++ b/src/backend/commands/copyfrom.c @@ -397,6 +397,7 @@ 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); @@ -416,7 +417,8 @@ CopyMultiInsertBufferFlush(CopyMultiInsertInfo *miinfo, nused, mycid, ti_options, - buffer->bistate); + buffer->bistate, + &insertIndexes); MemoryContextSwitchTo(oldcontext); for (i = 0; i < nused; i++) @@ -425,7 +427,7 @@ CopyMultiInsertBufferFlush(CopyMultiInsertInfo *miinfo, * If there are any indexes, update them for all the inserted * tuples, and run AFTER ROW INSERT triggers. */ - if (resultRelInfo->ri_NumIndices > 0) + if (insertIndexes && resultRelInfo->ri_NumIndices > 0) { List *recheckIndexes; @@ -1265,11 +1267,14 @@ 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); + myslot, mycid, ti_options, bistate, + &insertIndexes); - if (resultRelInfo->ri_NumIndices > 0) + if (insertIndexes && resultRelInfo->ri_NumIndices > 0) recheckIndexes = ExecInsertIndexTuples(resultRelInfo, myslot, estate, -- cgit v1.2.3