MIME-Version: 1.0
References: 
 <CAHut+Pt3t_tCYwDStkj5fG4Z=YXrHvPBA7iGdh745QipC5zKeg@mail.gmail.com>
 <aeDs7iZUox1bbKAK@alvherre.pgsql>
 <CAHut+Psq7qmQSQCZA_HZcFv9ADCHDUPqCyFuTKfPDU-GUGihhQ@mail.gmail.com>
 <CAA4eK1LKQTHkVWdrS9vBfiaAf5kVuU-qOx_FD2u1F4zB9hz4PA@mail.gmail.com>
 <CAHut+Puic9YTrdj3B4BX1J-m=EJTtF5bhxk8cJpKJVrw6QWMLA@mail.gmail.com>
 <CALDaNm12mTxd10yHcf2SyDfkpbfWqHJb=m90cwfaEJnEBbPOXQ@mail.gmail.com>
 <CAHut+PuTH35hTKaP_+wuUepAbuWC2YLizG1aqxjvJP_fPBFFVQ@mail.gmail.com>
 <4ff427ca-7986-4d13-820f-199672ab81ff@163.com>
In-Reply-To: <4ff427ca-7986-4d13-820f-199672ab81ff@163.com>
From: Peter Smith <smithpb2250@gmail.com>
Date: Tue, 21 Apr 2026 16:45:58 +1000
Message-ID: 
 <CAHut+Pu3401UyW+qO-P3BcdxzwwL+wwb_ROpYNsHvJ427nWJkQ@mail.gmail.com>
Subject: Re: EXCEPT TABLE - Case inconsistency for describe \d and \dRp+
To: Yuchen Li <liyuchen_xyz@163.com>
Cc: vignesh C <vignesh21@gmail.com>, Amit Kapila <amit.kapila16@gmail.com>,
	=?UTF-8?Q?=C3=81lvaro_Herrera?= <alvherre@kurilemu.de>,
	PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>
Content-Type: multipart/mixed; boundary="0000000000002563e1064ff2c618"
Archived-At: 
 <https://www.postgresql.org/message-id/CAHut%2BPu3401UyW%2BqO-P3BcdxzwwL%2Bwwb_ROpYNsHvJ427nWJkQ%40mail.gmail.com>
Precedence: bulk

--0000000000002563e1064ff2c618
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, Apr 20, 2026 at 6:50=E2=80=AFPM Yuchen Li <liyuchen_xyz@163.com> wr=
ote:
>
> On 4/20/2026 2:46 PM, Peter Smith wrote:
> >>> PSA  v3 patches.
> >>>
> >>> v3-0001 - Fixed the TABLE describe footer titles as suggested.
> >>> - "Included in publications:"
> >>> - "Excluded from publications:"
> >>>
> >>> v3-0002 - Made similar footer title changes for SEQUENCE describe
> >>>
> >>> v3-0003 - Made similar footer title changes for SHCEMA describe. In
> >>> passing, I found that this \dn describe output was not even being
> >>> tested, so I added the missing regression test.
> >> I'm not sure separate patches are necessary for this change; it might
> >> be better to merge them into a single patch. Other than that, the
> >> changes look good.
> >>
> > I separated them because only the changes to TABLE \d had previously
> > been discussed.
> >
> > If everyone thinks all changes are good, then I can combine them into o=
ne patch.
> >
> > =3D=3D=3D=3D=3D=3D
> > Kind Regards,
> > Peter Smith.
> > Fujitsu Australia.
> >
> While reviewing 0003, I noticed a formatting issue in the following line:
>
> +             * schema mapping count +  1 (for storing NULL).
>
> There is an extra space after "count +".
>

PSA v4, now combined as Vignesh suggested, and with the extra space also fi=
xed.

=3D=3D=3D=3D=3D=3D
Kind Regards,
Peter Smith.
Fujitsu Australia.

--0000000000002563e1064ff2c618
Content-Type: application/octet-stream;
	name="v4-0001-Fix-describe-footer-titles.patch"
Content-Disposition: attachment;
	filename="v4-0001-Fix-describe-footer-titles.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_mo89feze0>
X-Attachment-Id: f_mo89feze0

RnJvbSBkZjVkZDI1NGQ5MjViZTc2MzFhMjk0NTZiODBjMzk0NDllMmQwYzI3IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBTbWl0aCA8cGV0ZXIuYi5zbWl0aEBmdWppdHN1LmNv
bT4KRGF0ZTogVHVlLCAyMSBBcHIgMjAyNiAxNjo0MDo0MSArMTAwMApTdWJqZWN0OiBbUEFUQ0gg
djRdIEZpeCBkZXNjcmliZSBmb290ZXIgdGl0bGVzCk1JTUUtVmVyc2lvbjogMS4wCkNvbnRlbnQt
VHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOApDb250ZW50LVRyYW5zZmVyLUVuY29kaW5n
OiA4Yml0CgpUaGUgcHNxbCBkZXNjcmliZSBmb290ZXIgdGl0bGVzIGZvciB0YWJsZXMgKFxkKSB3
ZXJlIG5vdCBpbnR1aXRpdmUgd2hlbiBsaXN0aW5nCnB1YmxpY2F0aW9ucyB0aGF0IGluY2x1ZGVk
IG9yIGV4Y2x1ZGVkIHRoZW0uIE5vdyB0aGVzZSBhcmUgY2hhbmdlZCB0byBzYXkKIkluY2x1ZGVk
IGluIHB1YmxpY2F0aW9uczoiIGFuZCAiRXhjbHVkZWQgZnJvbSBwdWJsaWNhdGlvbnM6IiByZXNw
ZWN0aXZlbHkuCgpGb290ZXIgdGl0bGVzIGZvciBzZXF1ZW5jZSBkZXNjcmliZSwgYW5kIHNjaGVt
YSBkZWNyaWJlIGFyZSB1cGRhdGVkIHNpbWlsYXJseS4KCkF1dGhvcjogUGV0ZXIgU21pdGggPHNt
aXRocGIyMjUwQGdtYWlsLmNvbT4KUmVwb3J0ZWQtYnk6IMOBbHZhcm8gSGVycmVyYSA8YWx2aGVy
cmVAa3VyaWxlbXUuZGU+ClJldmlld2VkLWJ5OiBBbWl0IEthcGlsYSA8YW1pdC5rYXBpbGExNkBn
bWFpbC5jb20+ClJldmlld2VkLWJ5OiB2aWduZXNoIEMgPHZpZ25lc2gyMUBnbWFpbC5jb20+ClJl
dmlld2VkLWJ5OiBZdWNoZW4gTGkgPGxpeXVjaGVuX3h5ekAxNjMuY29tPgoKRGlzY3Vzc2lvbjog
aHR0cHM6Ly93d3cucG9zdGdyZXNxbC5vcmcvbWVzc2FnZS1pZC9hZURzN2laVW94MWJiS0FLJTQw
YWx2aGVycmUucGdzcWwKLS0tCiBkb2Mvc3JjL3NnbWwvbG9naWNhbC1yZXBsaWNhdGlvbi5zZ21s
ICAgICB8ICA4ICsrLS0tCiBzcmMvYmluL3BzcWwvZGVzY3JpYmUuYyAgICAgICAgICAgICAgICAg
ICB8IDEyICsrKy0tLS0KIHNyYy90ZXN0L3JlZ3Jlc3MvZXhwZWN0ZWQvYWx0ZXJfdGFibGUub3V0
IHwgIDIgKy0KIHNyYy90ZXN0L3JlZ3Jlc3MvZXhwZWN0ZWQvcHVibGljYXRpb24ub3V0IHwgNDMg
KysrKysrKysrKysrKystLS0tLS0tLS0KIHNyYy90ZXN0L3JlZ3Jlc3Mvc3FsL3B1YmxpY2F0aW9u
LnNxbCAgICAgIHwgIDIgKysKIDUgZmlsZXMgY2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygrKSwgMjgg
ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL3NyYy9zZ21sL2xvZ2ljYWwtcmVwbGljYXRp
b24uc2dtbCBiL2RvYy9zcmMvc2dtbC9sb2dpY2FsLXJlcGxpY2F0aW9uLnNnbWwKaW5kZXggNTk4
ZTIzYWQ0ZjUuLmMwNmQyNTVkMmVkIDEwMDY0NAotLS0gYS9kb2Mvc3JjL3NnbWwvbG9naWNhbC1y
ZXBsaWNhdGlvbi5zZ21sCisrKyBiL2RvYy9zcmMvc2dtbC9sb2dpY2FsLXJlcGxpY2F0aW9uLnNn
bWwKQEAgLTEwOTksNyArMTA5OSw3IEBAIFRhYmxlczoKICBjICAgICAgfCB0ZXh0ICAgIHwgICAg
ICAgICAgIHwgbm90IG51bGwgfAogSW5kZXhlczoKICAgICAidDFfcGtleSIgUFJJTUFSWSBLRVks
IGJ0cmVlIChhLCBjKQotUHVibGljYXRpb25zOgorSW5jbHVkZWQgaW4gcHVibGljYXRpb25zOgog
ICAgICJwMSIgV0hFUkUgKChhID4gNSkgQU5EIChjID0gJ05TVyc6OnRleHQpKQogICAgICJwMiIK
IApAQCAtMTExMiw3ICsxMTEyLDcgQEAgUHVibGljYXRpb25zOgogIGYgICAgICB8IGludGVnZXIg
fCAgICAgICAgICAgfCAgICAgICAgICB8CiBJbmRleGVzOgogICAgICJ0Ml9wa2V5IiBQUklNQVJZ
IEtFWSwgYnRyZWUgKGQpCi1QdWJsaWNhdGlvbnM6CitJbmNsdWRlZCBpbiBwdWJsaWNhdGlvbnM6
CiAgICAgInAyIiBXSEVSRSAoZSA9IDk5KQogICAgICJwMyIgV0hFUkUgKGQgPSAxMCkKIApAQCAt
MTEyNSw3ICsxMTI1LDcgQEAgUHVibGljYXRpb25zOgogIGkgICAgICB8IGludGVnZXIgfCAgICAg
ICAgICAgfCAgICAgICAgICB8CiBJbmRleGVzOgogICAgICJ0M19wa2V5IiBQUklNQVJZIEtFWSwg
YnRyZWUgKGcpCi1QdWJsaWNhdGlvbnM6CitJbmNsdWRlZCBpbiBwdWJsaWNhdGlvbnM6CiAgICAg
InAzIiBXSEVSRSAoZyA9IDEwKQogXV0+PC9wcm9ncmFtbGlzdGluZz48L3BhcmE+CiAKQEAgLTE1
MjYsNyArMTUyNiw3IEBAIFRhYmxlczoKICBlICAgICAgfCB0ZXh0ICAgIHwgICAgICAgICAgIHwg
ICAgICAgICAgfAogSW5kZXhlczoKICAgICAidDFfcGtleSIgUFJJTUFSWSBLRVksIGJ0cmVlIChp
ZCkKLVB1YmxpY2F0aW9uczoKK0luY2x1ZGVkIGluIHB1YmxpY2F0aW9uczoKICAgICAicDEiIChp
ZCwgYSwgYiwgZCkKIDwvcHJvZ3JhbWxpc3Rpbmc+PC9wYXJhPgogCmRpZmYgLS1naXQgYS9zcmMv
YmluL3BzcWwvZGVzY3JpYmUuYyBiL3NyYy9iaW4vcHNxbC9kZXNjcmliZS5jCmluZGV4IGRkMTE3
OWVmOTI3Li5lNzhiM2RmNjFhNCAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wc3FsL2Rlc2NyaWJlLmMK
KysrIGIvc3JjL2Jpbi9wc3FsL2Rlc2NyaWJlLmMKQEAgLTE4OTUsNyArMTg5NSw3IEBAIGRlc2Ny
aWJlT25lVGFibGVEZXRhaWxzKGNvbnN0IGNoYXIgKnNjaGVtYW5hbWUsCiAKIAkJCQlpZiAobnJv
d3MgPiAwKQogCQkJCXsKLQkJCQkJcHJpbnRmUFFFeHBCdWZmZXIoJnRtcGJ1ZiwgXygiUHVibGlj
YXRpb25zOiIpKTsKKwkJCQkJcHJpbnRmUFFFeHBCdWZmZXIoJnRtcGJ1ZiwgXygiSW5jbHVkZWQg
aW4gcHVibGljYXRpb25zOiIpKTsKIAkJCQkJZm9yIChpID0gMDsgaSA8IG5yb3dzOyBpKyspCiAJ
CQkJCQlhcHBlbmRQUUV4cEJ1ZmZlcigmdG1wYnVmLCAiXG4gICAgXCIlc1wiIiwgUFFnZXR2YWx1
ZShyZXN1bHQsIGksIDApKTsKIApAQCAtMzI2Myw3ICszMjYzLDcgQEAgZGVzY3JpYmVPbmVUYWJs
ZURldGFpbHMoY29uc3QgY2hhciAqc2NoZW1hbmFtZSwKIAkJCQl0dXBsZXMgPSBQUW50dXBsZXMo
cmVzdWx0KTsKIAogCQkJaWYgKHR1cGxlcyA+IDApCi0JCQkJcHJpbnRUYWJsZUFkZEZvb3Rlcigm
Y29udCwgXygiUHVibGljYXRpb25zOiIpKTsKKwkJCQlwcmludFRhYmxlQWRkRm9vdGVyKCZjb250
LCBfKCJJbmNsdWRlZCBpbiBwdWJsaWNhdGlvbnM6IikpOwogCiAJCQkvKiBNaWdodCBiZSBhbiBl
bXB0eSBzZXQgLSB0aGF0J3Mgb2sgKi8KIAkJCWZvciAoaSA9IDA7IGkgPCB0dXBsZXM7IGkrKykK
QEAgLTMzMDYsNyArMzMwNiw3IEBAIGRlc2NyaWJlT25lVGFibGVEZXRhaWxzKGNvbnN0IGNoYXIg
KnNjaGVtYW5hbWUsCiAJCQkJdHVwbGVzID0gUFFudHVwbGVzKHJlc3VsdCk7CiAKIAkJCWlmICh0
dXBsZXMgPiAwKQotCQkJCXByaW50VGFibGVBZGRGb290ZXIoJmNvbnQsIF8oIkV4Y2VwdCBwdWJs
aWNhdGlvbnM6IikpOworCQkJCXByaW50VGFibGVBZGRGb290ZXIoJmNvbnQsIF8oIkV4Y2x1ZGVk
IGZyb20gcHVibGljYXRpb25zOiIpKTsKIAogCQkJLyogTWlnaHQgYmUgYW4gZW1wdHkgc2V0IC0g
dGhhdCdzIG9rICovCiAJCQlmb3IgKGkgPSAwOyBpIDwgdHVwbGVzOyBpKyspCkBAIC01NTMzLDEx
ICs1NTMzLDExIEBAIGxpc3RTY2hlbWFzKGNvbnN0IGNoYXIgKnBhdHRlcm4sIGJvb2wgdmVyYm9z
ZSwgYm9vbCBzaG93U3lzdGVtKQogCQl7CiAJCQkvKgogCQkJICogQWxsb2NhdGUgbWVtb3J5IGZv
ciBmb290ZXJzLiBTaXplIG9mIGZvb3RlcnMgd2lsbCBiZSAxIChmb3IKLQkJCSAqIHN0b3Jpbmcg
IlB1YmxpY2F0aW9uczoiIHN0cmluZykgKyBwdWJsaWNhdGlvbiBzY2hlbWEgbWFwcGluZwotCQkJ
ICogY291bnQgKyAgMSAoZm9yIHN0b3JpbmcgTlVMTCkuCisJCQkgKiBzdG9yaW5nICJJbmNsdWRl
ZCBpbiBwdWJsaWNhdGlvbnM6IiBzdHJpbmcpICsgcHVibGljYXRpb24KKwkJCSAqIHNjaGVtYSBt
YXBwaW5nIGNvdW50ICsgMSAoZm9yIHN0b3JpbmcgTlVMTCkuCiAJCQkgKi8KIAkJCWZvb3RlcnMg
PSBwZ19tYWxsb2NfYXJyYXkoY2hhciAqLCAxICsgcHViX3NjaGVtYV90dXBsZXMgKyAxKTsKLQkJ
CWZvb3RlcnNbMF0gPSBwZ19zdHJkdXAoXygiUHVibGljYXRpb25zOiIpKTsKKwkJCWZvb3RlcnNb
MF0gPSBwZ19zdHJkdXAoXygiSW5jbHVkZWQgaW4gcHVibGljYXRpb25zOiIpKTsKIAogCQkJLyog
TWlnaHQgYmUgYW4gZW1wdHkgc2V0IC0gdGhhdCdzIG9rICovCiAJCQlmb3IgKGkgPSAwOyBpIDwg
cHViX3NjaGVtYV90dXBsZXM7IGkrKykKZGlmZiAtLWdpdCBhL3NyYy90ZXN0L3JlZ3Jlc3MvZXhw
ZWN0ZWQvYWx0ZXJfdGFibGUub3V0IGIvc3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9hbHRlcl90
YWJsZS5vdXQKaW5kZXggZGFkOWQzNjkzN2UuLjZkZDIyYmUwZThkIDEwMDY0NAotLS0gYS9zcmMv
dGVzdC9yZWdyZXNzL2V4cGVjdGVkL2FsdGVyX3RhYmxlLm91dAorKysgYi9zcmMvdGVzdC9yZWdy
ZXNzL2V4cGVjdGVkL2FsdGVyX3RhYmxlLm91dApAQCAtNDg2OCw3ICs0ODY4LDcgQEAgYWx0ZXIg
dGFibGUgYWx0ZXIxLnQxIHNldCBzY2hlbWEgYWx0ZXIyOwogIENvbHVtbiB8ICBUeXBlICAgfCBD
b2xsYXRpb24gfCBOdWxsYWJsZSB8IERlZmF1bHQgfCBTdG9yYWdlIHwgU3RhdHMgdGFyZ2V0IHwg
RGVzY3JpcHRpb24gCiAtLS0tLS0tLSstLS0tLS0tLS0rLS0tLS0tLS0tLS0rLS0tLS0tLS0tLSst
LS0tLS0tLS0rLS0tLS0tLS0tKy0tLS0tLS0tLS0tLS0tKy0tLS0tLS0tLS0tLS0KICBhICAgICAg
fCBpbnRlZ2VyIHwgICAgICAgICAgIHwgICAgICAgICAgfCAgICAgICAgIHwgcGxhaW4gICB8ICAg
ICAgICAgICAgICB8IAotUHVibGljYXRpb25zOgorSW5jbHVkZWQgaW4gcHVibGljYXRpb25zOgog
ICAgICJwdWIxIgogCiBkcm9wIHB1YmxpY2F0aW9uIHB1YjE7CmRpZmYgLS1naXQgYS9zcmMvdGVz
dC9yZWdyZXNzL2V4cGVjdGVkL3B1YmxpY2F0aW9uLm91dCBiL3NyYy90ZXN0L3JlZ3Jlc3MvZXhw
ZWN0ZWQvcHVibGljYXRpb24ub3V0CmluZGV4IGQwMjhlOWJlODY2Li4wMzQ1ZjZjNWU0NyAxMDA2
NDQKLS0tIGEvc3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9wdWJsaWNhdGlvbi5vdXQKKysrIGIv
c3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9wdWJsaWNhdGlvbi5vdXQKQEAgLTEyOCw2ICsxMjgs
MTUgQEAgVGFibGVzIGZyb20gc2NoZW1hczoKIAogU0VUIGNsaWVudF9taW5fbWVzc2FnZXMgPSAn
RVJST1InOwogQ1JFQVRFIFBVQkxJQ0FUSU9OIHRlc3RwdWJfZm9yc2NoZW1hIEZPUiBUQUJMRVMg
SU4gU0NIRU1BIHB1Yl90ZXN0OworXGRuIHB1Yl90ZXN0CisgICAgICAgICAgIExpc3Qgb2Ygc2No
ZW1hcworICAgTmFtZSAgIHwgICAgICAgICAgT3duZXIgICAgICAgICAgIAorLS0tLS0tLS0tLSst
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorIHB1Yl90ZXN0IHwgcmVncmVzc19wdWJsaWNhdGlv
bl91c2VyCitJbmNsdWRlZCBpbiBwdWJsaWNhdGlvbnM6CisgICAgInRlc3RwdWJfZm9yc2NoZW1h
IgorICAgICJ0ZXN0cHViX2ZvcnRhYmxlIgorCiAtLSBzaG91bGQgYmUgYWJsZSB0byBjcmVhdGUg
cHVibGljYXRpb24gd2l0aCBzY2hlbWEgYW5kIHRhYmxlIG9mIHRoZSBzYW1lCiAtLSBzY2hlbWEK
IENSRUFURSBQVUJMSUNBVElPTiB0ZXN0cHViX2Zvcl90Ymxfc2NoZW1hIEZPUiBUQUJMRVMgSU4g
U0NIRU1BIHB1Yl90ZXN0LCBUQUJMRSBwdWJfdGVzdC50ZXN0cHViX25vcGs7CkBAIC0yMDEsNyAr
MjEwLDcgQEAgU0VMRUNUIHB1Ym5hbWUsIHB1YmFsbHRhYmxlcyBGUk9NIHBnX3B1YmxpY2F0aW9u
IFdIRVJFIHB1Ym5hbWUgPSAndGVzdHB1Yl9mb3JhbGwKICBkYXRhICAgfCB0ZXh0ICAgIHwgICAg
ICAgICAgIHwgICAgICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgIHwgZXh0ZW5kZWQgfCAgICAgICAgICAgICAgfCAKIEluZGV4ZXM6CiAgICAgInRlc3RwdWJf
dGJsMl9wa2V5IiBQUklNQVJZIEtFWSwgYnRyZWUgKGlkKQotUHVibGljYXRpb25zOgorSW5jbHVk
ZWQgaW4gcHVibGljYXRpb25zOgogICAgICJ0ZXN0cHViX2ZvcmFsbHRhYmxlcyIKIE5vdC1udWxs
IGNvbnN0cmFpbnRzOgogICAgICJ0ZXN0cHViX3RibDJfaWRfbm90X251bGwiIE5PVCBOVUxMICJp
ZCIKQEAgLTI1MCw5ICsyNTksOSBAQCBFeGNlcHQgdGFibGVzOgogIGRhdGEgICB8IHRleHQgICAg
fCAgICAgICAgICAgfCAgICAgICAgICB8IAogSW5kZXhlczoKICAgICAidGVzdHB1Yl90YmwxX3Br
ZXkiIFBSSU1BUlkgS0VZLCBidHJlZSAoaWQpCi1QdWJsaWNhdGlvbnM6CitJbmNsdWRlZCBpbiBw
dWJsaWNhdGlvbnM6CiAgICAgInRlc3RwdWJfZm9yYWxsdGFibGVzIgotRXhjZXB0IHB1YmxpY2F0
aW9uczoKK0V4Y2x1ZGVkIGZyb20gcHVibGljYXRpb25zOgogICAgICJ0ZXN0cHViX2ZvcmFsbHRh
Ymxlc19leGNlcHR0YWJsZSIKICAgICAidGVzdHB1Yl9mb3JhbGx0YWJsZXNfZXhjZXB0dGFibGUx
IgogCkBAIC00MzUsNyArNDQ0LDcgQEAgRXhjZXB0IHRhYmxlczoKIC0tLS0tLS0tKy0tLS0tLS0t
LSstLS0tLS0tLS0tLSstLS0tLS0tLS0tKy0tLS0tLS0tLQogIGEgICAgICB8IGludGVnZXIgfCAg
ICAgICAgICAgfCAgICAgICAgICB8IAogUGFydGl0aW9uIG9mOiB0ZXN0cHViX3Jvb3QgRk9SIFZB
TFVFUyBGUk9NICgwKSBUTyAoMTAwKQotRXhjZXB0IHB1YmxpY2F0aW9uczoKK0V4Y2x1ZGVkIGZy
b20gcHVibGljYXRpb25zOgogICAgICJ0ZXN0cHViOCIKIAogXGQgdGVzdHB1Yl9yb290CkBAIC00
NDQsNyArNDUzLDcgQEAgRXhjZXB0IHB1YmxpY2F0aW9uczoKIC0tLS0tLS0tKy0tLS0tLS0tLSst
LS0tLS0tLS0tLSstLS0tLS0tLS0tKy0tLS0tLS0tLQogIGEgICAgICB8IGludGVnZXIgfCAgICAg
ICAgICAgfCAgICAgICAgICB8IAogUGFydGl0aW9uIGtleTogUkFOR0UgKGEpCi1FeGNlcHQgcHVi
bGljYXRpb25zOgorRXhjbHVkZWQgZnJvbSBwdWJsaWNhdGlvbnM6CiAgICAgInRlc3RwdWI4Igog
TnVtYmVyIG9mIHBhcnRpdGlvbnM6IDEgKFVzZSBcZCsgdG8gbGlzdCB0aGVtLikKIApAQCAtNDc5
LDcgKzQ4OCw3IEBAIFNFTEVDVCBwdWJuYW1lLCBwdWJhbGx0YWJsZXMsIHB1YmFsbHNlcXVlbmNl
cyBGUk9NIHBnX3B1YmxpY2F0aW9uIFdIRVJFIHB1Ym5hbWUKICAgVHlwZSAgfCBTdGFydCB8IE1p
bmltdW0gfCAgICAgICBNYXhpbXVtICAgICAgIHwgSW5jcmVtZW50IHwgQ3ljbGVzPyB8IENhY2hl
IAogLS0tLS0tLS0rLS0tLS0tLSstLS0tLS0tLS0rLS0tLS0tLS0tLS0tLS0tLS0tLS0tKy0tLS0t
LS0tLS0tKy0tLS0tLS0tLSstLS0tLS0tCiAgYmlnaW50IHwgICAgIDEgfCAgICAgICAxIHwgOTIy
MzM3MjAzNjg1NDc3NTgwNyB8ICAgICAgICAgMSB8IG5vICAgICAgfCAgICAgMQotUHVibGljYXRp
b25zOgorSW5jbHVkZWQgaW4gcHVibGljYXRpb25zOgogICAgICJyZWdyZXNzX3B1Yl9mb3JhbGxz
ZXF1ZW5jZXMxIgogCiBcZFJwKyByZWdyZXNzX3B1Yl9mb3JhbGxzZXF1ZW5jZXMxCkBAIC00OTgs
NyArNTA3LDcgQEAgUkVTRVQgY2xpZW50X21pbl9tZXNzYWdlczsKICAgVHlwZSAgfCBTdGFydCB8
IE1pbmltdW0gfCAgICAgICBNYXhpbXVtICAgICAgIHwgSW5jcmVtZW50IHwgQ3ljbGVzPyB8IENh
Y2hlIAogLS0tLS0tLS0rLS0tLS0tLSstLS0tLS0tLS0rLS0tLS0tLS0tLS0tLS0tLS0tLS0tKy0t
LS0tLS0tLS0tKy0tLS0tLS0tLSstLS0tLS0tCiAgYmlnaW50IHwgICAgIDEgfCAgICAgICAxIHwg
OTIyMzM3MjAzNjg1NDc3NTgwNyB8ICAgICAgICAgMSB8IG5vICAgICAgfCAgICAgMQotUHVibGlj
YXRpb25zOgorSW5jbHVkZWQgaW4gcHVibGljYXRpb25zOgogICAgICJyZWdyZXNzX3B1Yl9mb3Jh
bGxzZXF1ZW5jZXMxIgogICAgICJyZWdyZXNzX3B1Yl9mb3JhbGxzZXF1ZW5jZXMyIgogCkBAIC02
MzYsNyArNjQ1LDcgQEAgVGFibGVzOgogIENvbHVtbiB8ICBUeXBlICAgfCBDb2xsYXRpb24gfCBO
dWxsYWJsZSB8IERlZmF1bHQgCiAtLS0tLS0tLSstLS0tLS0tLS0rLS0tLS0tLS0tLS0rLS0tLS0t
LS0tLSstLS0tLS0tLS0KICBlICAgICAgfCBpbnRlZ2VyIHwgICAgICAgICAgIHwgICAgICAgICAg
fCAKLVB1YmxpY2F0aW9uczoKK0luY2x1ZGVkIGluIHB1YmxpY2F0aW9uczoKICAgICAidGVzdHB1
YjUiIFdIRVJFICgoZSA+IDEwMDApIEFORCAoZSA8IDIwMDApKQogCiBBTFRFUiBQVUJMSUNBVElP
TiB0ZXN0cHViNSBEUk9QIFRBQkxFIHRlc3RwdWJfcmZfdGJsMjsKQEAgLTY2NCw3ICs2NzMsNyBA
QCBUYWJsZXM6CiAgQ29sdW1uIHwgIFR5cGUgICB8IENvbGxhdGlvbiB8IE51bGxhYmxlIHwgRGVm
YXVsdCAKIC0tLS0tLS0tKy0tLS0tLS0tLSstLS0tLS0tLS0tLSstLS0tLS0tLS0tKy0tLS0tLS0t
LQogIGUgICAgICB8IGludGVnZXIgfCAgICAgICAgICAgfCAgICAgICAgICB8IAotUHVibGljYXRp
b25zOgorSW5jbHVkZWQgaW4gcHVibGljYXRpb25zOgogICAgICJ0ZXN0cHViNSIgV0hFUkUgKChl
ID4gMzAwKSBBTkQgKGUgPCA1MDApKQogCiAtLSB0ZXN0IFxkIDx0YWJsZW5hbWU+IChub3cgaXQg
ZGlzcGxheXMgZmlsdGVyIGluZm9ybWF0aW9uKQpAQCAtNjc4LDcgKzY4Nyw3IEBAIFJFU0VUIGNs
aWVudF9taW5fbWVzc2FnZXM7CiAtLS0tLS0tLSstLS0tLS0tLS0rLS0tLS0tLS0tLS0rLS0tLS0t
LS0tLSstLS0tLS0tLS0KICBhICAgICAgfCBpbnRlZ2VyIHwgICAgICAgICAgIHwgICAgICAgICAg
fCAKICBiICAgICAgfCB0ZXh0ICAgIHwgICAgICAgICAgIHwgICAgICAgICAgfCAKLVB1YmxpY2F0
aW9uczoKK0luY2x1ZGVkIGluIHB1YmxpY2F0aW9uczoKICAgICAidGVzdHB1Yl9yZl9ubyIKICAg
ICAidGVzdHB1Yl9yZl95ZXMiIFdIRVJFIChhID4gMSkKIApAQCAtMTE1Myw3ICsxMTYyLDcgQEAg
QUxURVIgUFVCTElDQVRJT04gdGVzdHB1Yl9mb3J0YWJsZSBBREQgVEFCTEUgdGVzdHB1Yl90Ymw3
IChhLCBiKTsKICBjICAgICAgfCB0ZXh0ICAgIHwgICAgICAgICAgIHwgICAgICAgICAgfCAgICAg
ICAgIHwgZXh0ZW5kZWQgfCAgICAgICAgICAgICAgfCAKIEluZGV4ZXM6CiAgICAgInRlc3RwdWJf
dGJsN19wa2V5IiBQUklNQVJZIEtFWSwgYnRyZWUgKGEpCi1QdWJsaWNhdGlvbnM6CitJbmNsdWRl
ZCBpbiBwdWJsaWNhdGlvbnM6CiAgICAgInRlc3RwdWJfZm9ydGFibGUiIChhLCBiKQogTm90LW51
bGwgY29uc3RyYWludHM6CiAgICAgInRlc3RwdWJfdGJsN19hX25vdF9udWxsIiBOT1QgTlVMTCAi
YSIKQEAgLTExNjksNyArMTE3OCw3IEBAIEFMVEVSIFBVQkxJQ0FUSU9OIHRlc3RwdWJfZm9ydGFi
bGUgU0VUIFRBQkxFIHRlc3RwdWJfdGJsNyAoYSwgYik7CiAgYyAgICAgIHwgdGV4dCAgICB8ICAg
ICAgICAgICB8ICAgICAgICAgIHwgICAgICAgICB8IGV4dGVuZGVkIHwgICAgICAgICAgICAgIHwg
CiBJbmRleGVzOgogICAgICJ0ZXN0cHViX3RibDdfcGtleSIgUFJJTUFSWSBLRVksIGJ0cmVlIChh
KQotUHVibGljYXRpb25zOgorSW5jbHVkZWQgaW4gcHVibGljYXRpb25zOgogICAgICJ0ZXN0cHVi
X2ZvcnRhYmxlIiAoYSwgYikKIE5vdC1udWxsIGNvbnN0cmFpbnRzOgogICAgICJ0ZXN0cHViX3Ri
bDdfYV9ub3RfbnVsbCIgTk9UIE5VTEwgImEiCkBAIC0xMTg1LDcgKzExOTQsNyBAQCBBTFRFUiBQ
VUJMSUNBVElPTiB0ZXN0cHViX2ZvcnRhYmxlIFNFVCBUQUJMRSB0ZXN0cHViX3RibDcgKGEsIGMp
OwogIGMgICAgICB8IHRleHQgICAgfCAgICAgICAgICAgfCAgICAgICAgICB8ICAgICAgICAgfCBl
eHRlbmRlZCB8ICAgICAgICAgICAgICB8IAogSW5kZXhlczoKICAgICAidGVzdHB1Yl90Ymw3X3Br
ZXkiIFBSSU1BUlkgS0VZLCBidHJlZSAoYSkKLVB1YmxpY2F0aW9uczoKK0luY2x1ZGVkIGluIHB1
YmxpY2F0aW9uczoKICAgICAidGVzdHB1Yl9mb3J0YWJsZSIgKGEsIGMpCiBOb3QtbnVsbCBjb25z
dHJhaW50czoKICAgICAidGVzdHB1Yl90Ymw3X2Ffbm90X251bGwiIE5PVCBOVUxMICJhIgpAQCAt
MTMyMyw3ICsxMzMyLDcgQEAgVGFibGVzOgogIGMgICAgICB8IGludGVnZXIgfCAgICAgICAgICAg
fCBub3QgbnVsbCB8ICAgICAgICAgfCBwbGFpbiAgIHwgICAgICAgICAgICAgIHwgCiBJbmRleGVz
OgogICAgICJ0ZXN0cHViX3RibF9ib3RoX2ZpbHRlcnNfcGtleSIgUFJJTUFSWSBLRVksIGJ0cmVl
IChhLCBjKSBSRVBMSUNBIElERU5USVRZCi1QdWJsaWNhdGlvbnM6CitJbmNsdWRlZCBpbiBwdWJs
aWNhdGlvbnM6CiAgICAgInRlc3RwdWJfYm90aF9maWx0ZXJzIiAoYSwgYykgV0hFUkUgKGMgPD4g
MSkKIE5vdC1udWxsIGNvbnN0cmFpbnRzOgogICAgICJ0ZXN0cHViX3RibF9ib3RoX2ZpbHRlcnNf
YV9ub3RfbnVsbCIgTk9UIE5VTEwgImEiCkBAIC0xNTQwLDcgKzE1NDksNyBAQCBBTFRFUiBQVUJM
SUNBVElPTiB0ZXN0cHViX2luc190cnVuY3QgQUREIFRBQkxFIHB1Yl90ZXN0LnRlc3RwdWJfbm9w
aywgdGVzdHB1Yl90YgogLS0tLS0tLS0rLS0tLS0tLS0tKy0tLS0tLS0tLS0tKy0tLS0tLS0tLS0r
LS0tLS0tLS0tKy0tLS0tLS0tLSstLS0tLS0tLS0tLS0tLSstLS0tLS0tLS0tLS0tCiAgZm9vICAg
IHwgaW50ZWdlciB8ICAgICAgICAgICB8ICAgICAgICAgIHwgICAgICAgICB8IHBsYWluICAgfCAg
ICAgICAgICAgICAgfCAKICBiYXIgICAgfCBpbnRlZ2VyIHwgICAgICAgICAgIHwgICAgICAgICAg
fCAgICAgICAgIHwgcGxhaW4gICB8ICAgICAgICAgICAgICB8IAotUHVibGljYXRpb25zOgorSW5j
bHVkZWQgaW4gcHVibGljYXRpb25zOgogICAgICJ0ZXN0cHViX2RlZmF1bHQiCiAgICAgInRlc3Rw
dWJfZm9ydGJsIgogICAgICJ0ZXN0cHViX2luc190cnVuY3QiCkBAIC0xNTUzLDcgKzE1NjIsNyBA
QCBQdWJsaWNhdGlvbnM6CiAgZGF0YSAgIHwgdGV4dCAgICB8ICAgICAgICAgICB8ICAgICAgICAg
IHwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IGV4dGVuZGVkIHwg
ICAgICAgICAgICAgIHwgCiBJbmRleGVzOgogICAgICJ0ZXN0cHViX3RibDFfcGtleSIgUFJJTUFS
WSBLRVksIGJ0cmVlIChpZCkKLVB1YmxpY2F0aW9uczoKK0luY2x1ZGVkIGluIHB1YmxpY2F0aW9u
czoKICAgICAidGVzdHB1Yl9kZWZhdWx0IgogICAgICJ0ZXN0cHViX2ZvcnRibCIKICAgICAidGVz
dHB1Yl9pbnNfdHJ1bmN0IgpAQCAtMTU4MSw3ICsxNTkwLDcgQEAgRVJST1I6ICByZWxhdGlvbiAi
dGVzdHB1Yl9ub3BrIiBpcyBub3QgcGFydCBvZiB0aGUgcHVibGljYXRpb24KICBkYXRhICAgfCB0
ZXh0ICAgIHwgICAgICAgICAgIHwgICAgICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgIHwgZXh0ZW5kZWQgfCAgICAgICAgICAgICAgfCAKIEluZGV4ZXM6CiAg
ICAgInRlc3RwdWJfdGJsMV9wa2V5IiBQUklNQVJZIEtFWSwgYnRyZWUgKGlkKQotUHVibGljYXRp
b25zOgorSW5jbHVkZWQgaW4gcHVibGljYXRpb25zOgogICAgICJ0ZXN0cHViX2ZvcnRibCIKICAg
ICAidGVzdHB1Yl9pbnNfdHJ1bmN0IgogTm90LW51bGwgY29uc3RyYWludHM6CmRpZmYgLS1naXQg
YS9zcmMvdGVzdC9yZWdyZXNzL3NxbC9wdWJsaWNhdGlvbi5zcWwgYi9zcmMvdGVzdC9yZWdyZXNz
L3NxbC9wdWJsaWNhdGlvbi5zcWwKaW5kZXggNjQyZTMyZmEwOTguLjA0MWUxNGE0ZGU2IDEwMDY0
NAotLS0gYS9zcmMvdGVzdC9yZWdyZXNzL3NxbC9wdWJsaWNhdGlvbi5zcWwKKysrIGIvc3JjL3Rl
c3QvcmVncmVzcy9zcWwvcHVibGljYXRpb24uc3FsCkBAIC03Niw2ICs3Niw4IEBAIEFMVEVSIFBV
QkxJQ0FUSU9OIHRlc3RwdWJfZm9ydGFibGUgU0VUIFRBQkxFUyBJTiBTQ0hFTUEgcHViX3Rlc3Q7
CiAKIFNFVCBjbGllbnRfbWluX21lc3NhZ2VzID0gJ0VSUk9SJzsKIENSRUFURSBQVUJMSUNBVElP
TiB0ZXN0cHViX2ZvcnNjaGVtYSBGT1IgVEFCTEVTIElOIFNDSEVNQSBwdWJfdGVzdDsKK1xkbiBw
dWJfdGVzdAorCiAtLSBzaG91bGQgYmUgYWJsZSB0byBjcmVhdGUgcHVibGljYXRpb24gd2l0aCBz
Y2hlbWEgYW5kIHRhYmxlIG9mIHRoZSBzYW1lCiAtLSBzY2hlbWEKIENSRUFURSBQVUJMSUNBVElP
TiB0ZXN0cHViX2Zvcl90Ymxfc2NoZW1hIEZPUiBUQUJMRVMgSU4gU0NIRU1BIHB1Yl90ZXN0LCBU
QUJMRSBwdWJfdGVzdC50ZXN0cHViX25vcGs7Ci0tIAoyLjQ3LjMKCg==
--0000000000002563e1064ff2c618--