From 4a404edd4a475d7ef95158035d0f9307da488c89 Mon Sep 17 00:00:00 2001 From: Alexander Korotkov Date: Fri, 9 Jun 2023 01:02:39 +0300 Subject: [PATCH 08/12] Let table AM insertion methods control index insertion New parameter for tuple_insert() and multi_insert() methods provides way to skip index insertions in executor. In this case, table AM can handle insertions itself. --- src/backend/access/heap/heapam.c | 4 +++- src/backend/access/heap/heapam_handler.c | 4 +++- src/backend/access/table/tableam.c | 6 ++++-- src/backend/catalog/indexing.c | 4 +++- src/backend/commands/copyfrom.c | 13 +++++++++---- src/backend/commands/createas.c | 4 +++- src/backend/commands/matview.c | 4 +++- src/backend/commands/tablecmds.c | 6 +++++- src/backend/executor/execReplication.c | 6 ++++-- src/backend/executor/nodeModifyTable.c | 6 ++++-- src/include/access/heapam.h | 2 +- src/include/access/tableam.h | 23 ++++++++++++++++------- 12 files changed, 58 insertions(+), 24 deletions(-) diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 5baa2e632f5..f6ea2703219 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -2095,7 +2095,8 @@ heap_multi_insert_pages(HeapTuple *heaptuples, int done, int ntuples, Size saveF */ void heap_multi_insert(Relation relation, TupleTableSlot **slots, int ntuples, - CommandId cid, int options, BulkInsertState bistate) + CommandId cid, int options, BulkInsertState bistate, + bool *insert_indexes) { TransactionId xid = GetCurrentTransactionId(); HeapTuple *heaptuples; @@ -2444,6 +2445,7 @@ heap_multi_insert(Relation relation, TupleTableSlot **slots, int ntuples, slots[i]->tts_tid = heaptuples[i]->t_self; pgstat_count_heap_insert(relation, ntuples); + *insert_indexes = true; } /* diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c index ac32698f9d9..5f25244ce43 100644 --- a/src/backend/access/heap/heapam_handler.c +++ b/src/backend/access/heap/heapam_handler.c @@ -259,7 +259,7 @@ heapam_tuple_satisfies_snapshot(Relation rel, TupleTableSlot *slot, static TupleTableSlot * heapam_tuple_insert(Relation relation, TupleTableSlot *slot, CommandId cid, - int options, BulkInsertState bistate) + int options, BulkInsertState bistate, bool *insert_indexes) { bool shouldFree = true; HeapTuple tuple = ExecFetchSlotHeapTuple(slot, true, &shouldFree); @@ -275,6 +275,8 @@ heapam_tuple_insert(Relation relation, TupleTableSlot *slot, CommandId cid, if (shouldFree) pfree(tuple); + *insert_indexes = true; + return slot; } diff --git a/src/backend/access/table/tableam.c b/src/backend/access/table/tableam.c index bb18dacfe11..eb8af13eabe 100644 --- a/src/backend/access/table/tableam.c +++ b/src/backend/access/table/tableam.c @@ -283,9 +283,11 @@ table_tuple_get_latest_tid(TableScanDesc scan, ItemPointer tid) * default command ID and not allowing access to the speedup options. */ void -simple_table_tuple_insert(Relation rel, TupleTableSlot *slot) +simple_table_tuple_insert(Relation rel, TupleTableSlot *slot, + bool *insert_indexes) { - table_tuple_insert(rel, slot, GetCurrentCommandId(true), 0, NULL); + table_tuple_insert(rel, slot, GetCurrentCommandId(true), 0, NULL, + insert_indexes); } /* diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c index 522da0ac855..a508b62a050 100644 --- a/src/backend/catalog/indexing.c +++ b/src/backend/catalog/indexing.c @@ -273,12 +273,14 @@ void CatalogTuplesMultiInsertWithInfo(Relation heapRel, TupleTableSlot **slot, int ntuples, CatalogIndexState indstate) { + bool insertIndexes; + /* Nothing to do */ if (ntuples <= 0) return; heap_multi_insert(heapRel, slot, ntuples, - GetCurrentCommandId(true), 0, NULL); + GetCurrentCommandId(true), 0, NULL, &insertIndexes); /* * There is no equivalent to heap_multi_insert for the catalog indexes, so diff --git a/src/backend/commands/copyfrom.c b/src/backend/commands/copyfrom.c index f4861652a95..840b0621294 100644 --- a/src/backend/commands/copyfrom.c +++ b/src/backend/commands/copyfrom.c @@ -399,6 +399,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); @@ -418,7 +419,8 @@ CopyMultiInsertBufferFlush(CopyMultiInsertInfo *miinfo, nused, mycid, ti_options, - buffer->bistate); + buffer->bistate, + &insertIndexes); MemoryContextSwitchTo(oldcontext); for (i = 0; i < nused; i++) @@ -427,7 +429,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; @@ -1240,11 +1242,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, diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c index e91920ca14a..ef69d72504c 100644 --- a/src/backend/commands/createas.c +++ b/src/backend/commands/createas.c @@ -583,6 +583,7 @@ static bool intorel_receive(TupleTableSlot *slot, DestReceiver *self) { DR_intorel *myState = (DR_intorel *) self; + bool insertIndexes; /* Nothing to insert if WITH NO DATA is specified. */ if (!myState->into->skipData) @@ -599,7 +600,8 @@ intorel_receive(TupleTableSlot *slot, DestReceiver *self) slot, myState->output_cid, myState->ti_options, - myState->bistate); + myState->bistate, + &insertIndexes); } /* We know this is a newly created relation, so there are no indexes */ diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c index ac2e74fa3fb..10cf4933c1a 100644 --- a/src/backend/commands/matview.c +++ b/src/backend/commands/matview.c @@ -479,6 +479,7 @@ static bool transientrel_receive(TupleTableSlot *slot, DestReceiver *self) { DR_transientrel *myState = (DR_transientrel *) self; + bool insertIndexes; /* * Note that the input slot might not be of the type of the target @@ -493,7 +494,8 @@ transientrel_receive(TupleTableSlot *slot, DestReceiver *self) slot, myState->output_cid, myState->ti_options, - myState->bistate); + myState->bistate, + &insertIndexes); /* We know this is a newly created relation, so there are no indexes */ diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 323d9bf8702..d3ee23d08ba 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -6278,8 +6278,12 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode) /* Write the tuple out to the new relation */ if (newrel) + { + bool insertIndexes; + table_tuple_insert(newrel, insertslot, mycid, - ti_options, bistate); + ti_options, bistate, &insertIndexes); + } ResetExprContext(econtext); diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c index f39e1e55ea8..fda9877a55f 100644 --- a/src/backend/executor/execReplication.c +++ b/src/backend/executor/execReplication.c @@ -515,6 +515,7 @@ ExecSimpleRelationInsert(ResultRelInfo *resultRelInfo, if (!skip_tuple) { List *recheckIndexes = NIL; + bool insertIndexes; /* Compute stored generated columns */ if (rel->rd_att->constr && @@ -529,9 +530,10 @@ ExecSimpleRelationInsert(ResultRelInfo *resultRelInfo, ExecPartitionCheck(resultRelInfo, slot, estate, true); /* OK, store the tuple and create index entries for it */ - simple_table_tuple_insert(resultRelInfo->ri_RelationDesc, slot); + simple_table_tuple_insert(resultRelInfo->ri_RelationDesc, slot, + &insertIndexes); - if (resultRelInfo->ri_NumIndices > 0) + if (insertIndexes && resultRelInfo->ri_NumIndices > 0) recheckIndexes = ExecInsertIndexTuples(resultRelInfo, slot, estate, false, false, NULL, NIL, false); diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index ec1d6499dcc..5faf10b254f 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -1040,13 +1040,15 @@ ExecInsert(ModifyTableContext *context, } else { + bool insertIndexes; + /* insert the tuple normally */ slot = table_tuple_insert(resultRelationDesc, slot, estate->es_output_cid, - 0, NULL); + 0, NULL, &insertIndexes); /* insert index entries for tuple */ - if (resultRelInfo->ri_NumIndices > 0) + if (insertIndexes && resultRelInfo->ri_NumIndices > 0) recheckIndexes = ExecInsertIndexTuples(resultRelInfo, slot, estate, false, false, NULL, NIL, diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index e220839d73c..e280cc328e1 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -274,7 +274,7 @@ extern void heap_insert(Relation relation, HeapTuple tup, CommandId cid, int options, BulkInsertState bistate); extern void heap_multi_insert(Relation relation, struct TupleTableSlot **slots, int ntuples, CommandId cid, int options, - BulkInsertState bistate); + BulkInsertState bistate, bool *insert_indexes); extern TM_Result heap_delete(Relation relation, ItemPointer tid, CommandId cid, Snapshot crosscheck, int options, struct TM_FailureData *tmfd, bool changingPart, diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h index 6501576e6ce..58ca3ecaedb 100644 --- a/src/include/access/tableam.h +++ b/src/include/access/tableam.h @@ -514,7 +514,8 @@ typedef struct TableAmRoutine /* see table_tuple_insert() for reference about parameters */ TupleTableSlot *(*tuple_insert) (Relation rel, TupleTableSlot *slot, CommandId cid, int options, - struct BulkInsertStateData *bistate); + struct BulkInsertStateData *bistate, + bool *insert_indexes); /* see table_tuple_insert_with_arbiter() for reference about parameters */ TupleTableSlot *(*tuple_insert_with_arbiter) (ResultRelInfo *resultRelInfo, @@ -529,7 +530,8 @@ typedef struct TableAmRoutine /* see table_multi_insert() for reference about parameters */ void (*multi_insert) (Relation rel, TupleTableSlot **slots, int nslots, - CommandId cid, int options, struct BulkInsertStateData *bistate); + CommandId cid, int options, struct BulkInsertStateData *bistate, + bool *insert_indexes); /* see table_tuple_delete() for reference about parameters */ TM_Result (*tuple_delete) (Relation rel, @@ -1390,6 +1392,10 @@ table_index_delete_tuples(Relation rel, TM_IndexDeleteOp *delstate) * behavior) is also just passed through to RelationGetBufferForTuple. If * `bistate` is provided, table_finish_bulk_insert() needs to be called. * + * This function sets `*insert_indexes` to true if expects caller to return + * the relevant index tuples. If `*insert_indexes` is set to false, then + * this function cares about indexes itself. + * * Returns the slot containing the inserted tuple, which may differ from the * given slot. For instance, source slot may by VirtualTupleTableSlot, but * the result is corresponding to table AM. On return the slot's tts_tid and @@ -1398,10 +1404,11 @@ table_index_delete_tuples(Relation rel, TM_IndexDeleteOp *delstate) */ static inline TupleTableSlot * table_tuple_insert(Relation rel, TupleTableSlot *slot, CommandId cid, - int options, struct BulkInsertStateData *bistate) + int options, struct BulkInsertStateData *bistate, + bool *insert_indexes) { return rel->rd_tableam->tuple_insert(rel, slot, cid, options, - bistate); + bistate, insert_indexes); } /* @@ -1459,10 +1466,11 @@ table_tuple_insert_with_arbiter(ResultRelInfo *resultRelInfo, */ static inline void table_multi_insert(Relation rel, TupleTableSlot **slots, int nslots, - CommandId cid, int options, struct BulkInsertStateData *bistate) + CommandId cid, int options, struct BulkInsertStateData *bistate, + bool *insert_indexes) { rel->rd_tableam->multi_insert(rel, slots, nslots, - cid, options, bistate); + cid, options, bistate, insert_indexes); } /* @@ -2077,7 +2085,8 @@ table_scan_sample_next_tuple(TableScanDesc scan, * ---------------------------------------------------------------------------- */ -extern void simple_table_tuple_insert(Relation rel, TupleTableSlot *slot); +extern void simple_table_tuple_insert(Relation rel, TupleTableSlot *slot, + bool *insert_indexes); extern void simple_table_tuple_delete(Relation rel, ItemPointer tid, Snapshot snapshot, TupleTableSlot *oldSlot); -- 2.39.3 (Apple Git-145)