From d999b3e11272f44b8cbe75fb4d5d4c518ab43324 Mon Sep 17 00:00:00 2001 From: Bharath Rupireddy Date: Tue, 1 Aug 2023 09:37:22 +0000 Subject: [PATCH v7] Optimize CTAS with multi inserts --- src/backend/commands/createas.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c index e91920ca14..ac30906288 100644 --- a/src/backend/commands/createas.c +++ b/src/backend/commands/createas.c @@ -58,9 +58,7 @@ typedef struct /* These fields are filled by intorel_startup: */ Relation rel; /* relation to write to */ ObjectAddress reladdr; /* address of rel, for ExecCreateTableAs */ - CommandId output_cid; /* cmin to insert in output tuples */ - int ti_options; /* table_tuple_insert performance options */ - BulkInsertState bistate; /* bulk insert state */ + TableInsertState *ti_state; /* table insert state */ } DR_intorel; /* utility functions for CTAS definition creation */ @@ -557,17 +555,24 @@ intorel_startup(DestReceiver *self, int operation, TupleDesc typeinfo) */ myState->rel = intoRelationDesc; myState->reladdr = intoRelationAddr; - myState->output_cid = GetCurrentCommandId(true); - myState->ti_options = TABLE_INSERT_SKIP_FSM; /* * If WITH NO DATA is specified, there is no need to set up the state for * bulk inserts as there are no tuples to insert. */ if (!into->skipData) - myState->bistate = GetBulkInsertState(); + { + int table_am_flags = TABLEAM_USE_MULTI_INSERTS | + TABLEAM_USE_BULKWRITE_BUFFER_ACCESS_STRATEGY; + int table_insert_flags = TABLE_INSERT_SKIP_FSM; + + myState->ti_state = table_insert_begin(intoRelationDesc, + GetCurrentCommandId(true), + table_am_flags, + table_insert_flags); + } else - myState->bistate = NULL; + myState->ti_state = NULL; /* * Valid smgr_targblock implies something already wrote to the relation. @@ -595,11 +600,7 @@ intorel_receive(TupleTableSlot *slot, DestReceiver *self) * would not be cheap either. This also doesn't allow accessing per-AM * data (say a tuple's xmin), but since we don't do that here... */ - table_tuple_insert(myState->rel, - slot, - myState->output_cid, - myState->ti_options, - myState->bistate); + table_multi_insert_v2(myState->ti_state, slot); } /* We know this is a newly created relation, so there are no indexes */ @@ -617,10 +618,7 @@ intorel_shutdown(DestReceiver *self) IntoClause *into = myState->into; if (!into->skipData) - { - FreeBulkInsertState(myState->bistate); - table_finish_bulk_insert(myState->rel, myState->ti_options); - } + table_insert_end(myState->ti_state); /* close rel, but keep lock until commit */ table_close(myState->rel, NoLock); -- 2.34.1