From da841aa4dc279bb0053de56121c927ec943edff3 Mon Sep 17 00:00:00 2001 From: Alexander Korotkov Date: Thu, 11 Apr 2024 15:47:53 +0300 Subject: 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 --- src/backend/commands/tablecmds.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'src/backend/commands/tablecmds.c') diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index b3fcf6d3cd4..571feea270e 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -6391,12 +6391,8 @@ 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, &insertIndexes); - } + ti_options, bistate); ResetExprContext(econtext); @@ -21037,7 +21033,6 @@ moveSplitTableRows(Relation rel, Relation splitRel, List *partlist, List *newPar while (table_scan_getnextslot(scan, ForwardScanDirection, srcslot)) { bool found = false; - bool insert_indexes; TupleTableSlot *insertslot; /* Extract data from old tuple. */ @@ -21090,12 +21085,9 @@ moveSplitTableRows(Relation rel, Relation splitRel, List *partlist, List *newPar ExecStoreVirtualTuple(insertslot); } - /* - * Write the tuple out to the new relation. We ignore the - * 'insert_indexes' flag since newPartRel has no indexes anyway. - */ + /* Write the tuple out to the new relation. */ (void) table_tuple_insert(pc->partRel, insertslot, mycid, - ti_options, pc->bistate, &insert_indexes); + ti_options, pc->bistate); ResetExprContext(econtext); @@ -21364,7 +21356,6 @@ moveMergedTablesRows(Relation rel, List *mergingPartitionsList, while (table_scan_getnextslot(scan, ForwardScanDirection, srcslot)) { TupleTableSlot *insertslot; - bool insert_indexes; /* Extract data from old tuple. */ slot_getallattrs(srcslot); @@ -21389,12 +21380,9 @@ moveMergedTablesRows(Relation rel, List *mergingPartitionsList, ExecStoreVirtualTuple(insertslot); } - /* - * Write the tuple out to the new relation. We ignore the - * 'insert_indexes' flag since newPartRel has no indexes anyway. - */ + /* Write the tuple out to the new relation. */ (void) table_tuple_insert(newPartRel, insertslot, mycid, - ti_options, bistate, &insert_indexes); + ti_options, bistate); CHECK_FOR_INTERRUPTS(); } -- cgit v1.2.3