Received: from malur.postgresql.org ([217.196.149.56])
	by arkaria.postgresql.org with esmtps  (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.96)
	(envelope-from <pgsql-hackers-owner+archive@lists.postgresql.org>)
	id 1wI4Vq-007lRZ-1S
	for pgsql-hackers@arkaria.postgresql.org;
	Wed, 29 Apr 2026 12:59:35 +0000
Received: from localhost ([127.0.0.1] helo=malur.postgresql.org)
	by malur.postgresql.org with esmtp (Exim 4.96)
	(envelope-from <pgsql-hackers-owner+archive@lists.postgresql.org>)
	id 1wI4Vp-003ZAa-1A
	for pgsql-hackers@arkaria.postgresql.org;
	Wed, 29 Apr 2026 12:59:33 +0000
Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29])
	by malur.postgresql.org with esmtps  (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.96)
	(envelope-from <li.evan.chao@gmail.com>)
	id 1wI4Vo-003ZAR-3D
	for pgsql-hackers@lists.postgresql.org;
	Wed, 29 Apr 2026 12:59:33 +0000
Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429])
	by magus.postgresql.org with esmtps  (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
	(Exim 4.98.2)
	(envelope-from <li.evan.chao@gmail.com>)
	id 1wI4Vm-00000003nnJ-1pSN
	for pgsql-hackers@lists.postgresql.org;
	Wed, 29 Apr 2026 12:59:32 +0000
Received: by mail-pf1-x429.google.com with SMTP id
 d2e1a72fcca58-82f1bfc9b8fso5711430b3a.1
        for <pgsql-hackers@lists.postgresql.org>;
 Wed, 29 Apr 2026 05:59:30 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20251104; t=1777467568; x=1778072368;
 darn=lists.postgresql.org;
        h=references:to:cc:in-reply-to:date:subject:mime-version:message-id
         :from:from:to:cc:subject:date:message-id:reply-to;
        bh=U2RYRaQk2ivaAZ7KO2xr9vc3J+9a6jMQvtfYbMSkNe4=;
        b=JDhiJ1p2g+TiUJ3zBU9ADflKr3Xo3Yba9RG07R6gv0lVwweinwsN2Y4ZEPzIBOPhGj
         cOISP20+SGIaDbV40+5TVByzM/mcLHzreUNOOeeKbbq/Hp1F7jGNqsb5CV++rGPhfUCF
         Y42GQcddK9H9KdaQW+tbP9FOlELpMLaPXzzGPqsZvx0XM1Ohm1APB4eIrWVy/9OOIk7l
         oM0mGl55o7KbT89AMnfW9oqyy5OsJDFOlYLRFawA3fqT8cOLjbZNEBMaCUPSQRA7oPdb
         bBSTkOufpk5cSXIqokLj8la5qN/ilMb1Y5mETWHlVbMRdBaA2vsYHGog3vBCNz5j6fUD
         HPBQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20251104; t=1777467568; x=1778072368;
        h=references:to:cc:in-reply-to:date:subject:mime-version:message-id
         :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=U2RYRaQk2ivaAZ7KO2xr9vc3J+9a6jMQvtfYbMSkNe4=;
        b=jOARLaHFdGXDSlP9c3QSho8u+HpCw7+lYW5s7rClvsiY8xW+4LcIQhCUuA8yveSouS
         iurGjq31xAW2ZDzOA7ithPXU2/deqPzQ5W1zuQ5Y/UUyBUITrakeqYvr+sQm/j4P4Agf
         tH/s0zsTQzUoZg0SZuld48jV99OO/wv+x7kQ0EZjALF9CYoPKmCGDAI8IDII+Pt2sorQ
         9OrD2tS56XTuyrq1GVw7CiOmnl0E5LMSsFSXcaGbD7Ml5dLh0T/g+uDzv8R6eYOVevLE
         lF35G0VJS7cTLEHqv22OQP6Kf7A2pR+MCbDTEpZjV8ewVZ7Zwdpmi2Ah8NZlxJ1vQzst
         ApxA==
X-Forwarded-Encrypted: i=1;
 AFNElJ+bSDHSVlGhSauUb7O5EntS14fXiejT6/NB0A8oLR0HMmuNvlVQSKkLSoO3jBwE3SdISUtcRYl6lBtUWkj1@lists.postgresql.org
X-Gm-Message-State: AOJu0Yym+mQpIPiqvf6jFV5U8sX14xZGd82v0M1Pgs/+kJzvWxgWIQhD
	scGlJfYYR+UIJAYmX4tmCbqqi9UXZ3ugYPadbHhIlaBK86W2/t1OLBXY
X-Gm-Gg: AeBDievLbuRd/qYBHKThNvtyq8Rvdkf6pKaOu2I8SIy0VMjW+AJufeDtLLd6ZxLY3MI
	jLhkAHxk6Dpll470SCZx0SYo236HDqZbIb/LU4tImPBcD4LD7xdvzcYslfZe9fQIadJ2WOofRy6
	imdjOoNXOTaKVhlsG7P4PXYbtq4ZDeM2+aMTRLFOVnMD/h/K1I19c5Z5Z+qY7FhdRh4PxdB9NgO
	H9vFTPQTt8uqz/0qYc7+9IM7uxoUTc1Gw+Lcj3JVJjKbi/t6FJ5REOr8rItLr3XrDdtgTzo0aF5
	okSNML+LxP0WnXUcpumSUygbTE3Omf+K19m93SIIAb8g0PUjGLx8FitwRmCLnCF7o9zelOlpLE9
	z3ka9+Fo6ijXQeZGXg2kUE4UnWPCA2W1jw/M/4Ak3x8OzFQNeaQ2jsoI6d1KjzM+zdUzZr8uRhE
	nGnXH/t3pzn1vgEZyla5/XBBGZHiYM8wb9QYcLJBv2cQ==
X-Received: by 2002:a05:6a00:6c83:b0:82c:ae0e:dea with SMTP id
 d2e1a72fcca58-834ddb9f511mr7410772b3a.32.1777467568205;
        Wed, 29 Apr 2026 05:59:28 -0700 (PDT)
Received: from smtpclient.apple ([45.32.121.103])
        by smtp.gmail.com with ESMTPSA id
 d2e1a72fcca58-834ed7eb783sm2034910b3a.42.2026.04.29.05.59.25
        (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
        Wed, 29 Apr 2026 05:59:27 -0700 (PDT)
From: Chao Li <li.evan.chao@gmail.com>
Message-Id: <0E47B575-A8AE-4366-AD73-7A25BF0D7815@gmail.com>
Content-Type: multipart/mixed;
	boundary="Apple-Mail=_3FEB1E90-2E50-4078-B2C9-C5E27ED58F02"
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.400.21\))
Subject: Re: [Bug][patch]: After dropping the last label from a property graph
 element, invoking pg_get_propgraphdef() triggers an assertion failure
Date: Wed, 29 Apr 2026 20:58:47 +0800
In-Reply-To: 
 <CAExHW5tiOi=8Oq5Tza8gNz_jYmbWv+vb+p2fARUbfGnm-m7-9Q@mail.gmail.com>
Cc: SATYANARAYANA NARLAPURAM <satyanarlapuram@gmail.com>,
 PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>
To: Ashutosh Bapat <ashutosh.bapat.oss@gmail.com>
References: 
 <CAHg+QDeP=mTHTV48R23zKMy1SBmCKZ_L7-z5zKnYyw+K0x-gCg@mail.gmail.com>
 <CAExHW5tsOK7ja2dMykD_qQSLwsuZxCTHx_jFyx-7-O+9WRBDXQ@mail.gmail.com>
 <CAHg+QDcXxmeiuySsyR5K=8Wk9Pq2sZ_4HNb6EMonN=yjLz_fyw@mail.gmail.com>
 <CAExHW5t2YtTMnK7qbvL++pBet-5B8bzgU+8wMcC5aqZwBH0C9w@mail.gmail.com>
 <CAHg+QDdAoW2cU2Wa-yKQs2awHxc19mkHGaAvDUZN=PZUDVsD=A@mail.gmail.com>
 <CAExHW5uThebnwqyWHrsF2Z+no-fT8VrM0Yj+RU7YWrYzdavUZg@mail.gmail.com>
 <CAExHW5tiOi=8Oq5Tza8gNz_jYmbWv+vb+p2fARUbfGnm-m7-9Q@mail.gmail.com>
X-Mailer: Apple Mail (2.3864.400.21)
List-Id: <pgsql-hackers.lists.postgresql.org>
List-Help: <https://lists.postgresql.org/manage/>
List-Subscribe: <https://lists.postgresql.org/manage/>
List-Post: <mailto:pgsql-hackers@lists.postgresql.org>
List-Owner: <mailto:pgsql-hackers-owner@lists.postgresql.org>
List-Archive: <https://www.postgresql.org/list/pgsql-hackers>
Archived-At: 
 <https://www.postgresql.org/message-id/0E47B575-A8AE-4366-AD73-7A25BF0D7815%40gmail.com>
Precedence: bulk


--Apple-Mail=_3FEB1E90-2E50-4078-B2C9-C5E27ED58F02
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=utf-8



> On Apr 28, 2026, at 23:02, Ashutosh Bapat =
<ashutosh.bapat.oss@gmail.com> wrote:
>=20
> On Tue, Apr 21, 2026 at 5:49=E2=80=AFPM Ashutosh Bapat
> <ashutosh.bapat.oss@gmail.com> wrote:
>>=20
>> On Tue, Apr 21, 2026 at 1:29=E2=80=AFPM SATYANARAYANA NARLAPURAM
>> <satyanarlapuram@gmail.com> wrote:
>>>=20
>>> Hi,
>>>=20
>>> On Mon, Apr 20, 2026 at 11:58=E2=80=AFPM Ashutosh Bapat =
<ashutosh.bapat.oss@gmail.com> wrote:
>>>>=20
>>>> On Tue, Apr 21, 2026 at 11:28=E2=80=AFAM SATYANARAYANA NARLAPURAM
>>>> <satyanarlapuram@gmail.com> wrote:
>>>>>=20
>>>>> HI Ashutosh,
>>>>>=20
>>>>> On Mon, Apr 20, 2026 at 10:34=E2=80=AFPM Ashutosh Bapat =
<ashutosh.bapat.oss@gmail.com> wrote:
>>>>>>=20
>>>>>> On Mon, Apr 20, 2026 at 11:42=E2=80=AFPM SATYANARAYANA NARLAPURAM
>>>>>> <satyanarlapuram@gmail.com> wrote:
>>>>>>>=20
>>>>>>> Hi hackers,
>>>>>>>=20
>>>>>>> ALTER PROPERTY GRAPH ... ALTER ... DROP LABEL currently allows =
removing
>>>>>>> the last label from an element, leaving it with zero labels.
>>>>>>>=20
>>>>>>> On assert-enabled builds, pg_get_propgraphdef() hits
>>>>>>> TRAP: failed Assert("count > 0"), File: "ruleutils.c", Line: =
1837, PID: 1821840
>>>>>>>=20
>>>>>>> Repro:
>>>>>>>=20
>>>>>>> CREATE TABLE t (x int PRIMARY KEY, y int, z int);
>>>>>>> CREATE PROPERTY GRAPH g VERTEX TABLES (t KEY (x) LABEL l1 LABEL =
l2);
>>>>>>> ALTER PROPERTY GRAPH g ALTER VERTEX TABLE t DROP LABEL l2;
>>>>>>> ALTER PROPERTY GRAPH g ALTER VERTEX TABLE t DROP LABEL l1;
>>>>>>> SELECT pg_get_propgraphdef('g'::regclass);
>>>>>>>=20
>>>>>>> We can fix it two ways, (1) Prevent dropping the last label; (2) =
handle zero labels.
>>>>>>> I feel it is easier to prevent dropping the last label than =
handling zero labels. Thoughts?
>>>>>>>=20
>>>>>>=20
>>>>>> SQL/PGQ standard section 11.25 syntax rule 6 says
>>>>>> "Element table descriptor shall include two or more labels, one =
of
>>>>>> which has an <identifier> that is equivalent to the <label name>
>>>>>> simply contained in the <drop element table label clause>."
>>>>>>=20
>>>>>> IIUC this simply means that the last label can not be dropped. =
That
>>>>>> agrees with your chosen option.
>>>>>>=20
>>>>>> In the patch,
>>>>>> + while (HeapTupleIsValid(systable_getnext(elscan)))
>>>>>> + nlabels++;
>>>>>>=20
>>>>>> It's better to break from the while loop after incrementing =
nlabels
>>>>>> and avoid scanning the entire table in the worst case. All we =
want to
>>>>>> check is whether another label exists and not all the labels.
>>>>>=20
>>>>>=20
>>>>> Please find the attached v2 patch.
>>>>>=20
>>>>>>=20
>>>>>>=20
>>>>>>> The attached patch adds a check in AlterPropGraph() before
>>>>>>> performDeletion(). It scans pg_propgraph_element_label to count =
labels
>>>>>>> for the element, and raises an error if only one remains. A =
regression test is included
>>>>>>> that drops labels down to the last one, verifies the error, then =
re-adds them back.
>>>>>>=20
>>>>>> I would add a test to make sure ADD LABEL ... DROP LABEL .. is =
allowed.
>>>>>=20
>>>>>=20
>>>>> +ALTER PROPERTY GRAPH g3 ALTER VERTEX TABLE t3 DROP LABEL t3l1;  =
-- error: last label
>>>>> +ALTER PROPERTY GRAPH g3 ALTER VERTEX TABLE t3 ADD LABEL t3l2 =
PROPERTIES ALL COLUMNS;
>>>>>=20
>>>>> Are you looking for any additional coverage?
>>>>=20
>>>> I thought specifying ADD LABEL and DROP LABEL is supported in the =
same
>>>> DDL. But that's not the case. Sorry.
>>>>=20
>>>> Will review the patch soon.
>>>>=20
>>>> Additionally, the patch should update the DDL document to mention =
that
>>>> the DDL does not allow dropping the last label on the given graph
>>>> element table.
>>>=20
>>>=20
>>> Addressed this in v3 patch.
>>=20
>> Thanks.
>>=20
>> I questioned whether it makes sense to move the code to check the
>> existence of at least one other label into its own function so the
>> code is more readable. AlterPropGraph is already about 500 lines and
>> this code increases it further. There are two possibilities:
>> a. The function returns true if the given element has more than two
>> labels associated with it. The choice of 2 makes sense only in the
>> drop label context but not otherwise.
>> b. The function returns true if it finds one label other than the one
>> with the given label oid. That looks a bit more elegant. But still
>> seems too tied to drop label context.
>>=20
>> So I decided against it. But instead removed the extra indentation.
>> The earliest variable declaration block is not farther from that =
code.
>>=20
>> I changed the errcode to ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE
>> since we expect the element to be in a specific state to drop the
>> label. ERRCODE_INVALID_OBJECT_DEFINITION would mean that the
>> definition of the element or the label is itself invalid. That's not
>> the case.
>>=20
>> Here's a patch with some minor edits.
>>=20
>=20
> We are looking up element label catalogs twice in this patch - first
> to find the label to be dropped and then to find the number of labels
> associated with the given element. I combined these two into a single
> while loop.
>=20
> This patch causes a conflict with the patch posted at [1]. Hence
> posting both the patches together here, so that they can be committed
> without conflict.
>=20
> [1] =
https://www.postgresql.org/message-id/E3D6552E-DB26-47BC-9C7C-0F9CB936BF5B=
@gmail.com
>=20
>=20
>=20
> --
> Best Wishes,
> Ashutosh Bapat
> =
<v20260428-0001-Prevent-dropping-the-last-label-from-a-pro.patch><v2026042=
8-0002-Dropping-a-property-not-associated-with-th.patch>

As Alvaro commented at [1], I added 0003 to use OidIsValid macro. 0001 =
and 0002 are unchanged.

[1] =
https://www.postgresql.org/message-id/02fe13db-4fba-4e9d-9b4c-e6271a133502=
@app.fastmail.com

Best regards,
--
Chao Li (Evan)
HighGo Software Co., Ltd.
https://www.highgo.com/





--Apple-Mail=_3FEB1E90-2E50-4078-B2C9-C5E27ED58F02
Content-Disposition: attachment;
	filename=v20260429-0001-Prevent-dropping-the-last-label-from-a-pro.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="v20260429-0001-Prevent-dropping-the-last-label-from-a-pro.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=209e903a0e21c0c793b632515b6f4b533dc2bee5a8=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20satyanarayana=20narlapuram=20=
<satyanarlapuram@gmail.com>=0ADate:=20Tue,=2021=20Apr=202026=2007:52:56=20=
+0000=0ASubject:=20[PATCH=20v20260429=201/3]=20Prevent=20dropping=20the=20=
last=20label=20from=20a=20property=0A=20graph=20element=0A=0APer=20=
SQL/PGQ=20standard,=20every=20graph=20element=20must=20have=20at=20least=20=
one=20label.=20When=0Adropping=20a=20label=20from=20a=20graph=20element,=20=
ensure=20that=20there=20exists=20at=20least=20one=0Aother=20label=20on=20=
the=20element.=20If=20the=20label=20being=20dropped=20is=20the=20only=20=
label=20on=20the=0Aelement,=20raise=20an=20error.=0A=0AReported=20By:=20=
Satyanarayana=20Narlapuram=20<satyanarlapuram@gmail.com>=0AAuthor:=20=
Satyanarayana=20Narlapuram=20<satyanarlapuram@gmail.com>=0AAuthor:=20=
Ashutosh=20Bapat=20<ashutosh.bapat.oss@gmail.com>=0AReviewed=20by:=20=
Ashutosh=20Bapat=20<ashutosh.bapat.oss@gmail.com>=0ADiscussion:=20=
https://www.postgresql.org/message-id/CAHg+QDeP=3DmTHTV48R23zKMy1SBmCKZ_L7=
-z5zKnYyw+K0x-gCg@mail.gmail.com=0A---=0A=20=
doc/src/sgml/ref/alter_property_graph.sgml=20=20=20=20|=20=204=20+-=0A=20=
src/backend/commands/propgraphcmds.c=20=20=20=20=20=20=20=20=20=20|=2054=20=
+++++++++++++++++--=0A=20.../expected/create_property_graph.out=20=20=20=20=
=20=20=20=20|=20=206=20+++=0A=20=
.../regress/sql/create_property_graph.sql=20=20=20=20=20|=20=204=20++=0A=20=
4=20files=20changed,=2062=20insertions(+),=206=20deletions(-)=0A=0Adiff=20=
--git=20a/doc/src/sgml/ref/alter_property_graph.sgml=20=
b/doc/src/sgml/ref/alter_property_graph.sgml=0Aindex=20=
f517f2b2d7a..2fd0c138e12=20100644=0A---=20=
a/doc/src/sgml/ref/alter_property_graph.sgml=0A+++=20=
b/doc/src/sgml/ref/alter_property_graph.sgml=0A@@=20-99,7=20+99,9=20@@=20=
ALTER=20PROPERTY=20GRAPH=20[=20IF=20EXISTS=20]=20<replaceable=20=
class=3D"parameter">name</replacea=0A=20=20=20=20=20=20=
<term><literal>ALTER=20{VERTEX|NODE|EDGE|RELATIONSHIP}=20TABLE=20...=20=
DROP=20LABEL</literal></term>=0A=20=20=20=20=20=20<listitem>=0A=20=20=20=20=
=20=20=20<para>=0A-=20=20=20=20=20=20=20This=20form=20removes=20a=20=
label=20from=20an=20existing=20vertex=20or=20edge=20table.=0A+=20=20=20=20=
=20=20=20This=20form=20removes=20a=20label=20from=20an=20existing=20=
vertex=20or=20edge=20table.=20The=0A+=20=20=20=20=20=20=20last=20label=20=
on=20an=20element=20table=20cannot=20be=20dropped;=20every=20vertex=20or=20=
edge=0A+=20=20=20=20=20=20=20table=20must=20have=20at=20least=20one=20=
label.=0A=20=20=20=20=20=20=20</para>=0A=20=20=20=20=20=20</listitem>=0A=20=
=20=20=20=20</varlistentry>=0Adiff=20--git=20=
a/src/backend/commands/propgraphcmds.c=20=
b/src/backend/commands/propgraphcmds.c=0Aindex=20=
6d509fccf46..7836e7ab63e=20100644=0A---=20=
a/src/backend/commands/propgraphcmds.c=0A+++=20=
b/src/backend/commands/propgraphcmds.c=0A@@=20-1491,8=20+1491,14=20@@=20=
AlterPropGraph(ParseState=20*pstate,=20const=20AlterPropGraphStmt=20=
*stmt)=0A=20=09{=0A=20=09=09Oid=09=09=09peoid;=0A=20=09=09Oid=09=09=09=
labeloid;=0A-=09=09Oid=09=09=09ellabeloid;=0A+=09=09Oid=09=09=09=
ellabeloid=20=3D=20InvalidOid;=0A=20=09=09ObjectAddress=20obj;=0A+=09=09=
Relation=09elrel;=0A+=09=09SysScanDesc=20elscan;=0A+=09=09ScanKeyData=20=
elkey[1];=0A+=09=09int=09=09=09nlabels=20=3D=200;=0A+=09=09HeapTuple=09=
tuple;=0A+=0A=20=0A=20=09=09if=20(stmt->element_kind=20=3D=3D=20=
PROPGRAPH_ELEMENT_KIND_VERTEX)=0A=20=09=09=09peoid=20=3D=20=
get_vertex_oid(pstate,=20pgrelid,=20stmt->element_alias,=20-1);=0A@@=20=
-1510,11=20+1516,38=20@@=20AlterPropGraph(ParseState=20*pstate,=20const=20=
AlterPropGraphStmt=20*stmt)=0A=20=09=09=09=09=09=09=20=20=20=
get_rel_name(pgrelid),=20stmt->element_alias,=20stmt->drop_label),=0A=20=09=
=09=09=09=09parser_errposition(pstate,=20-1));=0A=20=0A-=09=09ellabeloid=20=
=3D=20GetSysCacheOid2(PROPGRAPHELEMENTLABELELEMENTLABEL,=0A-=09=09=09=09=09=
=09=09=09=09=20Anum_pg_propgraph_element_label_oid,=0A-=09=09=09=09=09=09=
=09=09=09=20ObjectIdGetDatum(peoid),=0A-=09=09=09=09=09=09=09=09=09=20=
ObjectIdGetDatum(labeloid));=0A+=09=09/*=0A+=09=09=20*=20Is=20the=20=
given=20label=20associated=20with=20the=20element?=20Is=20this=20the=20=
only=0A+=09=09=20*=20label=20associated=20with=20the=20element?=0A+=09=09=
=20*/=0A+=09=09elrel=20=3D=20table_open(PropgraphElementLabelRelationId,=20=
AccessShareLock);=0A+=09=09ScanKeyInit(&elkey[0],=0A+=09=09=09=09=09=
Anum_pg_propgraph_element_label_pgelelid,=0A+=09=09=09=09=09=
BTEqualStrategyNumber,=20F_OIDEQ,=0A+=09=09=09=09=09=
ObjectIdGetDatum(peoid));=0A+=09=09elscan=20=3D=20=
systable_beginscan(elrel,=20PropgraphElementLabelElementLabelIndexId,=0A=
+=09=09=09=09=09=09=09=09=09true,=20NULL,=201,=20elkey);=0A+=09=09while=20=
(HeapTupleIsValid(tuple=20=3D=20systable_getnext(elscan)))=0A+=09=09{=0A=
+=09=09=09Form_pg_propgraph_element_label=20elform=20=3D=20=
(Form_pg_propgraph_element_label)=20GETSTRUCT(tuple);=0A+=0A+=09=09=09=
nlabels++;=0A=20=0A+=09=09=09if=20(elform->pgellabelid=20=3D=3D=20=
labeloid)=0A+=09=09=09=09ellabeloid=20=3D=20elform->oid;=0A+=0A+=09=09=09=
/*=0A+=09=09=09=20*=20If=20we=20find=20more=20than=20one=20label=20=
associated=20with=20the=20given=0A+=09=09=09=20*=20element=20and=20also=20=
found=20the=20label=20we=20are=20going=20to=20drop,=20we=20are=0A+=09=09=09=
=20*=20done.=0A+=09=09=09=20*/=0A+=09=09=09if=20(nlabels=20>=201=20&&=20=
OidIsValid(ellabeloid))=0A+=09=09=09=09break;=0A+=09=09}=0A+=09=09=
systable_endscan(elscan);=0A+=09=09table_close(elrel,=20=
AccessShareLock);=0A+=0A+=09=09/*=20Given=20label=20is=20not=20=
associated=20with=20the=20element.=20*/=0A=20=09=09if=20(!ellabeloid)=0A=20=
=09=09=09ereport(ERROR,=0A=20=09=09=09=09=09=
errcode(ERRCODE_UNDEFINED_OBJECT),=0A@@=20-1522,6=20+1555,17=20@@=20=
AlterPropGraph(ParseState=20*pstate,=20const=20AlterPropGraphStmt=20=
*stmt)=0A=20=09=09=09=09=09=09=20=20=20get_rel_name(pgrelid),=20=
stmt->element_alias,=20stmt->drop_label),=0A=20=09=09=09=09=09=
parser_errposition(pstate,=20-1));=0A=20=0A+=09=09/*=0A+=09=09=20*=20=
Prevent=20dropping=20the=20last=20label=20from=20an=20element.=20Every=20=
element=20must=0A+=09=09=20*=20have=20at=20least=20one=20label.=0A+=09=09=
=20*/=0A+=09=09if=20(nlabels=20=3D=3D=201)=0A+=09=09=09ereport(ERROR,=0A=
+=09=09=09=09=09(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),=0A+=09=
=09=09=09=09=20errmsg("cannot=20drop=20the=20last=20label=20from=20=
element=20\"%s\"",=0A+=09=09=09=09=09=09=09stmt->element_alias),=0A+=09=09=
=09=09=09=20errhint("Every=20element=20must=20have=20at=20least=20one=20=
label.")));=0A+=0A=20=09=09ObjectAddressSet(obj,=20=
PropgraphElementLabelRelationId,=20ellabeloid);=0A=20=09=09=
performDeletion(&obj,=20stmt->drop_behavior,=200);=0A=20=0Adiff=20--git=20=
a/src/test/regress/expected/create_property_graph.out=20=
b/src/test/regress/expected/create_property_graph.out=0Aindex=20=
bc9a596ec89..740f886cd83=20100644=0A---=20=
a/src/test/regress/expected/create_property_graph.out=0A+++=20=
b/src/test/regress/expected/create_property_graph.out=0A@@=20-57,6=20=
+57,12=20@@=20ALTER=20PROPERTY=20GRAPH=20g3=0A=20ALTER=20PROPERTY=20=
GRAPH=20g3=20ALTER=20VERTEX=20TABLE=20t3=20DROP=20LABEL=20t3l3x;=20=20--=20=
error=0A=20ERROR:=20=20property=20graph=20"g3"=20element=20"t3"=20has=20=
no=20label=20"t3l3x"=0A=20ALTER=20PROPERTY=20GRAPH=20g3=20ALTER=20VERTEX=20=
TABLE=20t3=20DROP=20LABEL=20t3l3;=0A+--=20Test=20that=20the=20last=20=
label=20on=20an=20element=20cannot=20be=20dropped=0A+ALTER=20PROPERTY=20=
GRAPH=20g3=20ALTER=20VERTEX=20TABLE=20t3=20DROP=20LABEL=20t3l2;=0A+ALTER=20=
PROPERTY=20GRAPH=20g3=20ALTER=20VERTEX=20TABLE=20t3=20DROP=20LABEL=20=
t3l1;=20=20--=20error:=20last=20label=0A+ERROR:=20=20cannot=20drop=20the=20=
last=20label=20from=20element=20"t3"=0A+HINT:=20=20Every=20element=20=
must=20have=20at=20least=20one=20label.=0A+ALTER=20PROPERTY=20GRAPH=20g3=20=
ALTER=20VERTEX=20TABLE=20t3=20ADD=20LABEL=20t3l2=20PROPERTIES=20ALL=20=
COLUMNS;=0A=20ALTER=20PROPERTY=20GRAPH=20g3=20DROP=20VERTEX=20TABLES=20=
(t2);=20=20--=20fail=0A=20ERROR:=20=20cannot=20drop=20vertex=20t2=20of=20=
property=20graph=20g3=20because=20other=20objects=20depend=20on=20it=0A=20=
DETAIL:=20=20edge=20e1=20of=20property=20graph=20g3=20depends=20on=20=
vertex=20t2=20of=20property=20graph=20g3=0Adiff=20--git=20=
a/src/test/regress/sql/create_property_graph.sql=20=
b/src/test/regress/sql/create_property_graph.sql=0Aindex=20=
241f93df302..4cf771596a8=20100644=0A---=20=
a/src/test/regress/sql/create_property_graph.sql=0A+++=20=
b/src/test/regress/sql/create_property_graph.sql=0A@@=20-52,6=20+52,10=20=
@@=20ALTER=20PROPERTY=20GRAPH=20g3=0A=20=20=20=20=20=20=20=20=20ADD=20=
LABEL=20t3l3=20PROPERTIES=20ALL=20COLUMNS;=0A=20ALTER=20PROPERTY=20GRAPH=20=
g3=20ALTER=20VERTEX=20TABLE=20t3=20DROP=20LABEL=20t3l3x;=20=20--=20error=0A=
=20ALTER=20PROPERTY=20GRAPH=20g3=20ALTER=20VERTEX=20TABLE=20t3=20DROP=20=
LABEL=20t3l3;=0A+--=20Test=20that=20the=20last=20label=20on=20an=20=
element=20cannot=20be=20dropped=0A+ALTER=20PROPERTY=20GRAPH=20g3=20ALTER=20=
VERTEX=20TABLE=20t3=20DROP=20LABEL=20t3l2;=0A+ALTER=20PROPERTY=20GRAPH=20=
g3=20ALTER=20VERTEX=20TABLE=20t3=20DROP=20LABEL=20t3l1;=20=20--=20error:=20=
last=20label=0A+ALTER=20PROPERTY=20GRAPH=20g3=20ALTER=20VERTEX=20TABLE=20=
t3=20ADD=20LABEL=20t3l2=20PROPERTIES=20ALL=20COLUMNS;=0A=20ALTER=20=
PROPERTY=20GRAPH=20g3=20DROP=20VERTEX=20TABLES=20(t2);=20=20--=20fail=0A=20=
ALTER=20PROPERTY=20GRAPH=20g3=20DROP=20VERTEX=20TABLES=20(t2)=20CASCADE;=0A=
=20ALTER=20PROPERTY=20GRAPH=20g3=20DROP=20EDGE=20TABLES=20(e2);=0A--=20=0A=
2.50.1=20(Apple=20Git-155)=0A=0A=

--Apple-Mail=_3FEB1E90-2E50-4078-B2C9-C5E27ED58F02
Content-Disposition: attachment;
	filename=v20260429-0002-Dropping-a-property-not-associated-with-th.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="v20260429-0002-Dropping-a-property-not-associated-with-th.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=209c0b86a35698662138fd2da4212a00c92ffdbcc7=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Ashutosh=20Bapat=20=
<ashutosh.bapat.oss@gmail.com>=0ADate:=20Tue,=2028=20Apr=202026=20=
12:43:40=20+0530=0ASubject:=20[PATCH=20v20260429=202/3]=20Dropping=20a=20=
property=20not=20associated=20with=20the=0A=20given=20label=0A=0AWhen=20=
dropping=20a=20property=20by=20name=20from=20a=20label,=20the=20code=20=
checked=20only=20whether=20the=0Aproperty=20existed=20in=20the=20graph's=20=
property=20catalog.=20It=20did=20not=20verify=20that=20the=0Aproperty=20=
was=20actually=20associated=20with=20the=20given=20label,=20resulting=20=
in=20passing=0AInvalidOid=20to=20performDeletion().=20Fix=20it=20by=20=
explicilty=20checking=20the=20label=0Aproperty=20association.=0A=0A=
Reported=20by:=20Chao=20Li=20<lic@highgo.com>=0AAuthor:=20Chao=20Li=20=
<lic@highgo.com>=0AReviewed=20by:=20Ashutosh=20Bapat=20=
<ashutosh.bapat.oss@gmail.com>=0ADiscussion:=20=
https://postgr.es/m/1DA5D52A-4AFA-426E-83F7-42ED974D682B@gmail.com=0A---=0A=
=20src/backend/commands/propgraphcmds.c=20=20=20=20=20=20=20=20=20=20|=20=
47=20++++++++-----------=0A=20.../expected/create_property_graph.out=20=20=
=20=20=20=20=20=20|=20=202=20+=0A=20=
.../regress/sql/create_property_graph.sql=20=20=20=20=20|=20=201=20+=0A=20=
3=20files=20changed,=2022=20insertions(+),=2028=20deletions(-)=0A=0Adiff=20=
--git=20a/src/backend/commands/propgraphcmds.c=20=
b/src/backend/commands/propgraphcmds.c=0Aindex=20=
7836e7ab63e..d3c0443c336=20100644=0A---=20=
a/src/backend/commands/propgraphcmds.c=0A+++=20=
b/src/backend/commands/propgraphcmds.c=0A@@=20-1582,7=20+1582,7=20@@=20=
AlterPropGraph(ParseState=20*pstate,=20const=20AlterPropGraphStmt=20=
*stmt)=0A=20=09=09Oid=09=09=09peoid;=0A=20=09=09Oid=09=09=09pgerelid;=0A=20=
=09=09Oid=09=09=09labeloid;=0A-=09=09Oid=09=09=09ellabeloid;=0A+=09=09=
Oid=09=09=09ellabeloid=20=3D=20InvalidOid;=0A=20=0A=20=09=09if=20=
(stmt->element_kind=20=3D=3D=20PROPGRAPH_ELEMENT_KIND_VERTEX)=0A=20=09=09=
=09peoid=20=3D=20get_vertex_oid(pstate,=20pgrelid,=20=
stmt->element_alias,=20-1);=0A@@=20-1593,17=20+1593,11=20@@=20=
AlterPropGraph(ParseState=20*pstate,=20const=20AlterPropGraphStmt=20=
*stmt)=0A=20=09=09=09=09=09=09=09=09=20=20=20=
Anum_pg_propgraph_label_oid,=0A=20=09=09=09=09=09=09=09=09=20=20=20=
ObjectIdGetDatum(pgrelid),=0A=20=09=09=09=09=09=09=09=09=20=20=20=
CStringGetDatum(stmt->alter_label));=0A-=09=09if=20(!labeloid)=0A-=09=09=09=
ereport(ERROR,=0A-=09=09=09=09=09errcode(ERRCODE_UNDEFINED_OBJECT),=0A-=09=
=09=09=09=09errmsg("property=20graph=20\"%s\"=20element=20\"%s\"=20has=20=
no=20label=20\"%s\"",=0A-=09=09=09=09=09=09=20=20=20=
get_rel_name(pgrelid),=20stmt->element_alias,=20stmt->alter_label),=0A-=09=
=09=09=09=09parser_errposition(pstate,=20-1));=0A-=0A-=09=09ellabeloid=20=
=3D=20GetSysCacheOid2(PROPGRAPHELEMENTLABELELEMENTLABEL,=0A-=09=09=09=09=09=
=09=09=09=09=20Anum_pg_propgraph_element_label_oid,=0A-=09=09=09=09=09=09=
=09=09=09=20ObjectIdGetDatum(peoid),=0A-=09=09=09=09=09=09=09=09=09=20=
ObjectIdGetDatum(labeloid));=0A+=09=09if=20(labeloid)=0A+=09=09=09=
ellabeloid=20=3D=20GetSysCacheOid2(PROPGRAPHELEMENTLABELELEMENTLABEL,=0A=
+=09=09=09=09=09=09=09=09=09=09=20Anum_pg_propgraph_element_label_oid,=0A=
+=09=09=09=09=09=09=09=09=09=09=20ObjectIdGetDatum(peoid),=0A+=09=09=09=09=
=09=09=09=09=09=09=20ObjectIdGetDatum(labeloid));=0A=20=09=09if=20=
(!ellabeloid)=0A=20=09=09=09ereport(ERROR,=0A=20=09=09=09=09=09=
errcode(ERRCODE_UNDEFINED_OBJECT),=0A@@=20-1624,7=20+1618,7=20@@=20=
AlterPropGraph(ParseState=20*pstate,=20const=20AlterPropGraphStmt=20=
*stmt)=0A=20=09{=0A=20=09=09Oid=09=09=09peoid;=0A=20=09=09Oid=09=09=09=
labeloid;=0A-=09=09Oid=09=09=09ellabeloid;=0A+=09=09Oid=09=09=09=
ellabeloid=20=3D=20InvalidOid;=0A=20=09=09ObjectAddress=20obj;=0A=20=0A=20=
=09=09if=20(stmt->element_kind=20=3D=3D=20PROPGRAPH_ELEMENT_KIND_VERTEX)=0A=
@@=20-1636,17=20+1630,11=20@@=20AlterPropGraph(ParseState=20*pstate,=20=
const=20AlterPropGraphStmt=20*stmt)=0A=20=09=09=09=09=09=09=09=09=20=20=20=
Anum_pg_propgraph_label_oid,=0A=20=09=09=09=09=09=09=09=09=20=20=20=
ObjectIdGetDatum(pgrelid),=0A=20=09=09=09=09=09=09=09=09=20=20=20=
CStringGetDatum(stmt->alter_label));=0A-=09=09if=20(!labeloid)=0A-=09=09=09=
ereport(ERROR,=0A-=09=09=09=09=09errcode(ERRCODE_UNDEFINED_OBJECT),=0A-=09=
=09=09=09=09errmsg("property=20graph=20\"%s\"=20element=20\"%s\"=20has=20=
no=20label=20\"%s\"",=0A-=09=09=09=09=09=09=20=20=20=
get_rel_name(pgrelid),=20stmt->element_alias,=20stmt->alter_label),=0A-=09=
=09=09=09=09parser_errposition(pstate,=20-1));=0A-=0A-=09=09ellabeloid=20=
=3D=20GetSysCacheOid2(PROPGRAPHELEMENTLABELELEMENTLABEL,=0A-=09=09=09=09=09=
=09=09=09=09=20Anum_pg_propgraph_element_label_oid,=0A-=09=09=09=09=09=09=
=09=09=09=20ObjectIdGetDatum(peoid),=0A-=09=09=09=09=09=09=09=09=09=20=
ObjectIdGetDatum(labeloid));=0A+=09=09if=20(labeloid)=0A+=09=09=09=
ellabeloid=20=3D=20GetSysCacheOid2(PROPGRAPHELEMENTLABELELEMENTLABEL,=0A=
+=09=09=09=09=09=09=09=09=09=09=20Anum_pg_propgraph_element_label_oid,=0A=
+=09=09=09=09=09=09=09=09=09=09=20ObjectIdGetDatum(peoid),=0A+=09=09=09=09=
=09=09=09=09=09=09=20ObjectIdGetDatum(labeloid));=0A=20=0A=20=09=09if=20=
(!ellabeloid)=0A=20=09=09=09ereport(ERROR,=0A@@=20-1659,21=20+1647,24=20=
@@=20AlterPropGraph(ParseState=20*pstate,=20const=20AlterPropGraphStmt=20=
*stmt)=0A=20=09=09{=0A=20=09=09=09char=09=20=20=20*propname=20=3D=20=
strVal(lfirst(lc));=0A=20=09=09=09Oid=09=09=09propoid;=0A-=09=09=09Oid=09=
=09=09plpoid;=0A+=09=09=09Oid=09=09=09plpoid=20=3D=20InvalidOid;=0A=20=0A=
=20=09=09=09propoid=20=3D=20GetSysCacheOid2(PROPGRAPHPROPNAME,=0A=20=09=09=
=09=09=09=09=09=09=09=20=20Anum_pg_propgraph_property_oid,=0A=20=09=09=09=
=09=09=09=09=09=09=20=20ObjectIdGetDatum(pgrelid),=0A=20=09=09=09=09=09=09=
=09=09=09=20=20CStringGetDatum(propname));=0A-=09=09=09if=20(!propoid)=0A=
+=09=09=09if=20(propoid)=0A+=09=09=09=09plpoid=20=3D=20=
GetSysCacheOid2(PROPGRAPHLABELPROP,=0A+=09=09=09=09=09=09=09=09=09=09=20=
Anum_pg_propgraph_label_property_oid,=0A+=09=09=09=09=09=09=09=09=09=09=20=
ObjectIdGetDatum(ellabeloid),=0A+=09=09=09=09=09=09=09=09=09=09=20=
ObjectIdGetDatum(propoid));=0A+=09=09=09if=20(!plpoid)=0A=20=09=09=09=09=
ereport(ERROR,=0A=20=09=09=09=09=09=09errcode(ERRCODE_UNDEFINED_OBJECT),=0A=
=20=09=09=09=09=09=09errmsg("property=20graph=20\"%s\"=20element=20=
\"%s\"=20label=20\"%s\"=20has=20no=20property=20\"%s\"",=0A=20=09=09=09=09=
=09=09=09=20=20=20get_rel_name(pgrelid),=20stmt->element_alias,=20=
stmt->alter_label,=20propname),=0A=20=09=09=09=09=09=09=
parser_errposition(pstate,=20-1));=0A=20=0A-=09=09=09plpoid=20=3D=20=
GetSysCacheOid2(PROPGRAPHLABELPROP,=20=
Anum_pg_propgraph_label_property_oid,=20ObjectIdGetDatum(ellabeloid),=20=
ObjectIdGetDatum(propoid));=0A-=0A=20=09=09=09ObjectAddressSet(obj,=20=
PropgraphLabelPropertyRelationId,=20plpoid);=0A=20=09=09=09=
performDeletion(&obj,=20stmt->drop_behavior,=200);=0A=20=09=09}=0Adiff=20=
--git=20a/src/test/regress/expected/create_property_graph.out=20=
b/src/test/regress/expected/create_property_graph.out=0Aindex=20=
740f886cd83..7c3f25a3e0d=20100644=0A---=20=
a/src/test/regress/expected/create_property_graph.out=0A+++=20=
b/src/test/regress/expected/create_property_graph.out=0A@@=20-88,6=20=
+88,8=20@@=20CREATE=20PROPERTY=20GRAPH=20g4=0A=20=20=20=20=20);=0A=20=
ALTER=20PROPERTY=20GRAPH=20g4=20ALTER=20VERTEX=20TABLE=20t2=20ALTER=20=
LABEL=20t2=20ADD=20PROPERTIES=20(k=20*=202=20AS=20kk);=0A=20ALTER=20=
PROPERTY=20GRAPH=20g4=20ALTER=20VERTEX=20TABLE=20t2=20ALTER=20LABEL=20t2=20=
DROP=20PROPERTIES=20(k);=0A+ALTER=20PROPERTY=20GRAPH=20g4=20ALTER=20=
VERTEX=20TABLE=20t2=20ALTER=20LABEL=20t2=20DROP=20PROPERTIES=20(yy);=20=20=
--=20error=0A+ERROR:=20=20property=20graph=20"g4"=20element=20"t2"=20=
label=20"t2"=20has=20no=20property=20"yy"=0A=20CREATE=20TABLE=20t11=20(a=20=
int=20PRIMARY=20KEY);=0A=20CREATE=20TABLE=20t12=20(b=20int=20PRIMARY=20=
KEY);=0A=20CREATE=20TABLE=20t13=20(=0Adiff=20--git=20=
a/src/test/regress/sql/create_property_graph.sql=20=
b/src/test/regress/sql/create_property_graph.sql=0Aindex=20=
4cf771596a8..191412a6a33=20100644=0A---=20=
a/src/test/regress/sql/create_property_graph.sql=0A+++=20=
b/src/test/regress/sql/create_property_graph.sql=0A@@=20-79,6=20+79,7=20=
@@=20CREATE=20PROPERTY=20GRAPH=20g4=0A=20=0A=20ALTER=20PROPERTY=20GRAPH=20=
g4=20ALTER=20VERTEX=20TABLE=20t2=20ALTER=20LABEL=20t2=20ADD=20PROPERTIES=20=
(k=20*=202=20AS=20kk);=0A=20ALTER=20PROPERTY=20GRAPH=20g4=20ALTER=20=
VERTEX=20TABLE=20t2=20ALTER=20LABEL=20t2=20DROP=20PROPERTIES=20(k);=0A=
+ALTER=20PROPERTY=20GRAPH=20g4=20ALTER=20VERTEX=20TABLE=20t2=20ALTER=20=
LABEL=20t2=20DROP=20PROPERTIES=20(yy);=20=20--=20error=0A=20=0A=20CREATE=20=
TABLE=20t11=20(a=20int=20PRIMARY=20KEY);=0A=20CREATE=20TABLE=20t12=20(b=20=
int=20PRIMARY=20KEY);=0A--=20=0A2.50.1=20(Apple=20Git-155)=0A=0A=

--Apple-Mail=_3FEB1E90-2E50-4078-B2C9-C5E27ED58F02
Content-Disposition: attachment;
	filename=v20260429-0003-Use-OidIsValid-macro-in-propgraphcmds.c.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="v20260429-0003-Use-OidIsValid-macro-in-propgraphcmds.c.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=209c0d71a61d0d604b99fa3ee9b009ab87e2d1e830=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20"Chao=20Li=20(Evan)"=20<lic@highgo.com>=0A=
Date:=20Wed,=2029=20Apr=202026=2020:29:00=20+0800=0ASubject:=20[PATCH=20=
v20260429=203/3]=20Use=20OidIsValid=20macro=20in=20propgraphcmds.c=0A=0A=
Author:=20Chao=20Li=20<lic@highgo.com>=0ADiscussion:=20=
https://postgr.es/m/1DA5D52A-4AFA-426E-83F7-42ED974D682B@gmail.com=0A---=0A=
=20src/backend/commands/propgraphcmds.c=20|=2044=20=
++++++++++++++--------------=0A=201=20file=20changed,=2022=20=
insertions(+),=2022=20deletions(-)=0A=0Adiff=20--git=20=
a/src/backend/commands/propgraphcmds.c=20=
b/src/backend/commands/propgraphcmds.c=0Aindex=20=
d3c0443c336..04830262a54=20100644=0A---=20=
a/src/backend/commands/propgraphcmds.c=0A+++=20=
b/src/backend/commands/propgraphcmds.c=0A@@=20-206,16=20+206,16=20@@=20=
CreatePropGraph(ParseState=20*pstate,=20const=20CreatePropGraphStmt=20=
*stmt)=0A=20=09=09=09if=20(strcmp(vinfo->aliasname,=20edge->edestvertex)=20=
=3D=3D=200)=0A=20=09=09=09=09destrelid=20=3D=20vinfo->relid;=0A=20=0A-=09=
=09=09if=20(srcrelid=20&&=20destrelid)=0A+=09=09=09if=20=
(OidIsValid(srcrelid)=20&&=20OidIsValid(destrelid))=0A=20=09=09=09=09=
break;=0A=20=09=09}=0A-=09=09if=20(!srcrelid)=0A+=09=09if=20=
(!OidIsValid(srcrelid))=0A=20=09=09=09ereport(ERROR,=0A=20=09=09=09=09=09=
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),=0A=20=09=09=09=09=09=20=
errmsg("source=20vertex=20\"%s\"=20of=20edge=20\"%s\"=20does=20not=20=
exist",=0A=20=09=09=09=09=09=09=09edge->esrcvertex,=20einfo->aliasname),=0A=
=20=09=09=09=09=09=20parser_errposition(pstate,=20edge->location)));=0A-=09=
=09if=20(!destrelid)=0A+=09=09if=20(!OidIsValid(destrelid))=0A=20=09=09=09=
ereport(ERROR,=0A=20=09=09=09=09=09=
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),=0A=20=09=09=09=09=09=20=
errmsg("destination=20vertex=20\"%s\"=20of=20edge=20\"%s\"=20does=20not=20=
exist",=0A@@=20-296,13=20+296,13=20@@=20CreatePropGraph(ParseState=20=
*pstate,=20const=20CreatePropGraphStmt=20*stmt)=0A=20=09=09=09=09=
einfo->destvertexid=20=3D=20vinfo->elementid;=0A=20=09=09=09=09=
einfo->destrelid=20=3D=20vinfo->relid;=0A=20=09=09=09}=0A-=09=09=09if=20=
(einfo->srcvertexid=20&&=20einfo->destvertexid)=0A+=09=09=09if=20=
(OidIsValid(einfo->srcvertexid)=20&&=20OidIsValid(einfo->destvertexid))=0A=
=20=09=09=09=09break;=0A=20=09=09}=0A-=09=09Assert(einfo->srcvertexid);=0A=
-=09=09Assert(einfo->destvertexid);=0A-=09=09Assert(einfo->srcrelid);=0A=
-=09=09Assert(einfo->destrelid);=0A+=09=09=
Assert(OidIsValid(einfo->srcvertexid));=0A+=09=09=
Assert(OidIsValid(einfo->destvertexid));=0A+=09=09=
Assert(OidIsValid(einfo->srcrelid));=0A+=09=09=
Assert(OidIsValid(einfo->destrelid));=0A=20=09=09peoid=20=3D=20=
insert_element_record(pgaddress,=20einfo);=0A=20=09=09element_oids=20=3D=20=
lappend_oid(element_oids,=20peoid);=0A=20=09}=0A@@=20-330,7=20+330,7=20=
@@=20propgraph_element_get_key(ParseState=20*pstate,=20const=20List=20=
*key_clause,=20Relation=20e=0A=20=09{=0A=20=09=09Oid=09=09=09pkidx=20=3D=20=
RelationGetPrimaryKeyIndex(element_rel,=20false);=0A=20=0A-=09=09if=20=
(!pkidx)=0A+=09=09if=20(!OidIsValid(pkidx))=0A=20=09=09=09ereport(ERROR,=0A=
=20=09=09=09=09=09errcode(ERRCODE_INVALID_OBJECT_DEFINITION),=0A=20=09=09=
=09=09=09errmsg("no=20key=20specified=20and=20no=20suitable=20primary=20=
key=20exists=20for=20definition=20of=20element=20\"%s\"",=20aliasname),=0A=
@@=20-681,7=20+681,7=20@@=20insert_element_record(ObjectAddress=20=
pgaddress,=20struct=20element_info=20*einfo)=0A=20=09=20*=20Add=20=
dependencies=20on=20vertices=20and=20equality=20operators=20used=20for=20=
key=0A=20=09=20*=20comparison.=0A=20=09=20*/=0A-=09if=20=
(einfo->srcvertexid)=0A+=09if=20(OidIsValid(einfo->srcvertexid))=0A=20=09=
{=0A=20=09=09ObjectAddressSet(referenced,=20PropgraphElementRelationId,=20=
einfo->srcvertexid);=0A=20=09=09add_exact_object_address(&referenced,=20=
addrs);=0A@@=20-689,7=20+689,7=20@@=20=
insert_element_record(ObjectAddress=20pgaddress,=20struct=20element_info=20=
*einfo)=0A=20=09=09array_of_attnums_to_objectaddrs(einfo->srcrelid,=20=
einfo->srcref,=20addrs);=0A=20=09=09=
array_of_opers_to_objectaddrs(einfo->srceqop,=20addrs);=0A=20=09}=0A-=09=
if=20(einfo->destvertexid)=0A+=09if=20(OidIsValid(einfo->destvertexid))=0A=
=20=09{=0A=20=09=09ObjectAddressSet(referenced,=20=
PropgraphElementRelationId,=20einfo->destvertexid);=0A=20=09=09=
add_exact_object_address(&referenced,=20addrs);=0A@@=20-751,7=20+751,7=20=
@@=20insert_label_record(Oid=20graphid,=20Oid=20peoid,=20const=20char=20=
*label)=0A=20=09=20*=20Insert=20into=20pg_propgraph_label=20if=20not=20=
already=20existing.=0A=20=09=20*/=0A=20=09labeloid=20=3D=20=
GetSysCacheOid2(PROPGRAPHLABELNAME,=20Anum_pg_propgraph_label_oid,=20=
ObjectIdGetDatum(graphid),=20CStringGetDatum(label));=0A-=09if=20=
(!labeloid)=0A+=09if=20(!OidIsValid(labeloid))=0A=20=09{=0A=20=09=09=
Relation=09rel;=0A=20=09=09Datum=09=09values[Natts_pg_propgraph_label]=20=
=3D=20{0};=0A@@=20-1239,7=20+1239,7=20@@=20=
check_element_label_properties(Oid=20ellabeloid)=0A=20=09/*=0A=20=09=20*=20=
If=20there=20is=20no=20previous=20definition=20of=20this=20label,=20then=20=
we=20are=20done.=0A=20=09=20*/=0A-=09if=20(!ref_ellabeloid)=0A+=09if=20=
(!OidIsValid(ref_ellabeloid))=0A=20=09=09return;=0A=20=0A=20=09/*=0A@@=20=
-1299,7=20+1299,7=20@@=20AlterPropGraph(ParseState=20*pstate,=20const=20=
AlterPropGraphStmt=20*stmt)=0A=20=09=09=09=09=09=09=09=09=09=20=20=20=
stmt->missing_ok=20?=20RVR_MISSING_OK=20:=200,=0A=20=09=09=09=09=09=09=09=
=09=09=20=20=20RangeVarCallbackOwnsRelation,=0A=20=09=09=09=09=09=09=09=09=
=09=20=20=20NULL);=0A-=09if=20(pgrelid=20=3D=3D=20InvalidOid)=0A+=09if=20=
(!OidIsValid(pgrelid))=0A=20=09{=0A=20=09=09ereport(NOTICE,=0A=20=09=09=09=
=09(errmsg("relation=20\"%s\"=20does=20not=20exist,=20skipping",=0A@@=20=
-1509,7=20+1509,7=20@@=20AlterPropGraph(ParseState=20*pstate,=20const=20=
AlterPropGraphStmt=20*stmt)=0A=20=09=09=09=09=09=09=09=09=20=20=20=
Anum_pg_propgraph_label_oid,=0A=20=09=09=09=09=09=09=09=09=20=20=20=
ObjectIdGetDatum(pgrelid),=0A=20=09=09=09=09=09=09=09=09=20=20=20=
CStringGetDatum(stmt->drop_label));=0A-=09=09if=20(!labeloid)=0A+=09=09=
if=20(!OidIsValid(labeloid))=0A=20=09=09=09ereport(ERROR,=0A=20=09=09=09=09=
=09errcode(ERRCODE_UNDEFINED_OBJECT),=0A=20=09=09=09=09=09=
errmsg("property=20graph=20\"%s\"=20element=20\"%s\"=20has=20no=20label=20=
\"%s\"",=0A@@=20-1548,7=20+1548,7=20@@=20AlterPropGraph(ParseState=20=
*pstate,=20const=20AlterPropGraphStmt=20*stmt)=0A=20=09=09=
table_close(elrel,=20AccessShareLock);=0A=20=0A=20=09=09/*=20Given=20=
label=20is=20not=20associated=20with=20the=20element.=20*/=0A-=09=09if=20=
(!ellabeloid)=0A+=09=09if=20(!OidIsValid(ellabeloid))=0A=20=09=09=09=
ereport(ERROR,=0A=20=09=09=09=09=09errcode(ERRCODE_UNDEFINED_OBJECT),=0A=20=
=09=09=09=09=09errmsg("property=20graph=20\"%s\"=20element=20\"%s\"=20=
has=20no=20label=20\"%s\"",=0A@@=20-1593,12=20+1593,12=20@@=20=
AlterPropGraph(ParseState=20*pstate,=20const=20AlterPropGraphStmt=20=
*stmt)=0A=20=09=09=09=09=09=09=09=09=20=20=20=
Anum_pg_propgraph_label_oid,=0A=20=09=09=09=09=09=09=09=09=20=20=20=
ObjectIdGetDatum(pgrelid),=0A=20=09=09=09=09=09=09=09=09=20=20=20=
CStringGetDatum(stmt->alter_label));=0A-=09=09if=20(labeloid)=0A+=09=09=
if=20(OidIsValid(labeloid))=0A=20=09=09=09ellabeloid=20=3D=20=
GetSysCacheOid2(PROPGRAPHELEMENTLABELELEMENTLABEL,=0A=20=09=09=09=09=09=09=
=09=09=09=09=20Anum_pg_propgraph_element_label_oid,=0A=20=09=09=09=09=09=09=
=09=09=09=09=20ObjectIdGetDatum(peoid),=0A=20=09=09=09=09=09=09=09=09=09=09=
=20ObjectIdGetDatum(labeloid));=0A-=09=09if=20(!ellabeloid)=0A+=09=09if=20=
(!OidIsValid(ellabeloid))=0A=20=09=09=09ereport(ERROR,=0A=20=09=09=09=09=09=
errcode(ERRCODE_UNDEFINED_OBJECT),=0A=20=09=09=09=09=09errmsg("property=20=
graph=20\"%s\"=20element=20\"%s\"=20has=20no=20label=20\"%s\"",=0A@@=20=
-1630,13=20+1630,13=20@@=20AlterPropGraph(ParseState=20*pstate,=20const=20=
AlterPropGraphStmt=20*stmt)=0A=20=09=09=09=09=09=09=09=09=20=20=20=
Anum_pg_propgraph_label_oid,=0A=20=09=09=09=09=09=09=09=09=20=20=20=
ObjectIdGetDatum(pgrelid),=0A=20=09=09=09=09=09=09=09=09=20=20=20=
CStringGetDatum(stmt->alter_label));=0A-=09=09if=20(labeloid)=0A+=09=09=
if=20(OidIsValid(labeloid))=0A=20=09=09=09ellabeloid=20=3D=20=
GetSysCacheOid2(PROPGRAPHELEMENTLABELELEMENTLABEL,=0A=20=09=09=09=09=09=09=
=09=09=09=09=20Anum_pg_propgraph_element_label_oid,=0A=20=09=09=09=09=09=09=
=09=09=09=09=20ObjectIdGetDatum(peoid),=0A=20=09=09=09=09=09=09=09=09=09=09=
=20ObjectIdGetDatum(labeloid));=0A=20=0A-=09=09if=20(!ellabeloid)=0A+=09=09=
if=20(!OidIsValid(ellabeloid))=0A=20=09=09=09ereport(ERROR,=0A=20=09=09=09=
=09=09errcode(ERRCODE_UNDEFINED_OBJECT),=0A=20=09=09=09=09=09=
errmsg("property=20graph=20\"%s\"=20element=20\"%s\"=20has=20no=20label=20=
\"%s\"",=0A@@=20-1653,12=20+1653,12=20@@=20AlterPropGraph(ParseState=20=
*pstate,=20const=20AlterPropGraphStmt=20*stmt)=0A=20=09=09=09=09=09=09=09=
=09=09=20=20Anum_pg_propgraph_property_oid,=0A=20=09=09=09=09=09=09=09=09=
=09=20=20ObjectIdGetDatum(pgrelid),=0A=20=09=09=09=09=09=09=09=09=09=20=20=
CStringGetDatum(propname));=0A-=09=09=09if=20(propoid)=0A+=09=09=09if=20=
(OidIsValid(propoid))=0A=20=09=09=09=09plpoid=20=3D=20=
GetSysCacheOid2(PROPGRAPHLABELPROP,=0A=20=09=09=09=09=09=09=09=09=09=09=20=
Anum_pg_propgraph_label_property_oid,=0A=20=09=09=09=09=09=09=09=09=09=09=
=20ObjectIdGetDatum(ellabeloid),=0A=20=09=09=09=09=09=09=09=09=09=09=20=
ObjectIdGetDatum(propoid));=0A-=09=09=09if=20(!plpoid)=0A+=09=09=09if=20=
(!OidIsValid(plpoid))=0A=20=09=09=09=09ereport(ERROR,=0A=20=09=09=09=09=09=
=09errcode(ERRCODE_UNDEFINED_OBJECT),=0A=20=09=09=09=09=09=09=
errmsg("property=20graph=20\"%s\"=20element=20\"%s\"=20label=20\"%s\"=20=
has=20no=20property=20\"%s\"",=0A--=20=0A2.50.1=20(Apple=20Git-155)=0A=0A=

--Apple-Mail=_3FEB1E90-2E50-4078-B2C9-C5E27ED58F02--