MIME-Version: 1.0
References: <cd24aa81-152e-4194-9bbe-0f34a0a3f539@dunslane.net>
 <202503311812.vxg5b7rzfgf6@alvherre.pgsql>
 <CAKYtNArtO8T-u5=E4ibxFfW+zQ8dBmOZQFgRa36+27NFkdtK0Q@mail.gmail.com>
 <616efe2c-3986-43cf-b88c-4435849acf9e@dunslane.net>
 <CAKYtNAoE1xUcMmBq-1qCaZGUDQLfMSVa6hzBVA-PqbmSTzPf5A@mail.gmail.com>
 <CAKYtNAq530UTAtnVs5xfONQ0j6vS-Sys50p5+SNfC7G7_ghCVQ@mail.gmail.com>
 <948154fe-0278-4f4c-8f5a-085e12f03163@dunslane.net>
 <20250708212819.09.nmisch@google.com>
 <CAKYtNAr-6_CCz+tnJ0T2597Ar4iAZXkE1qPimsO9EY-Kn7LvzQ@mail.gmail.com>
 <20250716001957.c6.nmisch@google.com>
In-Reply-To: <20250716001957.c6.nmisch@google.com>
From: Mahendra Singh Thalor <mahi6run@gmail.com>
Date: Thu, 17 Jul 2025 15:46:41 +0530
Message-ID: 
 <CAKYtNAqXTvfAw-y4FHvzprg72cFrC63cge9xMVDO_R4=NHc5rA@mail.gmail.com>
Subject: Re: Non-text mode for pg_dumpall
To: Noah Misch <noah@leadboat.com>
Cc: Andrew Dunstan <andrew@dunslane.net>,
 =?UTF-8?Q?=C3=81lvaro_Herrera?= <alvherre@alvh.no-ip.org>,
	jian he <jian.universality@gmail.com>, Srinath Reddy <srinath2133@gmail.com>,
	pgsql-hackers@lists.postgresql.org
Content-Type: multipart/mixed; boundary="000000000000fb67ad063a1d4ef8"
Archived-At: 
 <https://www.postgresql.org/message-id/CAKYtNAqXTvfAw-y4FHvzprg72cFrC63cge9xMVDO_R4%3DNHc5rA%40mail.gmail.com>
Precedence: bulk

--000000000000fb67ad063a1d4ef8
Content-Type: text/plain; charset="UTF-8"

Thanks Noah for the feedback.

On Wed, 16 Jul 2025 at 05:50, Noah Misch <noah@leadboat.com> wrote:
>
> On Thu, Jul 10, 2025 at 12:21:03AM +0530, Mahendra Singh Thalor wrote:
> > On Wed, 9 Jul 2025 at 02:58, Noah Misch <noah@leadboat.com> wrote:
> > > On Fri, Apr 04, 2025 at 04:11:05PM -0400, Andrew Dunstan wrote:
> > > > Thanks. I have pushed these now with a few further small tweaks.
> > >
> > > This drops all databases:
> > >
> > > pg_dumpall --clean -Fd -f /tmp/dump
> > > pg_restore -d template1 --globals-only /tmp/dump
> > >
> > > That didn't match my expectations given this help text:
> > >
> > > $ pg_restore --help|grep global
> > >   -g, --globals-only           restore only global objects, no databases
> >
> > Databases are global objects so due to --clean command, we are putting
> > drop commands in global.dat for all the databases. While restoring, we
> > used the  "--globals-only" option so we are dropping all these
> > databases by global.dat file.
> >
> > Please let us know your expectations for this specific case.
>
> Be consistent with "pg_dump".  A quick check suggests "pg_dump --clean"
> affects plain format only.  For non-plain formats, only the pg_restore
> argument governs the final commands:
>
> $ rm -r /tmp/dump; pg_dump --clean -Fd -f /tmp/dump && pg_restore -f- /tmp/dump | grep DROP
> $ rm -r /tmp/dump; pg_dump --clean -Fd -f /tmp/dump && pg_restore --clean -f- /tmp/dump | grep DROP
> DROP TABLE public.example;
>
> That said, you should audit code referencing the --clean flag and see if
> there's more to it than that quick test suggests.  Note that aligning with
> pg_dump will require changes for object types beyond databases.  "pg_restore
> --clean" of a global dump should emit DROP TABLESPACE and DROP ROLE as
> appropriate, regardless of whether the original pg_dumpall had --clean.
>
> For my earlier example (pg_dumpall --clean; pg_restore --globals-only) I
> expect the same outcome as plain-format "pg_dumpall --globals-only", which is
> no databases dropped or created.  The help line says "no databases".  Plain
> "pg_dumpall --globals-only" and even "pg_dumpall --globals-only --clean" do
> not drop or create databases.

To pg_restore, we are giving a dump of pg_dumpall which has a
global.dat file and we have drop commands in the global.dat file so
when we are using 'globals-only', we are dropping databases as we have
DROP commands.
As of now, we don't have any filter for global.dat file in restore. If
a user wants to restore only globals(without droping db), then they
should use 'globals-only' in pg_dumpall.
Or if we don't want to DROP databases by global.dat file, then we
should add a filter in pg_restore (hard to implement as we have SQL
commands in global.dat file). I think, for this case, we can do some
more doc changes.
Example: pg_restore --globals-only : this will restore the global.dat
file(including all drop commands). It might drop databases if any drop
commands.
@Andrew Dunstan Please add your opinion.

>
> > > commit 1495eff wrote:
> > > > --- a/src/bin/pg_dump/pg_dumpall.c
> > > > +++ b/src/bin/pg_dump/pg_dumpall.c
> > >
> > > > @@ -1612,9 +1683,27 @@ dumpDatabases(PGconn *conn)
> > > >                       continue;
> > > >               }
> > > >
> > > > +             /*
> > > > +              * If this is not a plain format dump, then append dboid and dbname to
> > > > +              * the map.dat file.
> > > > +              */
> > > > +             if (archDumpFormat != archNull)
> > > > +             {
> > > > +                     if (archDumpFormat == archCustom)
> > > > +                             snprintf(dbfilepath, MAXPGPATH, "\"%s\"/\"%s\".dmp", db_subdir, oid);
> > > > +                     else if (archDumpFormat == archTar)
> > > > +                             snprintf(dbfilepath, MAXPGPATH, "\"%s\"/\"%s\".tar", db_subdir, oid);
> > > > +                     else
> > > > +                             snprintf(dbfilepath, MAXPGPATH, "\"%s\"/\"%s\"", db_subdir, oid);
> > >
> > > Use appendShellString() instead.  Plain mode already does that for the
> > > "pg_dumpall -f" argument, which is part of db_subdir here.  We don't want
> > > weird filename characters to work out differently for plain vs. non-plain
> > > mode.  Also, it's easier to search for appendShellString() than to search for
> > > open-coded shell quoting.
> >
> > Yes, we can use appendShellString also. We are using snprintf in the
> > pg_dump.c file also.
> > Ex: snprintf(tagbuf, sizeof(tagbuf), "LARGE OBJECTS %u..%u",
> >                      loinfo->looids[0], loinfo->looids[loinfo->numlos - 1]);
>
> It's true snprintf() is not banned in these programs, but don't use it to do
> the quoting for OS shell command lines or fragments thereof.  dbfilepath is a
> fragment of an OS shell command line.  The LARGE OBJECTS string is not one of
> those.  Hence, the LARGE OBJECTS scenario should keep using snprintf().
>
> > If we want to use appendShellString, I can write a patch for these.
> > Please let me know your opinion.
>
> Use appendShellString() for shell quoting.  Don't attempt to use it for other
> purposes.

Okay. Fixed in attached patch.

>
> > > > --- a/src/bin/pg_dump/pg_restore.c
> > > > +++ b/src/bin/pg_dump/pg_restore.c
> > >
> > > > +/*
> > > > + * read_one_statement
> > > > + *
> > > > + * This will start reading from passed file pointer using fgetc and read till
> > > > + * semicolon(sql statement terminator for global.dat file)
> > > > + *
> > > > + * EOF is returned if end-of-file input is seen; time to shut down.
> > >
> > > What makes it okay to use this particular subset of SQL lexing?
> >
> > To support complex syntax, we used this code from another file.
>
> I'm hearing that you copied this code from somewhere.  Running
> "git grep 'time to shut down'" suggests you copied it from
> InteractiveBackend().  Is that right?  I do see other similarities between
> read_one_statement() and InteractiveBackend().
>
> Copying InteractiveBackend() provides negligible assurance that this is the
> right subset of SQL lexing.  Only single-user mode uses InteractiveBackend().
> Single-user mode survives mostly as a last resort for recovering from having
> reached xidStopLimit, is rarely used, and only superusers write queries to it.

Yes, we copied this from InteractiveBackend to read statements from
global.dat file.

>
> > > > +/*
> > > > + * get_dbnames_list_to_restore
> > > > + *
> > > > + * This will mark for skipping any entries from dbname_oid_list that pattern match an
> > > > + * entry in the db_exclude_patterns list.
> > > > + *
> > > > + * Returns the number of database to be restored.
> > > > + *
> > > > + */
> > > > +static int
> > > > +get_dbnames_list_to_restore(PGconn *conn,
> > > > +                                                     SimpleOidStringList *dbname_oid_list,
> > > > +                                                     SimpleStringList db_exclude_patterns)
> > > > +{
> > > > +     int                     count_db = 0;
> > > > +     PQExpBuffer query;
> > > > +     PGresult   *res;
> > > > +
> > > > +     query = createPQExpBuffer();
> > > > +
> > > > +     if (!conn)
> > > > +             pg_log_info("considering PATTERN as NAME for --exclude-database option as no db connection while doing pg_restore.");
> > >
> > > When do we not have a connection here?  We'd need to document this behavior
> > > variation if it stays, but I'd prefer if we can just rely on having a
> > > connection.
> >
> > Yes, we can document this behavior.
>
> My review asked a question there.  I don't see an answer to that question.
> Would you answer that question?

Example: if there is no active database, even postgres/template1, then
we will consider PATTEREN as NAME. This is the rare case.
In attached patch, I added one doc line also for this case.

> > @@ -1612,9 +1683,27 @@ dumpDatabases(PGconn *conn)
> >                       continue;
> >               }
> >
> > +             /*
> > +              * If this is not a plain format dump, then append dboid and dbname to
> > +              * the map.dat file.
> > +              */
> > +             if (archDumpFormat != archNull)
> > +             {
> > +                     if (archDumpFormat == archCustom)
> > +                             snprintf(dbfilepath, MAXPGPATH, "\"%s\"/\"%s\".dmp", db_subdir, oid);
> > +                     else if (archDumpFormat == archTar)
> > +                             snprintf(dbfilepath, MAXPGPATH, "\"%s\"/\"%s\".tar", db_subdir, oid);
> > +                     else
> > +                             snprintf(dbfilepath, MAXPGPATH, "\"%s\"/\"%s\"", db_subdir, oid);
>
> Use appendShellString() instead.  Plain mode already does that for the
> "pg_dumpall -f" argument, which is part of db_subdir here.  We don't want
> weird filename characters to work out differently for plain vs. non-plain
> mode.  Also, it's easier to search for appendShellString() than to search for
> open-coded shell quoting.

Fixed.

>
> > @@ -1641,19 +1727,30 @@ dumpDatabases(PGconn *conn)
> >               if (filename)
> >                       fclose(OPF);
> >
> > -             ret = runPgDump(dbname, create_opts);
> > +             ret = runPgDump(dbname, create_opts, dbfilepath, archDumpFormat);
> >               if (ret != 0)
> >                       pg_fatal("pg_dump failed on database \"%s\", exiting", dbname);
> >
> >               if (filename)
> >               {
> > -                     OPF = fopen(filename, PG_BINARY_A);
> > +                     char            global_path[MAXPGPATH];
> > +
> > +                     if (archDumpFormat != archNull)
> > +                             snprintf(global_path, MAXPGPATH, "%s/global.dat", filename);
> > +                     else
> > +                             snprintf(global_path, MAXPGPATH, "%s", filename);
> > +
> > +                     OPF = fopen(global_path, PG_BINARY_A);
> >                       if (!OPF)
> >                               pg_fatal("could not re-open the output file \"%s\": %m",
> > -                                              filename);
> > +                                              global_path);
>
> Minor item: plain mode benefits from reopening, because pg_dump appended to
> the plain output file.  There's no analogous need to reopen global.dat, since
> just this one process writes to global.dat.

Fixed.

>
> > @@ -1672,17 +1770,36 @@ runPgDump(const char *dbname, const char *create_opts)
> >       initPQExpBuffer(&connstrbuf);
> >       initPQExpBuffer(&cmd);
> >
> > -     printfPQExpBuffer(&cmd, "\"%s\" %s %s", pg_dump_bin,
> > -                                       pgdumpopts->data, create_opts);
> > -
> >       /*
> > -      * If we have a filename, use the undocumented plain-append pg_dump
> > -      * format.
> > +      * If this is not a plain format dump, then append file name and dump
> > +      * format to the pg_dump command to get archive dump.
> >        */
> > -     if (filename)
> > -             appendPQExpBufferStr(&cmd, " -Fa ");
> > +     if (archDumpFormat != archNull)
> > +     {
> > +             printfPQExpBuffer(&cmd, "\"%s\" -f %s %s", pg_dump_bin,
> > +                                               dbfile, create_opts);
> > +
> > +             if (archDumpFormat == archDirectory)
> > +                     appendPQExpBufferStr(&cmd, "  --format=directory ");
> > +             else if (archDumpFormat == archCustom)
> > +                     appendPQExpBufferStr(&cmd, "  --format=custom ");
> > +             else if (archDumpFormat == archTar)
> > +                     appendPQExpBufferStr(&cmd, "  --format=tar ");
> > +     }
> >       else
> > -             appendPQExpBufferStr(&cmd, " -Fp ");
> > +     {
> > +             printfPQExpBuffer(&cmd, "\"%s\" %s %s", pg_dump_bin,
> > +                                               pgdumpopts->data, create_opts);
>
> This uses pgdumpopts for plain mode only, so many pg_dumpall options silently
> have no effect in non-plain mode.  Example:
>
> strace -f pg_dumpall --lock-wait-timeout=10 2>&1 >/dev/null | grep exec
> strace -f pg_dumpall --lock-wait-timeout=10 -Fd -f /tmp/dump3 2>&1 >/dev/null | grep exec

Fixed.

> > +             /* If database is already created, then don't set createDB flag. */
> > +             if (opts->cparams.dbname)
> > +             {
> > +                     PGconn     *test_conn;
> > +
> > +                     test_conn = ConnectDatabase(db_cell->str, NULL, opts->cparams.pghost,
> > +                                                                             opts->cparams.pgport, opts->cparams.username, TRI_DEFAULT,
> > +                                                                             false, progname, NULL, NULL, NULL, NULL);
> > +                     if (test_conn)
> > +                     {
> > +                             PQfinish(test_conn);
> > +
> > +                             /* Use already created database for connection. */
> > +                             opts->createDB = 0;
> > +                             opts->cparams.dbname = db_cell->str;
> > +                     }
> > +                     else
> > +                     {
> > +                             /* we'll have to create it */
> > +                             opts->createDB = 1;
> > +                             opts->cparams.dbname = connected_db;
> > +                     }
>
> In released versions, "pg_restore --create" fails if the database exists, and
> pg_restore w/o --create fails unless the database exists.  I think we should
> continue that pattern in this new feature.  If not, pg_restore should document
> how it treats pg_dumpall-sourced dumps with the "create if not exists"
> semantics appearing here.

Added one more doc line for this case.

Here, I am attaching a patch. Please let me know feedback.

-- 
Thanks and Regards
Mahendra Singh Thalor
EnterpriseDB: http://www.enterprisedb.com

--000000000000fb67ad063a1d4ef8
Content-Type: application/octet-stream;
	name="v01_db2978-WIP-implement-setNodeValue-function.patch"
Content-Disposition: attachment;
	filename="v01_db2978-WIP-implement-setNodeValue-function.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_md78ho6t0>
X-Attachment-Id: f_md78ho6t0

RnJvbSBmZjliMjgyNTBkYzBjMDE2YjM3NDc3NTM2ZWNlMGIxNGI2ZDA3YzAzIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBNYWhlbmRyYSBTaW5naCBUaGFsb3IgPG1haGk2cnVuQGdtYWls
LmNvbT4KRGF0ZTogV2VkLCA5IEp1bCAyMDI1IDExOjQyOjQ3ICswNTMwClN1YmplY3Q6IFtQQVRD
SF0gaW1wbGVtZW50IHNldE5vZGVWYWx1ZSBmdW5jdGlvbgoKREItMjk3OAotLS0KIGNvbnRyaWIv
ZGJtc194bWxkb20vZGJtc194bWxkb20uYyAgICAgICAgICAgICB8IDU4ICsrKysrKysrKysrKysr
KysrKy0KIGNvbnRyaWIvZGJtc194bWxkb20vZGJtc194bWxkb20uc3FsLmluICAgICAgICB8IDEz
ICsrKysrCiBjb250cmliL2RibXNfeG1sZG9tL2RibXNfeG1sZG9tX3B1YmxpYy5zcWwuaW4gfCAg
MSArCiAzIGZpbGVzIGNoYW5nZWQsIDcxIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRp
ZmYgLS1naXQgYS9jb250cmliL2RibXNfeG1sZG9tL2RibXNfeG1sZG9tLmMgYi9jb250cmliL2Ri
bXNfeG1sZG9tL2RibXNfeG1sZG9tLmMKaW5kZXggZWQ0OTI0NWIwY2IuLmEyOTdkZGNhNmQzIDEw
MDY0NAotLS0gYS9jb250cmliL2RibXNfeG1sZG9tL2RibXNfeG1sZG9tLmMKKysrIGIvY29udHJp
Yi9kYm1zX3htbGRvbS9kYm1zX3htbGRvbS5jCkBAIC00Miw2ICs0Miw3IEBAIFBHX0ZVTkNUSU9O
X0lORk9fVjEoZGJtc194bWxkb21fZnJlZV9kb2N1bWVudCk7CiBQR19GVU5DVElPTl9JTkZPX1Yx
KGRibXNfeG1sZG9tX3NldF92ZXJzaW9uKTsKIFBHX0ZVTkNUSU9OX0lORk9fVjEoZGJtc194bWxk
b21fZ2V0X25vZGVuYW1lKTsKIFBHX0ZVTkNUSU9OX0lORk9fVjEoZGJtc194bWxkb21fZ2V0X25v
ZGV2YWx1ZSk7CitQR19GVU5DVElPTl9JTkZPX1YxKGRibXNfeG1sZG9tX3NldF9ub2RldmFsdWUp
OwogUEdfRlVOQ1RJT05fSU5GT19WMShkYm1zX3htbGRvbV9nZXRfZmlyc3RjaGlsZCk7CiBQR19G
VU5DVElPTl9JTkZPX1YxKGRibXNfeG1sZG9tX2dldF9jaGlsZG5vZGVzKTsKIFBHX0ZVTkNUSU9O
X0lORk9fVjEoZGJtc194bWxkb21fZ2V0X25vZGVsaXN0bGVuZ3RoKTsKQEAgLTQ5LDcgKzUwLDYg
QEAgUEdfRlVOQ1RJT05fSU5GT19WMShkYm1zX3htbGRvbV9nZXRfbm9kZWxpc3RpdGVtKTsKIFBH
X0ZVTkNUSU9OX0lORk9fVjEoZGJtc194bWxkb21fbWFrZV9lbGVtZW50KTsKIFBHX0ZVTkNUSU9O
X0lORk9fVjEoZGJtc194bWxkb21fcmVwbGFjZV9jaGlsZCk7CiBQR19GVU5DVElPTl9JTkZPX1Yx
KGRibXNfeG1sZG9tX3JlbW92ZV9jaGlsZCk7Ci1QR19GVU5DVElPTl9JTkZPX1YxKGRibXNfeG1s
ZG9tX3NldF9ub2RlX3ZhbHVlKTsKIAogCiAvKiBGdW5jdGlvbiBEZWNsYXJhdGlvbnMgKi8KQEAg
LTEyODcsNiArMTI4Nyw2MiBAQCBkYm1zX3htbGRvbV9nZXRfbm9kZXZhbHVlKFBHX0ZVTkNUSU9O
X0FSR1MpCiAJUEdfUkVUVVJOX1ZBUkNIQVJfUChjc3RyaW5nX3RvX3RleHQoKGNoYXIgKikgbm9k
ZXZhbHVlKSk7CiB9CiAKKy8qCisgKiBkYm1zX3htbGRvbV9zZXRfbm9kZXZhbHVlCisgKgorICog
SW1wbGVtZW50cyB0aGUgZnVuY3Rpb25hbGl0eSBvZiBkYm1zX3htbGRvbS5zZXROb2RlVmFsdWUu
CisgKiBzZXRzIHRoZSB2YWx1ZSB0byBET01Ob2RlCisgKi8KK0RhdHVtCitkYm1zX3htbGRvbV9z
ZXRfbm9kZXZhbHVlKFBHX0ZVTkNUSU9OX0FSR1MpCit7CisJY2hhcgkJZG9jSGFzaEtleVtIQVNI
S0VZTEVOXTsKKwl1aW50MzIJCWRvY2lkID0gMDsKKwl1aW50NjQJCW5vZGVpZCA9IDA7CisJRG9j
SW5mb1B0cglkb2NJbmZvID0gTlVMTDsKKwlEb2NOb2RlSW5mb1B0ciBub2RlSW5mbyA9IE5VTEw7
CisJY2hhcgkgICAqbm9kZXZhbHVlID0gTlVMTDsKKwljaGFyICAgICAgICpub2RldmFsdWVudWxs
ID0gTlVMTDsKKworCS8qIElmIG5vZGUgaXMgTlVMTCwgdGhlbiByZXR1cm4uICovCisJaWYgKFBH
X0FSR0lTTlVMTCgwKSkKKwkJUEdfUkVUVVJOX05VTEwoKTsKKworCWlmIChQR19BUkdJU05VTEwo
MSkgfHwgc3RybGVuKHRleHRfdG9fY3N0cmluZyhQR19HRVRBUkdfVEVYVF9QKDEpKSkgPT0gMCkK
KwkJZXJlcG9ydChFUlJPUiwKKwkJCQkoZXJyY29kZShFUlJDT0RFX0lOVkFMSURfUEFSQU1FVEVS
X1ZBTFVFKSwKKwkJCQkgZXJybXNnKCJpbnZhbGlkIHZhbHVlIGZvciBwYXJhbWV0ZXIgXCIlc1wi
IiwgInRhZ05hbWUiKSkpOworCisJbm9kZXZhbHVlID0gdGV4dF90b19jc3RyaW5nKFBHX0dFVEFS
R19URVhUX1AoMSkpOworCisJbWVtY3B5KGRvY0hhc2hLZXksIFZBUkRBVEFfQU5ZKFBHX0dFVEFS
R19URVhUX1AoMCkpLCBIQVNIS0VZTEVOKTsKKwlleHRyYWN0X2lkcyhkb2NIYXNoS2V5LCAmZG9j
aWQsICZub2RlaWQpOworCisJZG9jSW5mbyA9IGdldERvY0luZm8oZG9jaWQpOworCWlmICghZG9j
SW5mbykKKwkJZXJlcG9ydChFUlJPUiwKKwkJCQkoZXJyY29kZShFUlJDT0RFX0lOVkFMSURfUEFS
QU1FVEVSX1ZBTFVFKSwKKwkJCQkgZXJyX3JlZHdvb2Rfc3FsY29kZSgtMzExODEpLAorCQkJCSBl
cnJtc2coImludmFsaWQgdmFsdWUgZm9yIHBhcmFtZXRlciBcIiVzXCIiLCAibiIpKSk7CisKKwlu
b2RlSW5mbyA9CisJCShEb2NOb2RlSW5mb1B0cikgaGFzaF9zZWFyY2goZG9jSW5mby0+bm9kZUlu
Zm8sCisJCQkJCQkJCQkgJm5vZGVpZCwKKwkJCQkJCQkJCSBIQVNIX0ZJTkQsCisJCQkJCQkJCQkg
TlVMTCk7CisKKwlBc3NlcnQobm9kZUluZm8gJiYgbm9kZUluZm8tPm5vZGUpOworCisJLyogTm93
IHNldCBuZXcgdmF1bGUuICovCisvLwl4bWxOb2RlU2V0Q29udGVudCgoeG1sTm9kZVB0cikgbm9k
ZUluZm8tPm5vZGUsIChjb25zdCB4bWxDaGFyICopIG5vZGV2YWx1ZW51bGwpOworLy8JeG1sTm9k
ZUFkZENvbnRlbnQoKHhtbE5vZGVQdHIpIG5vZGVJbmZvLT5ub2RlLCAoY29uc3QgeG1sQ2hhciAq
KSBub2RldmFsdWUpOworCisJeG1sTm9kZVNldE5hbWUoKHhtbE5vZGVQdHIpIG5vZGVJbmZvLT5u
b2RlLCAoY29uc3QgeG1sQ2hhciAqKSBub2RldmFsdWUpOworLy8JeG1sTm9kZVNldENvbnRlbnQo
KHhtbE5vZGVQdHIpIG5vZGVJbmZvLT5ub2RlLCAoY29uc3QgeG1sQ2hhciAqKSBub2RldmFsdWUp
OworCisJUEdfUkVUVVJOX1RFWFRfUChjc3RyaW5nX3RvX3RleHRfd2l0aF9sZW4oZG9jSGFzaEtl
eSwgSEFTSEtFWUxFTikpOworfQorCiAvKgogICogZGJtc194bWxkb21fZ2V0X2ZpcnN0Y2hpbGQK
ICAqCmRpZmYgLS1naXQgYS9jb250cmliL2RibXNfeG1sZG9tL2RibXNfeG1sZG9tLnNxbC5pbiBi
L2NvbnRyaWIvZGJtc194bWxkb20vZGJtc194bWxkb20uc3FsLmluCmluZGV4IDIyMzY2MTJkNzU0
Li4yZWFlOTRlYzY1NiAxMDA2NDQKLS0tIGEvY29udHJpYi9kYm1zX3htbGRvbS9kYm1zX3htbGRv
bS5zcWwuaW4KKysrIGIvY29udHJpYi9kYm1zX3htbGRvbS9kYm1zX3htbGRvbS5zcWwuaW4KQEAg
LTY1LDYgKzY1LDEwIEBAIENSRUFURSBGVU5DVElPTiBkYm1zX3htbGRvbV9nZXROb2RlVmFsdWUo
bm9kZWlkIFJBVykgUkVUVVJOUyBWQVJDSEFSMgogQVMgJyRsaWJkaXIvZGJtc194bWxkb20nLCAn
ZGJtc194bWxkb21fZ2V0X25vZGV2YWx1ZScKIExBTkdVQUdFIEMgSU1NVVRBQkxFIFBBUkFMTEVM
IFNBRkU7CiAKK0NSRUFURSBGVU5DVElPTiBkYm1zX3htbGRvbV9zZXROb2RlVmFsdWUobm9kZWlk
IFJBVywgbmFtZSBJTiBWQVJDSEFSMikgUkVUVVJOUyBSQVcKK0FTICckbGliZGlyL2RibXNfeG1s
ZG9tJywgJ2RibXNfeG1sZG9tX3NldF9ub2RldmFsdWUnCitMQU5HVUFHRSBDIElNTVVUQUJMRSBQ
QVJBTExFTCBTQUZFOworCiBDUkVBVEUgRlVOQ1RJT04gZGJtc194bWxkb21fZ2V0Rmlyc3RDaGls
ZChub2RlaWQgUkFXKSBSRVRVUk5TIFJBVwogQVMgJyRsaWJkaXIvZGJtc194bWxkb20nLCAnZGJt
c194bWxkb21fZ2V0X2ZpcnN0Y2hpbGQnCiBMQU5HVUFHRSBDIElNTVVUQUJMRSBQQVJBTExFTCBT
QUZFOwpAQCAtMTQ1LDYgKzE0OSwxNCBAQCBDUkVBVEUgT1IgUkVQTEFDRSBQQUNLQUdFIEJPRFkg
ZGJtc194bWxkb20gSVMKIAkJcmV0dXJuIGRibXNfeG1sZG9tX2dldE5vZGVWYWx1ZShuLmlkKTsK
IAlFTkQ7CiAKKwlGVU5DVElPTiBzZXROb2RlVmFsdWUobiBkb21ub2RlLCBuYW1lIElOIFZBUkNI
QVIyKSBSRVRVUk4gRE9NTm9kZSBTRVQgc2VhcmNoX3BhdGggPSBwZ19jYXRhbG9nLCBwZ190ZW1w
IElTCisJREVDTEFSRQorCQlub2RlIERPTU5vZGU7CisJQkVHSU4KKwkJbi5pZCA9IGRibXNfeG1s
ZG9tX3NldE5vZGVWYWx1ZShuLmlkLCBuYW1lKTsKKwkJcmV0dXJuIG5vZGU7CisJRU5EOworCiAJ
RlVOQ1RJT04gZ2V0Rmlyc3RDaGlsZChuIERPTU5vZGUpIFJFVFVSTiBET01Ob2RlIFNFVCBzZWFy
Y2hfcGF0aCA9IHBnX2NhdGFsb2csIHBnX3RlbXAgSVMKIAlERUNMQVJFCiAJCW5vZGUgRE9NTm9k
ZTsKQEAgLTE5OSw2ICsyMTEsNyBAQCBDUkVBVEUgT1IgUkVQTEFDRSBQQUNLQUdFIEJPRFkgZGJt
c194bWxkb20gSVMKICAgICAgICAgcmV0dXJuIG5vZGU7CiAgICAgRU5EOwogCisKIAlGVU5DVElP
TiBjcmVhdGVFbGVtZW50KGRvYyBET01Eb2N1bWVudCwgdGFnTmFtZSBJTiBWQVJDSEFSMikgUkVU
VVJOIERPTUVsZW1lbnQgU0VUIHNlYXJjaF9wYXRoID0gcGdfY2F0YWxvZywgcGdfdGVtcCBJUwog
CURFQ0xBUkUKIAkJbm9kZSBET01FbGVtZW50OwpkaWZmIC0tZ2l0IGEvY29udHJpYi9kYm1zX3ht
bGRvbS9kYm1zX3htbGRvbV9wdWJsaWMuc3FsLmluIGIvY29udHJpYi9kYm1zX3htbGRvbS9kYm1z
X3htbGRvbV9wdWJsaWMuc3FsLmluCmluZGV4IGI3YjE2ODZlMWZlLi44ZmQyNDYzMzk0ZCAxMDA2
NDQKLS0tIGEvY29udHJpYi9kYm1zX3htbGRvbS9kYm1zX3htbGRvbV9wdWJsaWMuc3FsLmluCisr
KyBiL2NvbnRyaWIvZGJtc194bWxkb20vZGJtc194bWxkb21fcHVibGljLnNxbC5pbgpAQCAtMzIs
NiArMzIsNyBAQCBDUkVBVEUgT1IgUkVQTEFDRSBQQUNLQUdFIGRibXNfeG1sZG9tIEFVVEhJRCBD
VVJSRU5UX1VTRVIgQVMKIAogCUZVTkNUSU9OIGdldE5vZGVOYW1lKG4gRE9NTm9kZSkgUkVUVVJO
IFZBUkNIQVIyOwogCUZVTkNUSU9OIGdldE5vZGVWYWx1ZShuIGRvbW5vZGUpIFJFVFVSTiBWQVJD
SEFSMjsKKwlGVU5DVElPTiBzZXROb2RlVmFsdWUobiBkb21ub2RlLCBuYW1lIElOIFZBUkNIQVIy
KSBSRVRVUk4gRE9NTm9kZTsKIAlGVU5DVElPTiBnZXRGaXJzdENoaWxkKG4gRE9NTm9kZSkgUkVU
VVJOIERPTU5vZGU7CiAJRlVOQ1RJT04gZ2V0Q2hpbGROb2RlcyhuIERPTU5vZGUpIFJFVFVSTiBE
T01Ob2RlTGlzdDsKIAlGVU5DVElPTiBhcHBlbmRDaGlsZChuIERPTU5vZGUsIG5ld0NoaWxkIElO
IERPTU5vZGUpIFJFVFVSTiBET01Ob2RlOwotLSAKMi4zOS4zCgo=
--000000000000fb67ad063a1d4ef8--