Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kJcyY-0007dc-8n for pgsql-hackers@arkaria.postgresql.org; Sat, 19 Sep 2020 13:32:26 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1kJcyV-0006JF-8d for pgsql-hackers@arkaria.postgresql.org; Sat, 19 Sep 2020 13:32:23 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kJcyU-0006J6-PK for pgsql-hackers@lists.postgresql.org; Sat, 19 Sep 2020 13:32:23 +0000 Received: from mail-il1-x12a.google.com ([2607:f8b0:4864:20::12a]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1kJcyR-0001Fl-5F for pgsql-hackers@lists.postgresql.org; Sat, 19 Sep 2020 13:32:21 +0000 Received: by mail-il1-x12a.google.com with SMTP id u18so9040129iln.13 for ; Sat, 19 Sep 2020 06:32:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telsasoft-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=iwLfp/QZ8I+L9gLTSdCfPtHUMASdg62i9XUzUJg5RYk=; b=jGagW4frKtchvpXCVJRpwJxoeJwI995ukDXWkyusvolTswHIeXiFOzv2Cd9Tnfc2aH aF/zHHbCbKxj4rbVcERSRlQxF4DUqGaWjHSC8aQlQVlHxu+NS76kAxWZrkRf2dH0yxxq qpsurSBDUv6k1wuJm4ov9yV5tiwu2Zyw+usCetULkCuF4sxI1DzoGGRusSapQvbFpUhd dcmtUlRaZ8EyUPk79pIDsmEQghZSqUnHe0WmA1H3EVEcGXDxJCHcb0uJ/Hgk8OfsW3gd i7igVrJsSmsGDVNTng1x4XYWr03qTrRDdHAAMTHkntFLZxOsY+uTTH+NRGA2AJfBP9Y8 9uGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=iwLfp/QZ8I+L9gLTSdCfPtHUMASdg62i9XUzUJg5RYk=; b=KkWRntVAGVT9yioqZEeZgPHE0GMQd9BQ45+eXlfBUMofe/fZHN2+xJhhm8OvCwMpox h0UUectAosQgFcsw5295I0HxHjRPYD1WuFq7dOc6+bCE/p6EBPLWzASpqkuzLVDnjTk7 eKbcJlwhkDQaLa6P22OSwmk6svmVaCCoXcACBCoXiO7Js0GEmcs6nTI6ATGBooZCWkHK wP8wuaLqfi9BW6VqVO7AVaGaboGIPVK45ddd1wf+Fk53WxzbzfcDhYShMAFFEf4JM325 jPn5WH7LPc1XaA6kYQVZwoc962LQrxB70i8u/YFuWJU+9thE/JR13BdZcPBU4UfgW73j A4Vw== X-Gm-Message-State: AOAM532vGosOy7BIxw5MIK8R/DTYZ3tvEIvaq+E0TvPVg8p3nmr9G4im CduvjD5F70MCrXxgRe7KWcGwQt3vo9qT7w== X-Google-Smtp-Source: ABdhPJy1Iqu8bTvL2FqAHlNKrRxqWh/VukDX0IOrF0924fW0se6pl0LzE4WRR7xhCV599oDNI1CrtQ== X-Received: by 2002:a92:8517:: with SMTP id f23mr34100744ilh.45.1600522337846; Sat, 19 Sep 2020 06:32:17 -0700 (PDT) Received: from pryzbyj.telsasoft (charmander.telsasoft.com. [50.244.222.1]) by smtp.gmail.com with ESMTPSA id c85sm3515608ilg.10.2020.09.19.06.32.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Sep 2020 06:32:16 -0700 (PDT) Received: by pryzbyj.telsasoft (Postfix, from userid 1000) id B403E800D7F; Sat, 19 Sep 2020 08:32:15 -0500 (CDT) Date: Sat, 19 Sep 2020 08:32:15 -0500 From: Justin Pryzby To: Andres Freund Cc: pgsql-hackers@lists.postgresql.org Subject: Re: should INSERT SELECT use a BulkInsertState? Message-ID: <20200919133215.GB30557@telsasoft.com> References: <20200508072545.GA9701@telsasoft.com> <20200604173047.dirdp6zln7ogj54k@alap3.anarazel.de> <20200713015700.GA23581@telsasoft.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="9amGYk9869ThD9tj" Content-Disposition: inline In-Reply-To: <20200713015700.GA23581@telsasoft.com> User-Agent: Mutt/1.9.4 (2018-02-28) List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --9amGYk9869ThD9tj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sun, Jul 12, 2020 at 08:57:00PM -0500, Justin Pryzby wrote: > On Thu, Jun 04, 2020 at 10:30:47AM -0700, Andres Freund wrote: > > On 2020-05-08 02:25:45 -0500, Justin Pryzby wrote: > > > Seems to me it should, at least conditionally. At least if there's a function > > > scan or a relation or .. > > > > Well, the problem is that this can cause very very significant > > regressions. As in 10x slower or more. The ringbuffer can cause constant > > XLogFlush() calls (due to the lsn interlock), and the eviction from > > shared_buffers (regardless of actual available) will mean future vacuums > > etc will be much slower. I think this is likely to cause pretty > > widespread regressions on upgrades. > > > > Now, it sucks that we have this problem in the general facility that's > > supposed to be used for this kind of bulk operation. But I don't really > > see it realistic as expanding use of bulk insert strategies unless we > > have some more fundamental fixes. > > I made this conditional on BEGIN BULK/SET bulk, so I'll solicit comments on that. @cfbot: rebased --9amGYk9869ThD9tj Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v3-0001-Allow-INSERT-SELECT-to-use-a-BulkInsertState.patch" From acfc6ef7b84a6753a49b7f4c9d5b77a0abbfd37c Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Fri, 8 May 2020 02:17:32 -0500 Subject: [PATCH v3] Allow INSERT SELECT to use a BulkInsertState --- src/backend/executor/nodeModifyTable.c | 23 +++++++++++++++++++++-- src/backend/parser/gram.y | 7 ++++++- src/backend/tcop/utility.c | 4 ++++ src/backend/utils/misc/guc.c | 12 +++++++++++- src/include/executor/nodeModifyTable.h | 2 ++ src/include/nodes/execnodes.h | 2 ++ src/include/parser/kwlist.h | 1 + 7 files changed, 47 insertions(+), 4 deletions(-) diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index 9812089161..464ad5e346 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -75,6 +75,8 @@ static ResultRelInfo *getTargetResultRelInfo(ModifyTableState *node); static void ExecSetupChildParentMapForSubplan(ModifyTableState *mtstate); static TupleConversionMap *tupconv_map_for_subplan(ModifyTableState *node, int whichplan); +/* guc */ +bool insert_in_bulk = false; /* * Verify that the tuples to be produced by INSERT or UPDATE match the @@ -578,7 +580,7 @@ ExecInsert(ModifyTableState *mtstate, table_tuple_insert_speculative(resultRelationDesc, slot, estate->es_output_cid, 0, - NULL, + NULL, /* Bulk insert not supported */ specToken); /* insert index entries for tuple */ @@ -617,7 +619,7 @@ ExecInsert(ModifyTableState *mtstate, /* insert the tuple normally */ table_tuple_insert(resultRelationDesc, slot, estate->es_output_cid, - 0, NULL); + 0, mtstate->bistate); /* insert index entries for tuple */ if (resultRelInfo->ri_NumIndices > 0) @@ -2332,6 +2334,17 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags) mtstate->mt_arowmarks = (List **) palloc0(sizeof(List *) * nplans); mtstate->mt_nplans = nplans; + mtstate->bistate = NULL; + if (operation == CMD_INSERT && + node->onConflictAction != ONCONFLICT_UPDATE && + node->rootResultRelIndex < 0) + { + // Plan *p = linitial(node->plans); + Assert(nplans == 1); + + if (insert_in_bulk) + mtstate->bistate = GetBulkInsertState(); + } /* set up epqstate with dummy subplan data for the moment */ EvalPlanQualInit(&mtstate->mt_epqstate, estate, NULL, NIL, node->epqParam); @@ -2776,6 +2789,12 @@ ExecEndModifyTable(ModifyTableState *node) resultRelInfo); } + if (node->bistate) + { + FreeBulkInsertState(node->bistate); + table_finish_bulk_insert((getTargetResultRelInfo(node))->ri_RelationDesc, 0); + } + /* * Close all the partitioned tables, leaf partitions, and their indices * and release the slot used for tuple routing, if set. diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 017940bdcd..0bc2108a2b 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -631,7 +631,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); ASSERTION ASSIGNMENT ASYMMETRIC AT ATTACH ATTRIBUTE AUTHORIZATION BACKWARD BEFORE BEGIN_P BETWEEN BIGINT BINARY BIT - BOOLEAN_P BOTH BY + BOOLEAN_P BOTH BY BULK CACHE CALL CALLED CASCADE CASCADED CASE CAST CATALOG_P CHAIN CHAR_P CHARACTER CHARACTERISTICS CHECK CHECKPOINT CLASS CLOSE @@ -9846,6 +9846,9 @@ transaction_mode_item: | NOT DEFERRABLE { $$ = makeDefElem("transaction_deferrable", makeIntConst(false, @1), @1); } + | BULK + { $$ = makeDefElem("bulk", + makeIntConst(true, @1), @1); } ; /* Syntax with commas is SQL-spec, without commas is Postgres historical */ @@ -15052,6 +15055,7 @@ unreserved_keyword: | BACKWARD | BEFORE | BEGIN_P + | BULK | BY | CACHE | CALL @@ -15563,6 +15567,7 @@ bare_label_keyword: | BIT | BOOLEAN_P | BOTH + | BULK | BY | CACHE | CALL diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 9a35147b26..cb3933b0e9 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -611,6 +611,10 @@ standard_ProcessUtility(PlannedStmt *pstmt, SetPGVariable("transaction_deferrable", list_make1(item->arg), true); + else if (strcmp(item->defname, "bulk") == 0) + SetPGVariable("bulk_insert", + list_make1(item->arg), + true); } } break; diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 596bcb7b84..409c0d6a5a 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -54,6 +54,7 @@ #include "libpq/pqformat.h" #include "miscadmin.h" #include "optimizer/cost.h" +#include "executor/nodeModifyTable.h" #include "optimizer/geqo.h" #include "optimizer/optimizer.h" #include "optimizer/paths.h" @@ -922,7 +923,6 @@ static const unit_conversion time_unit_conversion_table[] = * variable_is_guc_list_quote() in src/bin/pg_dump/dumputils.c. */ - /******** option records follow ********/ static struct config_bool ConfigureNamesBool[] = @@ -2036,6 +2036,16 @@ static struct config_bool ConfigureNamesBool[] = NULL, NULL, NULL }, + { + {"bulk_insert", PGC_USERSET, CLIENT_CONN_STATEMENT, + gettext_noop("Sets the transaction to bulk insert mode."), + gettext_noop("A ring buffer of limited size will be used."), + }, + &insert_in_bulk, + false, + NULL, NULL, NULL + }, + /* End-of-list marker */ { {NULL, 0, 0, NULL, NULL}, NULL, false, NULL, NULL, NULL diff --git a/src/include/executor/nodeModifyTable.h b/src/include/executor/nodeModifyTable.h index 4ec4ebdabc..c0a16e6098 100644 --- a/src/include/executor/nodeModifyTable.h +++ b/src/include/executor/nodeModifyTable.h @@ -15,6 +15,8 @@ #include "nodes/execnodes.h" +extern PGDLLIMPORT bool insert_in_bulk; + extern void ExecComputeStoredGenerated(EState *estate, TupleTableSlot *slot, CmdType cmdtype); extern ModifyTableState *ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags); diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index a5ab1aed14..9d480f1fb1 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -14,6 +14,7 @@ #ifndef EXECNODES_H #define EXECNODES_H +#include "access/heapam.h" #include "access/tupconvert.h" #include "executor/instrument.h" #include "fmgr.h" @@ -1176,6 +1177,7 @@ typedef struct ModifyTableState List **mt_arowmarks; /* per-subplan ExecAuxRowMark lists */ EPQState mt_epqstate; /* for evaluating EvalPlanQual rechecks */ bool fireBSTriggers; /* do we need to fire stmt triggers? */ + BulkInsertState bistate; /* State for bulk insert like INSERT SELECT */ /* * Slot for storing tuples in the root partitioned table's rowtype during diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h index 71dcdf2889..0991da11e7 100644 --- a/src/include/parser/kwlist.h +++ b/src/include/parser/kwlist.h @@ -60,6 +60,7 @@ PG_KEYWORD("binary", BINARY, TYPE_FUNC_NAME_KEYWORD, BARE_LABEL) PG_KEYWORD("bit", BIT, COL_NAME_KEYWORD, BARE_LABEL) PG_KEYWORD("boolean", BOOLEAN_P, COL_NAME_KEYWORD, BARE_LABEL) PG_KEYWORD("both", BOTH, RESERVED_KEYWORD, BARE_LABEL) +PG_KEYWORD("bulk", BULK, UNRESERVED_KEYWORD, BARE_LABEL) PG_KEYWORD("by", BY, UNRESERVED_KEYWORD, BARE_LABEL) PG_KEYWORD("cache", CACHE, UNRESERVED_KEYWORD, BARE_LABEL) PG_KEYWORD("call", CALL, UNRESERVED_KEYWORD, BARE_LABEL) -- 2.17.0 --9amGYk9869ThD9tj--