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 1pbfOs-00082T-Q9 for pgsql-committers@arkaria.postgresql.org; Mon, 13 Mar 2023 10:27:30 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1pbfOr-0008OX-EI for pgsql-committers@arkaria.postgresql.org; Mon, 13 Mar 2023 10:27:29 +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 1pbfMm-0006v4-Tr for pgsql-committers@lists.postgresql.org; Mon, 13 Mar 2023 10:25:20 +0000 Received: from mahout.postgresql.org ([2001:4800:3e1:1::227]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pbfMj-000376-V0 for pgsql-committers@lists.postgresql.org; Mon, 13 Mar 2023 10:25:19 +0000 Received: from gemulon.postgresql.org ([2001:4800:3e1:1::198]) by mahout.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pbfMj-0002qr-2R for pgsql-committers@lists.postgresql.org; Mon, 13 Mar 2023 10:25:17 +0000 Received: from localhost ([127.0.0.1] helo=gemulon.postgresql.org) by gemulon.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1pbfMi-003JQ2-3s for pgsql-committers@lists.postgresql.org; Mon, 13 Mar 2023 10:25:16 +0000 Content-Type: multipart/mixed; boundary="===============2526502469548736204==" MIME-Version: 1.0 From: Dean Rasheed To: pgsql-committers@lists.postgresql.org Subject: pgsql: Fix concurrent update issues with MERGE. X-Auto-Response-Suppress: All Auto-Submitted: auto-generated Message-Id: Date: Mon, 13 Mar 2023 10:25:16 +0000 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --===============2526502469548736204== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Rml4IGNvbmN1cnJlbnQgdXBkYXRlIGlzc3VlcyB3aXRoIE1FUkdFLgoKSWYgTUVSR0UgYXR0ZW1w dHMgYW4gVVBEQVRFIG9yIERFTEVURSBvbiBhIHRhYmxlIHdpdGggQkVGT1JFIFJPVwp0cmlnZ2Vy cywgb3IgYSBjcm9zcy1wYXJ0aXRpb24gVVBEQVRFICh3aXRoIG9yIHdpdGhvdXQgdHJpZ2dlcnMp LCBhbmQKYSBjb25jdXJyZW50IFVQREFURSBvciBERUxFVEUgaGFwcGVucywgdGhlIG1lcmdlIGNv ZGUgd291bGQgZmFpbC4KCkluIHNvbWUgY2FzZXMgdGhpcyB3b3VsZCBsZWFkIHRvIGEgY3Jhc2gs IHdoaWxlIGluIG90aGVycyBpdCB3b3VsZApjYXVzZSB0aGUgd3JvbmcgbWVyZ2UgYWN0aW9uIHRv IGJlIGV4ZWN1dGVkLCBvciBubyBhY3Rpb24gYXQgYWxsLiBUaGUKaW1tZWRpYXRlIGNhdXNlIG9m IHRoZSBjcmFzaCB3YXMgdGhlIHRyaWdnZXIgY29kZSBjYWxsaW5nCkV4ZWNHZXRVcGRhdGVOZXdU dXBsZSgpIGFzIHBhcnQgb2YgdGhlIEVQUSBtZWNoYW5pc20sIHdoaWNoIGZhaWxzCmJlY2F1c2Ug ZHVyaW5nIGEgbWVyZ2UgcmlfcHJvamVjdE5ldyBpcyBOVUxMLCBzaW5jZSBtZXJnZSBoYXMgaXRz IG93bgpwZXItYWN0aW9uIHByb2plY3Rpb24gaW5mb3JtYXRpb24sIHdoaWNoIEV4ZWNHZXRVcGRh dGVOZXdUdXBsZSgpIGtub3dzCm5vdGhpbmcgYWJvdXQuCgpGaXggYnkgYXJyYW5naW5nIGZvciB0 aGUgdHJpZ2dlciBjb2RlIHRvIGV4aXQgZWFybHksIHJldHVybmluZyB0aGUKVE1fUmVzdWx0IGFu ZCBUTV9GYWlsdXJlRGF0YSBpbmZvcm1hdGlvbiwgaWYgYSBjb25jdXJyZW50IG1vZGlmaWNhdGlv bgppcyBkZXRlY3RlZCwgYWxsb3dpbmcgdGhlIG1lcmdlIGNvZGUgdG8gZG8gdGhlIG5lY2Vzc2Fy eSBFUFEgaGFuZGxpbmcKaW4gaXRzIG93biB3YXkuIFNpbWlsYXJseSwgcHJldmVudCB0aGUgY3Jv c3MtcGFydGl0aW9uIHVwZGF0ZSBjb2RlCmZyb20gZG9pbmcgYW55IEVQUSBwcm9jZXNzaW5nIGZv ciBhIG1lcmdlLCBhbGxvd2luZyB0aGUgbWVyZ2UgY29kZSB0bwp3b3JrIG91dCB3aGF0IGl0IG5l ZWRzIHRvIGRvLgoKVGhpcyBsZWFkcyB0byBhIG51bWJlciBvZiBzaW1wbGlmaWNhdGlvbnMgaW4g bm9kZU1vZGlmeVRhYmxlLmMuIE1vc3QKbm90YWJseSwgdGhlIE1vZGlmeVRhYmxlQ29udGV4dC0+ R2V0VXBkYXRlTmV3VHVwbGUoKSBjYWxsYmFjayBpcyBubwpsb25nZXIgbmVlZGVkLCBhbmQgbWVy Z2VHZXRVcGRhdGVOZXdUdXBsZSgpIGNhbiBiZSBkZWxldGVkLCBzaW5jZQp0aGVyZSBpcyBubyBs b25nZXIgYW55IHJlcXVpcmVtZW50IGZvciBnZXQtdXBkYXRlLW5ldy10dXBsZSBkdXJpbmcgYQpt ZXJnZS4gU2ltaWxhcmx5LCBNb2RpZnlUYWJsZUNvbnRleHQtPmNwVXBkYXRlUmV0cnlTbG90IGlz IG5vIGxvbmdlcgpuZWVkZWQuIFRodXMgRXhlY0dldFVwZGF0ZU5ld1R1cGxlKCkgYW5kIHRoZSBy ZXRyeV9zbG90IGhhbmRsaW5nIG9mCkV4ZWNDcm9zc1BhcnRpdGlvblVwZGF0ZSgpIGNhbiBiZSBy ZXN0b3JlZCB0byBob3cgdGhleSB3ZXJlIGluIHYxNCwKYmVmb3JlIHRoZSBtZXJnZSBjb2RlIHdh cyBhZGRlZCwgYW5kIEV4ZWNNZXJnZU1hdGNoZWQoKSBubyBsb25nZXIKbmVlZHMgYW55IHNwZWNp YWwtY2FzZSBoYW5kbGluZyBmb3IgY3Jvc3MtcGFydGl0aW9uIHVwZGF0ZXMuCgpXaGlsZSBhdCBp dCwgdGlkeSB1cCBFeGVjVXBkYXRlRXBpbG9ndWUoKSBhIGJpdCwgbWFraW5nIGl0IGhhbmRsZQpy ZWNoZWNrSW5kZXhlcyBsb2NhbGx5LCByYXRoZXIgdGhhbiBwYXNzaW5nIGl0IGluIGFzIGEgcGFy YW1ldGVyLAplbnN1cmluZyB0aGF0IGl0IGlzIGZyZWVkIHByb3Blcmx5LiBUaGlzIGRhdGVzIGJh Y2sgdG8gd2hlbiBpdCB3YXMKc3BsaXQgb2ZmIGZyb20gRXhlY1VwZGF0ZSgpIHRvIHN1cHBvcnQg bWVyZ2UuCgpQZXIgYnVnICMxNzgwOSBmcm9tIEFsZXhhbmRlciBMYWtoaW4sIGFuZCBmb2xsb3ct dXAgaW52ZXN0aWdhdGlvbiBvZgpidWcgIzE3NzkyLCBhbHNvIGZyb20gQWxleGFuZGVyIExha2hp bi4KCkJhY2stcGF0Y2ggdG8gdjE1LCB3aGVyZSBNRVJHRSB3YXMgaW50cm9kdWNlZCwgdGFraW5n IGNhcmUgdG8gcHJlc2VydmUKYmFja3dhcmRzLWNvbXBhdGliaWxpdHkgb2YgdGhlIHRyaWdnZXIg QVBJIGluIHYxNSBmb3IgYW55IGV4dGVuc2lvbnMKdGhhdCBtaWdodCB1c2UgaXQuCgpEaXNjdXNz aW9uOgogIGh0dHBzOi8vcG9zdGdyLmVzL20vMTc4MDktOWU2NjUwYmVmMTMzZjBmZSU0MHBvc3Rn cmVzcWwub3JnCiAgaHR0cHM6Ly9wb3N0Z3IuZXMvbS8xNzc5Mi0wZjg5NDUyMDI5NjYyYzM2JTQw cG9zdGdyZXNxbC5vcmcKCkJyYW5jaAotLS0tLS0KUkVMXzE1X1NUQUJMRQoKRGV0YWlscwotLS0t LS0tCmh0dHBzOi8vZ2l0LnBvc3RncmVzcWwub3JnL3BnL2NvbW1pdGRpZmYvN2Q5YTc1NzEzYWI5 MTA3MWEyMTEwZTI1ZTdjODZjYmYyYTZmZGM0YgoKTW9kaWZpZWQgRmlsZXMKLS0tLS0tLS0tLS0t LS0Kc3JjL2JhY2tlbmQvY29tbWFuZHMvdHJpZ2dlci5jICAgICAgICAgICAgICAgICAgICAgfCAg ODIgKysrKysrLS0Kc3JjL2JhY2tlbmQvZXhlY3V0b3Ivbm9kZU1vZGlmeVRhYmxlLmMgICAgICAg ICAgICAgfCAxODEgKysrKystLS0tLS0tLS0tLQpzcmMvaW5jbHVkZS9jb21tYW5kcy90cmlnZ2Vy LmggICAgICAgICAgICAgICAgICAgICB8ICAxNiArKwpzcmMvdGVzdC9pc29sYXRpb24vZXhwZWN0 ZWQvbWVyZ2UtZGVsZXRlLm91dCAgICAgICB8IDE5NSArKysrKysrKysrKysrLS0tLQouLi4vaXNv bGF0aW9uL2V4cGVjdGVkL21lcmdlLW1hdGNoLXJlY2hlY2sub3V0ICAgICB8IDIzMyArKysrKysr KysrKysrKysrKysrKysKc3JjL3Rlc3QvaXNvbGF0aW9uL3NwZWNzL21lcmdlLWRlbGV0ZS5zcGVj ICAgICAgICAgfCAgNjYgKysrKystCnNyYy90ZXN0L2lzb2xhdGlvbi9zcGVjcy9tZXJnZS1tYXRj aC1yZWNoZWNrLnNwZWMgIHwgMTA3ICsrKysrKysrKysKNyBmaWxlcyBjaGFuZ2VkLCA2OTMgaW5z ZXJ0aW9ucygrKSwgMTg3IGRlbGV0aW9ucygtKQoK --===============2526502469548736204==--