MIME-Version: 1.0
From: Ayush Tiwari <ayushtiwari.slg01@gmail.com>
Date: Tue, 5 May 2026 01:27:00 +0530
Message-ID: 
 <CAJTYsWXFy1j_T82+M_S9kFxU414tQYnZQD-b82=oL_LbG_5fPQ@mail.gmail.com>
Subject: [PATCH] Clean up property graph error messages
To: PostgreSQL Hackers <pgsql-hackers@postgresql.org>,
 Peter Eisentraut <peter@eisentraut.org>,
	Ashutosh Bapat <ashutosh.bapat.oss@gmail.com>
Content-Type: multipart/mixed; boundary="0000000000002546af06510356a8"
Archived-At: 
 <https://www.postgresql.org/message-id/CAJTYsWXFy1j_T82%2BM_S9kFxU414tQYnZQD-b82%3DoL_LbG_5fPQ%40mail.gmail.com>
Precedence: bulk

--0000000000002546af06510356a8
Content-Type: multipart/alternative; boundary="0000000000002546ad06510356a6"

--0000000000002546ad06510356a6
Content-Type: text/plain; charset="UTF-8"

Hi,

While looking at the SQL/PGQ property graph error paths, I noticed a
few small cleanups in propgraphcmds.c.

The attached patch fixes a user-visible error message from "mismatching
properties names" to "mismatching property names", and moves a
ReleaseSysCache() call before an ERROR ereport in
check_element_properties().

The existing code should be cleaned up by
the resource owner on the ERROR path, but the explicit ReleaseSysCache()
placed after ereport(ERROR) was unreachable.

The regression expected output is updated for the changed error text.

[On a separate note, it might be better to change all "vertexes" to
"vertices",
haven't included that in the patch though since the other one is not exactly
wrong?]

Regards,
Ayus

--0000000000002546ad06510356a6
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">Hi,<div><br></div><div>While looking at the SQL/PGQ proper=
ty graph error paths, I noticed a<br>few small cleanups in propgraphcmds.c.=
<br><br>The attached patch fixes a user-visible error message from &quot;mi=
smatching<br>properties names&quot; to &quot;mismatching property names&quo=
t;, and moves a<br>ReleaseSysCache() call before an ERROR ereport in<br>che=
ck_element_properties(). =C2=A0</div><div><br></div><div>The existing code =
should be cleaned up by<br>the resource owner on the ERROR path, but the ex=
plicit ReleaseSysCache()<br>placed after ereport(ERROR) was unreachable.<br=
><br>The regression expected output is updated for the changed error text.<=
/div><div><br></div><div>[On a=C2=A0separate note, it might be better to ch=
ange all &quot;vertexes&quot; to &quot;vertices&quot;,</div><div>haven&#39;=
t=C2=A0included that in the patch though since the other one is not exactly=
</div><div>wrong?]</div><div><br></div><div>Regards,<br>Ayus</div></div>

--0000000000002546ad06510356a6--

--0000000000002546af06510356a8
Content-Type: application/octet-stream;
	name="v1-0001-Clean-up-property-graph-error-messages.patch"
Content-Disposition: attachment;
	filename="v1-0001-Clean-up-property-graph-error-messages.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_morm3hjt0>
X-Attachment-Id: f_morm3hjt0

RnJvbSA0YzVhY2EyZDVlNzU0OTExOTY5ODMxYTY1OGQ1MTFmYTUzYmRmZTAzIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBBeXVzaCBUaXdhcmkgPGF5dXNodGl3YXJpLnNsZzAxQGdtYWls
LmNvbT4KRGF0ZTogVHVlLCA1IE1heSAyMDI2IDAxOjEzOjE4ICswNTMwClN1YmplY3Q6IFtQQVRD
SCB2MV0gQ2xlYW4gdXAgcHJvcGVydHkgZ3JhcGggZXJyb3IgbWVzc2FnZXMKCmNoZWNrX2VsZW1l
bnRfcHJvcGVydGllcygpIHNhdmVkIGEgUmVsZWFzZVN5c0NhY2hlKCkgY2FsbCB1bnRpbCBhZnRl
cgplcmVwb3J0KEVSUk9SKSwgbWFraW5nIHRoZSBleHBsaWNpdCByZWxlYXNlIHVucmVhY2hhYmxl
LiAgQ29weSB0aGUKY2F0YWxvZyBmaWVsZHMgbmVlZGVkIGZvciB0aGUgZXJyb3IgbWVzc2FnZSBh
bmQgcmVsZWFzZSB0aGUgc3lzY2FjaGUKZW50cnkgYmVmb3JlIGJ1aWxkaW5nIGFuZCByZXBvcnRp
bmcgdGhlIGVycm9yLgoKQWxzbyBmaXggdGhlIHdvcmRpbmcgb2YgYSBwcm9wZXJ0eSBncmFwaCBs
YWJlbCBjb25zaXN0ZW5jeSBlcnJvciBmcm9tCiJtaXNtYXRjaGluZyBwcm9wZXJ0aWVzIG5hbWVz
IiB0byAibWlzbWF0Y2hpbmcgcHJvcGVydHkgbmFtZXMiLCBhbmQKdXBkYXRlIHRoZSBtYXRjaGlu
ZyBleHBlY3RlZCBvdXRwdXQuCi0tLQogc3JjL2JhY2tlbmQvY29tbWFuZHMvcHJvcGdyYXBoY21k
cy5jICAgICAgICAgICAgICAgfCAxNCArKysrKysrKystLS0tLQogLi4uL3JlZ3Jlc3MvZXhwZWN0
ZWQvY3JlYXRlX3Byb3BlcnR5X2dyYXBoLm91dCAgICAgfCAgNCArKy0tCiAyIGZpbGVzIGNoYW5n
ZWQsIDExIGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2Jh
Y2tlbmQvY29tbWFuZHMvcHJvcGdyYXBoY21kcy5jIGIvc3JjL2JhY2tlbmQvY29tbWFuZHMvcHJv
cGdyYXBoY21kcy5jCmluZGV4IDZkNTA5ZmNjZjQ2Li43Nzg0ZGQwZjVjNSAxMDA2NDQKLS0tIGEv
c3JjL2JhY2tlbmQvY29tbWFuZHMvcHJvcGdyYXBoY21kcy5jCisrKyBiL3NyYy9iYWNrZW5kL2Nv
bW1hbmRzL3Byb3BncmFwaGNtZHMuYwpAQCAtMTExMyw2ICsxMTEzLDggQEAgY2hlY2tfZWxlbWVu
dF9wcm9wZXJ0aWVzKE9pZCBwZW9pZCkKIAkJCQkJCUhlYXBUdXBsZQl0dXBsZTM7CiAJCQkJCQlG
b3JtX3BnX3Byb3BncmFwaF9lbGVtZW50IGVsZm9ybTsKIAkJCQkJCUxpc3QJICAgKmRwY29udGV4
dDsKKwkJCQkJCWNoYXIJICAgKmVsZW1lbnRfbmFtZTsKKwkJCQkJCU9pZAkJCWVsZW1lbnRfcmVs
aWQ7CiAJCQkJCQljaGFyCSAgICpkcGEsCiAJCQkJCQkJCSAgICpkcGI7CiAKQEAgLTExMjAsNyAr
MTEyMiwxMSBAQCBjaGVja19lbGVtZW50X3Byb3BlcnRpZXMoT2lkIHBlb2lkKQogCQkJCQkJaWYg
KCF0dXBsZTMpCiAJCQkJCQkJZWxvZyhFUlJPUiwgImNhY2hlIGxvb2t1cCBmYWlsZWQgZm9yIHBy
b3BlcnR5IGdyYXBoIGVsZW1lbnQgJXUiLCBwZW9pZCk7CiAJCQkJCQllbGZvcm0gPSAoRm9ybV9w
Z19wcm9wZ3JhcGhfZWxlbWVudCkgR0VUU1RSVUNUKHR1cGxlMyk7Ci0JCQkJCQlkcGNvbnRleHQg
PSBkZXBhcnNlX2NvbnRleHRfZm9yKGdldF9yZWxfbmFtZShlbGZvcm0tPnBnZXJlbGlkKSwgZWxm
b3JtLT5wZ2VyZWxpZCk7CisJCQkJCQllbGVtZW50X25hbWUgPSBwc3RyZHVwKE5hbWVTdHIoZWxm
b3JtLT5wZ2VhbGlhcykpOworCQkJCQkJZWxlbWVudF9yZWxpZCA9IGVsZm9ybS0+cGdlcmVsaWQ7
CisJCQkJCQlSZWxlYXNlU3lzQ2FjaGUodHVwbGUzKTsKKworCQkJCQkJZHBjb250ZXh0ID0gZGVw
YXJzZV9jb250ZXh0X2ZvcihnZXRfcmVsX25hbWUoZWxlbWVudF9yZWxpZCksIGVsZW1lbnRfcmVs
aWQpOwogCiAJCQkJCQlkcGEgPSBkZXBhcnNlX2V4cHJlc3Npb24obmEsIGRwY29udGV4dCwgZmFs
c2UsIGZhbHNlKTsKIAkJCQkJCWRwYiA9IGRlcGFyc2VfZXhwcmVzc2lvbihuYiwgZHBjb250ZXh0
LCBmYWxzZSwgZmFsc2UpOwpAQCAtMTE0MSwxMCArMTE0Nyw4IEBAIGNoZWNrX2VsZW1lbnRfcHJv
cGVydGllcyhPaWQgcGVvaWQpCiAJCQkJCQllcmVwb3J0KEVSUk9SLAogCQkJCQkJCQllcnJjb2Rl
KEVSUkNPREVfU1lOVEFYX0VSUk9SKSwKIAkJCQkJCQkJZXJybXNnKCJlbGVtZW50IFwiJXNcIiBw
cm9wZXJ0eSBcIiVzXCIgZXhwcmVzc2lvbiBtaXNtYXRjaDogJXMgdnMuICVzIiwKLQkJCQkJCQkJ
CSAgIE5hbWVTdHIoZWxmb3JtLT5wZ2VhbGlhcyksIGdldF9wcm9wZ3JhcGhfcHJvcGVydHlfbmFt
ZShwcm9wb2lkKSwgZHBhLCBkcGIpLAorCQkJCQkJCQkJICAgZWxlbWVudF9uYW1lLCBnZXRfcHJv
cGdyYXBoX3Byb3BlcnR5X25hbWUocHJvcG9pZCksIGRwYSwgZHBiKSwKIAkJCQkJCQkJZXJyZGV0
YWlsKCJJbiBhIHByb3BlcnR5IGdyYXBoIGVsZW1lbnQsIGEgcHJvcGVydHkgb2YgdGhlIHNhbWUg
bmFtZSBoYXMgdG8gaGF2ZSB0aGUgc2FtZSBleHByZXNzaW9uIGluIGVhY2ggbGFiZWwuIikpOwot
Ci0JCQkJCQlSZWxlYXNlU3lzQ2FjaGUodHVwbGUzKTsKIAkJCQkJfQogCiAJCQkJCWJyZWFrOwpA
QCAtMTI2Niw3ICsxMjcwLDcgQEAgY2hlY2tfZWxlbWVudF9sYWJlbF9wcm9wZXJ0aWVzKE9pZCBl
bGxhYmVsb2lkKQogCWlmIChkaWZmMSB8fCBkaWZmMikKIAkJZXJlcG9ydChFUlJPUiwKIAkJCQll
cnJjb2RlKEVSUkNPREVfSU5WQUxJRF9PQkpFQ1RfREVGSU5JVElPTiksCi0JCQkJZXJybXNnKCJt
aXNtYXRjaGluZyBwcm9wZXJ0aWVzIG5hbWVzIGluIGRlZmluaXRpb24gb2YgbGFiZWwgXCIlc1wi
IiwgZ2V0X3Byb3BncmFwaF9sYWJlbF9uYW1lKGxhYmVsaWQpKSk7CisJCQkJZXJybXNnKCJtaXNt
YXRjaGluZyBwcm9wZXJ0eSBuYW1lcyBpbiBkZWZpbml0aW9uIG9mIGxhYmVsIFwiJXNcIiIsIGdl
dF9wcm9wZ3JhcGhfbGFiZWxfbmFtZShsYWJlbGlkKSkpOwogfQogCiAvKgpkaWZmIC0tZ2l0IGEv
c3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9jcmVhdGVfcHJvcGVydHlfZ3JhcGgub3V0IGIvc3Jj
L3Rlc3QvcmVncmVzcy9leHBlY3RlZC9jcmVhdGVfcHJvcGVydHlfZ3JhcGgub3V0CmluZGV4IGJj
OWE1OTZlYzg5Li5iZmE2NzEyYjM2NSAxMDA2NDQKLS0tIGEvc3JjL3Rlc3QvcmVncmVzcy9leHBl
Y3RlZC9jcmVhdGVfcHJvcGVydHlfZ3JhcGgub3V0CisrKyBiL3NyYy90ZXN0L3JlZ3Jlc3MvZXhw
ZWN0ZWQvY3JlYXRlX3Byb3BlcnR5X2dyYXBoLm91dApAQCAtMjEwLDExICsyMTAsMTEgQEAgQ1JF
QVRFIFBST1BFUlRZIEdSQVBIIGd4CiAgICAgICAgIHQxIEtFWSAoYSkgTEFCRUwgbDEgUFJPUEVS
VElFUyAoYSwgYiksCiAgICAgICAgIHQyIEtFWSAoaSkgTEFCRUwgbDEgUFJPUEVSVElFUyAoaSBB
UyBhLCBqIEFTIGopICAtLSBtaXNtYXRjaGluZyBwcm9wZXJ0eSBuYW1lcyBvbiBsYWJlbAogICAg
ICk7Ci1FUlJPUjogIG1pc21hdGNoaW5nIHByb3BlcnRpZXMgbmFtZXMgaW4gZGVmaW5pdGlvbiBv
ZiBsYWJlbCAibDEiCitFUlJPUjogIG1pc21hdGNoaW5nIHByb3BlcnR5IG5hbWVzIGluIGRlZmlu
aXRpb24gb2YgbGFiZWwgImwxIgogQUxURVIgUFJPUEVSVFkgR1JBUEggZzQgQUxURVIgVkVSVEVY
IFRBQkxFIHQxIEFERCBMQUJFTCB0M2wxIFBST1BFUlRJRVMgKGEgQVMgeCwgYiBBUyB5eSwgYiBB
UyB6eik7ICAtLSBtaXNtYXRjaGluZyBudW1iZXIgb2YgcHJvcGVydGllcyBvbiBsYWJlbAogRVJS
T1I6ICBtaXNtYXRjaGluZyBudW1iZXIgb2YgcHJvcGVydGllcyBpbiBkZWZpbml0aW9uIG9mIGxh
YmVsICJ0M2wxIgogQUxURVIgUFJPUEVSVFkgR1JBUEggZzQgQUxURVIgVkVSVEVYIFRBQkxFIHQx
IEFERCBMQUJFTCB0M2wxIFBST1BFUlRJRVMgKGEgQVMgeCwgYiBBUyB6eik7ICAtLSBtaXNtYXRj
aGluZyBwcm9wZXJ0eSBuYW1lcyBvbiBsYWJlbAotRVJST1I6ICBtaXNtYXRjaGluZyBwcm9wZXJ0
aWVzIG5hbWVzIGluIGRlZmluaXRpb24gb2YgbGFiZWwgInQzbDEiCitFUlJPUjogIG1pc21hdGNo
aW5nIHByb3BlcnR5IG5hbWVzIGluIGRlZmluaXRpb24gb2YgbGFiZWwgInQzbDEiCiBBTFRFUiBQ
Uk9QRVJUWSBHUkFQSCBnNCBBTFRFUiBWRVJURVggVEFCTEUgdDEgQUREIExBQkVMIHQzbDEgUFJP
UEVSVElFUyAoYSBBUyB4KTsgIC0tIG1pc21hdGNoaW5nIG51bWJlciBvZiBwcm9wZXJ0aWVzIG9u
IGxhYmVsCiBFUlJPUjogIG1pc21hdGNoaW5nIG51bWJlciBvZiBwcm9wZXJ0aWVzIGluIGRlZmlu
aXRpb24gb2YgbGFiZWwgInQzbDEiCiBBTFRFUiBQUk9QRVJUWSBHUkFQSCBnMSBPV05FUiBUTyBy
ZWdyZXNzX2dyYXBoX3VzZXIxOwotLSAKMi4zNC4xCgo=
--0000000000002546af06510356a8--