Content-Type: multipart/alternative;
 boundary="------------GeY0zm7sxlGoHnWJ5UV00IT0"
Message-ID: <966de369-0109-42df-b250-42240ec20910@dunslane.net>
Date: Tue, 15 Apr 2025 07:17:51 -0400
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: pgsql: Non text modes for pg_dumpall, correspondingly change
 pg_restore
To: Mahendra Singh Thalor <mahi6run@gmail.com>
Cc: =?UTF-8?Q?=C3=81lvaro_Herrera?= <alvherre@kurilemu.de>,
 pgsql-hackers@lists.postgresql.org
References: <202504141220.343fmoxfsbj4@alvherre.pgsql>
 <6e0e57e5-ace5-4d18-b1c1-7a3b3da36316@dunslane.net>
 <17b357f9-7a99-4db2-87aa-a16679b52757@dunslane.net>
 <CAKYtNAqPQJEGc5GSKiBEnCBCx1witrRauZ=2i0M4Fm4Rmug4_Q@mail.gmail.com>
From: Andrew Dunstan <andrew@dunslane.net>
Content-Language: en-US
Autocrypt: addr=andrew@dunslane.net; keydata=
 xsBNBE7KWFkBCAClridxur2AIc7eW2AR7izbfp3EnNefie2HbLF0izW5Ik5UjX2HBXBx4syI
 gY6b0ugohXrr274+baoAlvSbq6cAoQuEVrk5IZFzt20b1Xkx65FwGSEj526yiKLocqkJceSq
 Xr9xcA5SGY+FZv441chh5SU92v4q6z+6LPpoHOh97ptAVXZYNTtU0LevyvD5lja0TzbvJm6C
 eFXitJfnm1pLEr0DGJCR/iUOl/N62Kh4855zZC7NHIjQHPOvV5Stz/l5ilDhvGVk+xkXFPys
 SjZoUr1rXhYLpiyi5sR0X9FHXT0KnGuz1F5ERO7ZTLSSQ6fJwPj6gOk9K+vvoKvoeql5ABEB
 AAHNJEFuZHJldyBEdW5zdGFuIDxhbmRyZXdAZHVuc2xhbmUubmV0PsLAmwQTAQgARQIbAwIX
 gAIZAQULCQgHAgMiAgEGFQoJCAsCBBYCAwECHgcWIQTkPlhGHfx8v0RpFaWZ+n/LWfw7gQUC
 ZFlxxwUJGVGAbgAKCRCZ+n/LWfw7gXikB/9ZdcUy6CTBFIIuL/bVsc1eLEW/gJBjJBF6HxNY
 xgEkAgXAp4Lg4A5U+QB9GouFr7+GYxF0BU4hzoGhNPUWltxnHdMWP8nC/38LAqgMi8L/bbsm
 HW5YPBdWYaAZAPJQVfOAgjTbRUb26KSprpyrrJKW0ZmrZfjhNPcQ72jpWzoPLQqx2X6B0fru
 1jq+cBh8lb6r1mJTim1T3JIn+F/v5VpdQS+EL8xqsHkfzKjIPsW3CIXpkypSk6saA55Rkkbl
 26AW8ftPVB0Q6Lnn6FLt9CP0MGNixBQ55yq8r1K+nCBvCCjvQjM8RDm0UUum0WNl+ifQgTLO
 E8TWEnwVtkBf+3QWzsBNBE7KWFkBCADRnOM0FCzsYW6jtncg+dWIagjUZpvaClmqn/sJluLa
 Q3v1VXMQJzYs3eC1gh386W+XBwLRpDj3jzH81lX+p73Re3d3oJW7X+ffsxuzu5ZVdMUkqBYo
 nkAbKxr6gyJ12F/+JkUVzLcoTN+d/7YsQvUVi7NaKH8mJgjz112O4fUe3p9wfAaFa0RXHc5S
 GPzRTYRRlv/XZBIho4J2tkZOnteZJZ+GbxQVlINt6fd8P6al3MWOvpP/ExJPguEfjOsO6Njy
 xjo3WfpD4lHMOR/Oc3/8mScEF84rF2jXbsFgelWnbPWAvXY+pD0dXOFRkagGmC/viwBDqq5b
 5tk76kKmUbZxABEBAAHCwHwEGAEIACYCGwwWIQTkPlhGHfx8v0RpFaWZ+n/LWfw7gQUCZFlx
 5wUJGVGAjgAKCRCZ+n/LWfw7gf+iB/4g8CPY5jihf5r/8EsoIGe2H+dpVmpPF8YGBzTIvCz/
 fQoOq8AX/pE76QEuFnFZWfjw+wgBXgCVmkox2Eflkk6z4ND3pcwGZ6CfCxTQCDk/dij+2DQ4
 6bmDCy/sBgcbz9mTpoLC11HLoPae6YN9nBNQRZDcEFEu54OaVOqlIdbA6m+POIBCXZdHOFc0
 WoDTgxHRzC1jgQNidyd6tKqcsVJs0dzF0oKTmFFmUAqTdJO12LBuNA1rlqrR3EtpYk8B/wtS
 5dIMD7Q8hwQpL+4C6GNpb6ZKnPkLi47pDOLhz2qBrqN+rqUEsT3YnExYpzj5yOBi+FlmV1Hw
 49QYe1sn2ZPs
In-Reply-To: 
 <CAKYtNAqPQJEGc5GSKiBEnCBCx1witrRauZ=2i0M4Fm4Rmug4_Q@mail.gmail.com>
Archived-At: 
 <https://www.postgresql.org/message-id/966de369-0109-42df-b250-42240ec20910%40dunslane.net>
Precedence: bulk

This is a multi-part message in MIME format.
--------------GeY0zm7sxlGoHnWJ5UV00IT0
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit


On 2025-04-14 Mo 6:55 PM, Mahendra Singh Thalor wrote:
>
>
>     --- a/src/bin/pg_dump/pg_restore.c
>     +++ b/src/bin/pg_dump/pg_restore.c
>     @@ -1053,15 +1053,19 @@ get_dbname_oid_list_from_mfile(const char
>     *dumpdirpath, SimpleOidStringList *dbn
>             while ((fgets(line, MAXPGPATH, pfile)) != NULL)
>             {
>                     Oid                     db_oid = InvalidOid;
>     -               char            db_oid_str[MAXPGPATH + 1] = "";
>                     char       *dbname;
>     +               char            *p = line;
>
>                     /* Extract dboid. */
>                     sscanf(line, "%u", &db_oid);
>     -               sscanf(line, "%20s", db_oid_str);
>     +
>     +               while(isdigit(*p))
>     +                       p++;
>     +
>     +               Assert(*p == ' ');
>
>                     /* dbname is the rest of the line */
>     -               dbname = line + strlen(db_oid_str) + 1;
>     +               dbname = ++p;
>
>                     /* Remove \n from dbname. */
>                     dbname[strlen(dbname) - 1] = '\0';
>
>

I don't think an Assert is the right thing here. It's for things that 
should not be possible, and won't trigger anything in a non-assertion 
build. This condition should cause a pg_fatal().


cheers


andrew


--
Andrew Dunstan
EDB:https://www.enterprisedb.com

--------------GeY0zm7sxlGoHnWJ5UV00IT0
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!DOCTYPE html>
<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  </head>
  <body>
    <p><br>
    </p>
    <div class="moz-cite-prefix">On 2025-04-14 Mo 6:55 PM, Mahendra
      Singh Thalor wrote:<br>
    </div>
    <blockquote type="cite"
cite="mid:CAKYtNAqPQJEGc5GSKiBEnCBCx1witrRauZ=2i0M4Fm4Rmug4_Q@mail.gmail.com">
      <meta http-equiv="content-type" content="text/html; charset=UTF-8">
      <div dir="ltr"><br>
        <div><br>
        </div>
        <div>
          <blockquote class="gmail_quote"
style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">---
            a/src/bin/pg_dump/pg_restore.c<br>
            +++ b/src/bin/pg_dump/pg_restore.c<br>
            @@ -1053,15 +1053,19 @@ get_dbname_oid_list_from_mfile(const
            char *dumpdirpath, SimpleOidStringList *dbn<br>
                    while ((fgets(line, MAXPGPATH, pfile)) != NULL)<br>
                    {<br>
                            Oid                     db_oid = InvalidOid;<br>
            -               char            db_oid_str[MAXPGPATH + 1] =
            "";<br>
                            char       *dbname;<br>
            +               char            *p = line;<br>
             <br>
                            /* Extract dboid. */<br>
                            sscanf(line, "%u", &amp;db_oid);<br>
            -               sscanf(line, "%20s", db_oid_str);<br>
            +<br>
            +               while(isdigit(*p))<br>
            +                       p++;<br>
            +<br>
            +               Assert(*p == ' ');<br>
             <br>
                            /* dbname is the rest of the line */<br>
            -               dbname = line + strlen(db_oid_str) + 1;<br>
            +               dbname = ++p;<br>
             <br>
                            /* Remove \n from dbname. */<br>
                            dbname[strlen(dbname) - 1] = '\0';<br>
          </blockquote>
          <br>
        </div>
      </div>
    </blockquote>
    <p><br>
    </p>
    <p>I don't think an Assert is the right thing here. It's for things
      that should not be possible, and won't trigger anything in a
      non-assertion build. This condition should cause a pg_fatal().</p>
    <p><br>
    </p>
    <p>cheers</p>
    <p><br>
    </p>
    <p>andrew<br>
    </p>
    <p><br>
    </p>
    <pre class="moz-signature"
    signature-switch-id="d0437855-2267-4610-80b3-83167ec45b0b" cols="72">--
Andrew Dunstan
EDB: <a class="moz-txt-link-freetext" href="https://www.enterprisedb.com">https://www.enterprisedb.com</a>
</pre>
  </body>
</html>

--------------GeY0zm7sxlGoHnWJ5UV00IT0--