pg.ddx.io  pgsql-committers@postgresql.org mailing list archive  
help / color / mirror / Atom feed
pgsql: psql backward compatibility fix  For servers older than 8.3, sort
17+ messages / 6 participants
[nested] [flat]

Commits from this thread:
  2019-10-25 c114229ca2  Revert part of commit dddf4cdc3.
* pgsql: psql backward compatibility fix  For servers older than 8.3, sort
@ 2009-07-07 20:32 Peter Eisentraut <petere@postgresql.org>
  0 siblings, 0 replies; 17+ messages in thread

From: petere@postgresql.org @ 2009-07-07 20:32 UTC (permalink / raw)
  To: pgsql-committers

Log Message:
-----------
psql backward compatibility fix

For servers older than 8.3, sort display of child tables by relname instead
of oid::regclass::text, because the cast from regclass to text did not work
back then.  The older display may be slightly worse when different schemas
are involved, but that should be rare enough.

Modified Files:
--------------
    pgsql/src/bin/psql:
        describe.c (r1.222 -> r1.223)
        (http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/bin/psql/describe.c?r1=1.222&r2=1.223)




^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* pgsql: Make the order of the header file includes consistent in contrib
@ 2019-10-24 02:46 Amit Kapila <akapila@postgresql.org>
  0 siblings, 0 replies; 17+ messages in thread

From: Amit Kapila @ 2019-10-24 02:46 UTC (permalink / raw)
  To: pgsql-committers@lists.postgresql.org

Make the order of the header file includes consistent in contrib modules.

The basic rule we follow here is to always first include 'postgres.h' or
'postgres_fe.h' whichever is applicable, then system header includes and
then Postgres header includes.  In this, we also follow that all the
Postgres header includes are in order based on their ASCII value.  We
generally follow these rules, but the code has deviated in many places.
This commit makes it consistent just for contrib modules.  The later
commits will enforce similar rules in other parts of code.

Author: Vignesh C
Reviewed-by: Amit Kapila
Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/7e735035f208418f31b91846ae3e8a381edb3af3

Modified Files
--------------
contrib/bloom/blcost.c                    |  3 +--
contrib/bloom/blinsert.c                  |  3 +--
contrib/bloom/blscan.c                    |  5 ++---
contrib/bloom/blutils.c                   | 10 ++++------
contrib/bloom/blvalidate.c                |  3 +--
contrib/btree_gin/btree_gin.c             |  2 +-
contrib/btree_gist/btree_enum.c           |  4 ++--
contrib/btree_gist/btree_inet.c           |  2 +-
contrib/btree_gist/btree_numeric.c        |  3 +--
contrib/btree_gist/btree_utils_var.c      |  5 ++---
contrib/cube/cube.c                       |  3 +--
contrib/dblink/dblink.c                   |  3 +--
contrib/hstore/hstore_gist.c              |  3 +--
contrib/hstore/hstore_io.c                |  3 +--
contrib/hstore/hstore_op.c                |  3 +--
contrib/hstore_plpython/hstore_plpython.c |  4 ++--
contrib/intarray/_int_bool.c              |  3 +--
contrib/intarray/_int_gin.c               |  3 +--
contrib/intarray/_int_gist.c              |  3 +--
contrib/intarray/_int_op.c                |  1 -
contrib/intarray/_int_selfuncs.c          |  6 +++---
contrib/intarray/_int_tool.c              |  4 +---
contrib/intarray/_intbig_gist.c           |  3 +--
contrib/isn/isn.c                         |  7 +++----
contrib/jsonb_plperl/jsonb_plperl.c       |  2 +-
contrib/jsonb_plpython/jsonb_plpython.c   |  4 ++--
contrib/ltree/_ltree_gist.c               |  4 +---
contrib/ltree/crc32.c                     |  2 +-
contrib/ltree/lquery_op.c                 |  2 +-
contrib/ltree/ltree_io.c                  |  2 +-
contrib/ltree/ltree_op.c                  |  2 +-
contrib/ltree_plpython/ltree_plpython.c   |  2 +-
contrib/oid2name/oid2name.c               |  4 +---
contrib/pageinspect/brinfuncs.c           |  8 +++-----
contrib/pageinspect/btreefuncs.c          |  4 +---
contrib/pageinspect/fsmfuncs.c            |  3 +--
contrib/pageinspect/ginfuncs.c            |  3 +--
contrib/pageinspect/hashfuncs.c           |  5 ++---
contrib/pageinspect/heapfuncs.c           |  5 ++---
contrib/pageinspect/rawpage.c             |  3 +--
contrib/passwordcheck/passwordcheck.c     |  2 +-
contrib/pg_standby/pg_standby.c           |  3 +--
contrib/pg_trgm/trgm_gin.c                |  4 +---
contrib/pg_trgm/trgm_gist.c               |  4 +---
contrib/pg_trgm/trgm_op.c                 |  3 +--
contrib/pg_trgm/trgm_regexp.c             |  4 +---
contrib/pgcrypto/crypt-md5.c              |  2 +-
contrib/pgcrypto/internal.c               |  6 +++---
contrib/pgcrypto/mbuf.c                   |  2 +-
contrib/pgcrypto/openssl.c                |  3 +--
contrib/pgcrypto/pgcrypto.c               |  7 +++----
contrib/pgcrypto/pgp-armor.c              |  2 +-
contrib/pgcrypto/pgp-cfb.c                |  2 +-
contrib/pgcrypto/pgp-compress.c           |  3 +--
contrib/pgcrypto/pgp-decrypt.c            |  2 +-
contrib/pgcrypto/pgp-encrypt.c            |  3 +--
contrib/pgcrypto/pgp-info.c               |  2 +-
contrib/pgcrypto/pgp-mpi-internal.c       |  3 +--
contrib/pgcrypto/pgp-mpi-openssl.c        |  2 +-
contrib/pgcrypto/pgp-mpi.c                |  2 +-
contrib/pgcrypto/pgp-pgsql.c              | 11 +++++------
contrib/pgcrypto/pgp-pubdec.c             |  2 +-
contrib/pgcrypto/pgp-pubenc.c             |  2 +-
contrib/pgcrypto/pgp-pubkey.c             |  2 +-
contrib/pgcrypto/pgp-s2k.c                |  3 +--
contrib/pgcrypto/pgp.c                    |  2 +-
contrib/pgcrypto/px-crypt.c               |  3 +--
contrib/pgstattuple/pgstatapprox.c        |  6 +++---
contrib/postgres_fdw/connection.c         |  4 +---
contrib/postgres_fdw/deparse.c            |  4 +---
contrib/postgres_fdw/option.c             |  4 +---
contrib/postgres_fdw/postgres_fdw.c       |  3 +--
contrib/postgres_fdw/shippable.c          |  4 +---
contrib/sepgsql/database.c                |  4 ++--
contrib/sepgsql/dml.c                     |  5 ++---
contrib/sepgsql/hooks.c                   |  3 +--
contrib/sepgsql/label.c                   |  5 ++---
contrib/sepgsql/proc.c                    |  3 +--
contrib/sepgsql/relation.c                |  7 +++----
contrib/sepgsql/schema.c                  |  3 +--
contrib/sepgsql/uavc.c                    |  3 +--
contrib/spi/moddatetime.c                 |  2 +-
contrib/tablefunc/tablefunc.c             |  3 +--
contrib/tcn/tcn.c                         |  2 +-
contrib/vacuumlo/vacuumlo.c               |  3 +--
85 files changed, 115 insertions(+), 183 deletions(-)



^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* pgsql: Make the order of the header file includes consistent in non-bac
@ 2019-10-25 02:24 Amit Kapila <akapila@postgresql.org>
  2019-10-25 03:17 ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
  0 siblings, 1 reply; 17+ messages in thread

From: Amit Kapila @ 2019-10-25 02:24 UTC (permalink / raw)
  To: pgsql-committers@lists.postgresql.org

Make the order of the header file includes consistent in non-backend modules.

Similar to commit 7e735035f2, this commit makes the order of header file
inclusion consistent for non-backend modules.

In passing, fix the case where we were using angle brackets (<>) for the
local module includes instead of quotes ("").

Author: Vignesh C
Reviewed-by: Amit Kapila
Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/dddf4cdc3300073ec04b2c3e482a4c1fa4b8191b

Modified Files
--------------
src/bin/pg_archivecleanup/pg_archivecleanup.c           |  6 ++----
src/bin/pg_basebackup/pg_basebackup.c                   |  2 +-
src/bin/pg_basebackup/pg_receivewal.c                   |  6 ++----
src/bin/pg_basebackup/pg_recvlogical.c                  |  7 ++-----
src/bin/pg_basebackup/receivelog.c                      |  9 +++------
src/bin/pg_basebackup/streamutil.c                      |  6 ++----
src/bin/pg_basebackup/walmethods.c                      |  3 +--
src/bin/pg_config/pg_config.c                           |  2 +-
src/bin/pg_controldata/pg_controldata.c                 |  3 +--
src/bin/pg_dump/common.c                                |  8 +++-----
src/bin/pg_dump/parallel.c                              |  3 +--
src/bin/pg_dump/pg_backup_archiver.c                    |  7 +++----
src/bin/pg_dump/pg_backup_custom.c                      |  3 +--
src/bin/pg_dump/pg_backup_db.c                          | 16 +++++++---------
src/bin/pg_dump/pg_backup_directory.c                   |  8 ++++----
src/bin/pg_dump/pg_backup_null.c                        |  5 ++---
src/bin/pg_dump/pg_backup_tar.c                         | 14 +++++++-------
src/bin/pg_dump/pg_dump.c                               | 13 +++++--------
src/bin/pg_dump/pg_dump_sort.c                          |  3 +--
src/bin/pg_dump/pg_dumpall.c                            |  7 +++----
src/bin/pg_dump/pg_restore.c                            |  4 +---
src/bin/pg_resetwal/pg_resetwal.c                       |  7 +++----
src/bin/pg_rewind/datapagemap.c                         |  3 +--
src/bin/pg_rewind/fetch.c                               |  2 +-
src/bin/pg_rewind/filemap.c                             |  5 ++---
src/bin/pg_rewind/libpq_fetch.c                         |  7 +++----
src/bin/pg_rewind/parsexlog.c                           |  6 ++----
src/bin/pg_rewind/pg_rewind.c                           |  9 ++++-----
src/bin/pg_rewind/timeline.c                            |  3 +--
src/bin/pg_test_fsync/pg_test_fsync.c                   |  3 +--
src/bin/pg_upgrade/check.c                              |  1 -
src/bin/pg_upgrade/controldata.c                        |  4 ++--
src/bin/pg_upgrade/dump.c                               |  4 +---
src/bin/pg_upgrade/file.c                               | 13 ++++++-------
src/bin/pg_upgrade/function.c                           |  4 +---
src/bin/pg_upgrade/info.c                               |  4 +---
src/bin/pg_upgrade/option.c                             |  6 ++----
src/bin/pg_upgrade/parallel.c                           |  1 -
src/bin/pg_upgrade/pg_upgrade.c                         | 10 +++++-----
src/bin/pg_upgrade/relfilenode.c                        |  7 +++----
src/bin/pg_upgrade/server.c                             |  1 -
src/bin/pg_upgrade/util.c                               |  5 ++---
src/bin/pg_upgrade/version.c                            |  5 +----
src/bin/pg_waldump/compat.c                             |  2 +-
src/bin/pg_waldump/pg_waldump.c                         |  3 +--
src/bin/pgbench/pgbench.c                               | 15 ++++++++-------
src/bin/psql/common.c                                   | 10 ++++------
src/bin/psql/copy.c                                     | 10 ++++------
src/bin/psql/crosstabview.c                             |  3 +--
src/bin/psql/describe.c                                 |  7 ++-----
src/bin/psql/help.c                                     |  3 +--
src/bin/psql/input.c                                    |  5 ++---
src/bin/psql/large_obj.c                                |  5 ++---
src/bin/psql/mainloop.c                                 |  8 +++-----
src/bin/psql/prompt.c                                   |  3 +--
src/bin/psql/startup.c                                  | 10 +++-------
src/bin/psql/variables.c                                |  4 +---
src/common/f2s.c                                        |  3 +--
src/fe_utils/print.c                                    |  4 +---
src/fe_utils/recovery_gen.c                             |  3 +--
src/fe_utils/string_utils.c                             |  4 +---
src/interfaces/ecpg/compatlib/informix.c                | 16 ++++++++--------
src/interfaces/ecpg/ecpglib/connect.c                   |  4 ++--
src/interfaces/ecpg/ecpglib/data.c                      | 10 +++++-----
src/interfaces/ecpg/ecpglib/descriptor.c                |  5 ++---
src/interfaces/ecpg/ecpglib/error.c                     |  2 +-
src/interfaces/ecpg/ecpglib/execute.c                   | 17 ++++++++---------
src/interfaces/ecpg/ecpglib/memory.c                    |  4 ++--
src/interfaces/ecpg/ecpglib/misc.c                      | 11 ++++++-----
src/interfaces/ecpg/ecpglib/prepare.c                   |  4 ++--
src/interfaces/ecpg/ecpglib/sqlda.c                     |  9 ++++-----
src/interfaces/ecpg/ecpglib/typename.c                  |  5 ++---
src/interfaces/ecpg/pgtypeslib/common.c                 |  2 +-
src/interfaces/ecpg/pgtypeslib/datetime.c               |  4 ++--
src/interfaces/ecpg/pgtypeslib/dt_common.c              |  2 +-
src/interfaces/ecpg/pgtypeslib/interval.c               |  4 ++--
src/interfaces/ecpg/pgtypeslib/numeric.c                |  5 +++--
src/interfaces/ecpg/pgtypeslib/timestamp.c              |  5 ++---
src/interfaces/ecpg/preproc/c_keywords.c                |  5 ++---
src/interfaces/ecpg/preproc/ecpg_keywords.c             |  5 ++---
src/interfaces/libpq/fe-auth.c                          |  3 +--
src/interfaces/libpq/fe-connect.c                       | 16 +++++++---------
src/interfaces/libpq/fe-exec.c                          |  9 ++++-----
src/interfaces/libpq/fe-misc.c                          |  3 +--
src/interfaces/libpq/fe-protocol2.c                     |  8 +++-----
src/interfaces/libpq/fe-protocol3.c                     | 10 ++++------
src/interfaces/libpq/fe-secure-gssapi.c                 |  2 +-
src/interfaces/libpq/fe-secure.c                        |  8 ++++----
src/pl/plpgsql/src/pl_comp.c                            |  4 +---
src/pl/plpgsql/src/pl_exec.c                            |  4 +---
src/pl/plpgsql/src/pl_funcs.c                           |  4 +---
src/pl/plpgsql/src/pl_handler.c                         |  4 +---
src/port/pg_crc32c_armv8.c                              |  4 ++--
src/port/pg_crc32c_sse42.c                              |  4 ++--
src/port/tar.c                                          |  4 +++-
src/test/isolation/isolationtester.c                    |  5 ++---
.../modules/test_ginpostinglist/test_ginpostinglist.c   |  2 +-
src/test/modules/test_integerset/test_integerset.c      |  6 +++---
src/test/modules/test_rls_hooks/test_rls_hooks.c        |  7 ++-----
src/test/modules/test_shm_mq/setup.c                    |  3 +--
src/test/regress/pg_regress.c                           |  3 +--
src/test/regress/regress.c                              |  3 +--
102 files changed, 237 insertions(+), 345 deletions(-)



^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* Re: pgsql: Make the order of the header file includes consistent in non-bac
  2019-10-25 02:24 pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <akapila@postgresql.org>
@ 2019-10-25 03:17 ` Michael Paquier <michael@paquier.xyz>
  2019-10-25 03:24   ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  0 siblings, 1 reply; 17+ messages in thread

From: Michael Paquier @ 2019-10-25 03:17 UTC (permalink / raw)
  To: Amit Kapila <akapila@postgresql.org>; +Cc: pgsql-committers@lists.postgresql.org

Hi Amit,

On Fri, Oct 25, 2019 at 02:24:50AM +0000, Amit Kapila wrote:
> Make the order of the header file includes consistent in non-backend modules.
> 
> Similar to commit 7e735035f2, this commit makes the order of header file
> inclusion consistent for non-backend modules.
> 
> In passing, fix the case where we were using angle brackets (<>) for the
> local module includes instead of quotes ("").

locust has just reported a build failure here:
https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=locust&dt=2019-10-25%2002%3A58%3A55

And the cause is visibly this portion of the commit:
inline patch 1: src/interfaces/ecpg/pgtypeslib/dt_common.c (+1/-2 lines) download inline-1.patch--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c +++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c @@ -7,9 +7,9 @@ #include <math.h> #include "common/string.h" -#include "pgtypeslib_extern.h" #include "dt.h" #include "pgtypes_timestamp.h" +#include "pgtypeslib_extern.h" --
Michael Attachments: signature.asc (application/pgp-signature, 832B) download ^ permalink raw reply [nested|flat] 17+ messages in thread

* Re: pgsql: Make the order of the header file includes consistent in non-bac
  2019-10-25 02:24 pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <akapila@postgresql.org>
  2019-10-25 03:17 ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
@ 2019-10-25 03:24   ` Amit Kapila <amit.kapila16@gmail.com>
  2019-10-25 04:02     ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  0 siblings, 1 reply; 17+ messages in thread

From: Amit Kapila @ 2019-10-25 03:24 UTC (permalink / raw)
  To: Michael Paquier <michael@paquier.xyz>; +Cc: Amit Kapila <akapila@postgresql.org>; pgsql-committers@lists.postgresql.org

On Fri, Oct 25, 2019 at 8:47 AM Michael Paquier <michael@paquier.xyz> wrote:
>
> Hi Amit,
>
> On Fri, Oct 25, 2019 at 02:24:50AM +0000, Amit Kapila wrote:
> > Make the order of the header file includes consistent in non-backend modules.
> >
> > Similar to commit 7e735035f2, this commit makes the order of header file
> > inclusion consistent for non-backend modules.
> >
> > In passing, fix the case where we were using angle brackets (<>) for the
> > local module includes instead of quotes ("").
>
> locust has just reported a build failure here:
> https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=locust&dt=2019-10-25%2002%3A58%3A55
>

Yeah, I have noticed that and working on it.

> And the cause is visibly this portion of the commit:
> --- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
> +++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
> @@ -7,9 +7,9 @@
>  #include <math.h>
>
>  #include "common/string.h"
> -#include "pgtypeslib_extern.h"
>  #include "dt.h"
>  #include "pgtypes_timestamp.h"
> +#include "pgtypeslib_extern.h"

Right, but trying to see why it hasn't failed on other machines and in
my local build.

-- 
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com





^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* Re: pgsql: Make the order of the header file includes consistent in non-bac
  2019-10-25 02:24 pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <akapila@postgresql.org>
  2019-10-25 03:17 ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
  2019-10-25 03:24   ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
@ 2019-10-25 04:02     ` Amit Kapila <amit.kapila16@gmail.com>
  2019-10-25 04:47       ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  2019-10-25 06:17       ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
  2019-10-25 08:00       ` Re: pgsql: Make the order of the header file includes consistent in non-bac Andrew Gierth <andrew@tao11.riddles.org.uk>
  0 siblings, 3 replies; 17+ messages in thread

From: Amit Kapila @ 2019-10-25 04:02 UTC (permalink / raw)
  To: Michael Paquier <michael@paquier.xyz>; +Cc: Amit Kapila <akapila@postgresql.org>; pgsql-committers@lists.postgresql.org

On Fri, Oct 25, 2019 at 8:54 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
>
> On Fri, Oct 25, 2019 at 8:47 AM Michael Paquier <michael@paquier.xyz> wrote:
> >
> > Hi Amit,
> >
> > On Fri, Oct 25, 2019 at 02:24:50AM +0000, Amit Kapila wrote:
> > > Make the order of the header file includes consistent in non-backend modules.
> > >
> > > Similar to commit 7e735035f2, this commit makes the order of header file
> > > inclusion consistent for non-backend modules.
> > >
> > > In passing, fix the case where we were using angle brackets (<>) for the
> > > local module includes instead of quotes ("").
> >
> > locust has just reported a build failure here:
> > https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=locust&dt=2019-10-25%2002%3A58%3A55
> >
>
> Yeah, I have noticed that and working on it.
>
> > And the cause is visibly this portion of the commit:
> > --- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
> > +++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
> > @@ -7,9 +7,9 @@
> >  #include <math.h>
> >
> >  #include "common/string.h"
> > -#include "pgtypeslib_extern.h"
> >  #include "dt.h"
> >  #include "pgtypes_timestamp.h"
> > +#include "pgtypeslib_extern.h"
>
> Right, but trying to see why it hasn't failed on other machines and in
> my local build.
>

One possible reason could be that pgtypeslib_extern.h has define like below:
#ifndef bool
#define bool char
#endif /* ndef bool */

It is possible that all the functions that have bool has a parameter
in dt_common.c treat it as 'char' where as the declaration of same
functions in dt.h doesn't consider bool as char because now
pgtypeslib_extern.h is included after dt.h.  It seems that the
platforms where it failed doesn't have bool defined.  What do you
think?  I think we can revert the change in that file.

BTW, prairiedog is also show similar failure and both seems to have
similar OS except for versions.

-- 
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com





^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* Re: pgsql: Make the order of the header file includes consistent in non-bac
  2019-10-25 02:24 pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <akapila@postgresql.org>
  2019-10-25 03:17 ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
  2019-10-25 03:24   ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  2019-10-25 04:02     ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
@ 2019-10-25 04:47       ` Amit Kapila <amit.kapila16@gmail.com>
  2 siblings, 0 replies; 17+ messages in thread

From: Amit Kapila @ 2019-10-25 04:47 UTC (permalink / raw)
  To: Michael Paquier <michael@paquier.xyz>; +Cc: Amit Kapila <akapila@postgresql.org>; pgsql-committers@lists.postgresql.org

On Fri, Oct 25, 2019 at 9:32 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
>
> On Fri, Oct 25, 2019 at 8:54 AM Amit Kapila <amit.kapila16@gmail.com> wrote:
> >
> > > And the cause is visibly this portion of the commit:
> > > --- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
> > > +++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
> > > @@ -7,9 +7,9 @@
> > >  #include <math.h>
> > >
> > >  #include "common/string.h"
> > > -#include "pgtypeslib_extern.h"
> > >  #include "dt.h"
> > >  #include "pgtypes_timestamp.h"
> > > +#include "pgtypeslib_extern.h"
> >
> > Right, but trying to see why it hasn't failed on other machines and in
> > my local build.
> >
>
> One possible reason could be that pgtypeslib_extern.h has define like below:
> #ifndef bool
> #define bool char
> #endif /* ndef bool */
>
> It is possible that all the functions that have bool has a parameter
> in dt_common.c treat it as 'char' where as the declaration of same
> functions in dt.h doesn't consider bool as char because now
> pgtypeslib_extern.h is included after dt.h.  It seems that the
> platforms where it failed doesn't have bool defined.  What do you
> think?  I think we can revert the change in that file.
>

I am planning to revert that part of the change as attached.  We can
think of even moving the above definition of bool but I am not sure
what is the right place for the same and I am not sure if it is a
better idea.  I think that can be explored later.  It is better to
revert that change for now.  Do you think we should add some comment
like:
"We need to include pgtypeslib_extern.h before dt.h as it defines bool
which is used in dt.h."?  I have not added as I couldn't experiment
any thing related to that.

I will apply the attached in one hour or so unless you or someone has
a better idea.  In the meantime, we can see if there is any other
problem with buildfarm.

-- 
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com

Attachments:

0001-Revert-part-of-commit-dddf4cdc3.patch (application/octet-stream, 1.1K) download From 3e7d528b4211d65568221d450a8b0187ee0b240e Mon Sep 17 00:00:00 2001 From: Amit Kapila <akapila@postgresql.org> Date: Fri, 25 Oct 2019 10:04:20 +0530 Subject: [PATCH] Revert part of commit dddf4cdc3. The commit dddf4cdc3 tries to ensure that the Postgres header file inclusions are in order based on their ASCII value. However, in one of the case there is a header file dependency due to which we can't maintain such order. Author: Amit Kapila Discussion: https://postgr.es/m/E1iNpHW-000855-1u@gemulon.postgresql.org --- src/interfaces/ecpg/pgtypeslib/dt_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c index c22f657..29c1117 100644 --- a/src/interfaces/ecpg/pgtypeslib/dt_common.c +++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c @@ -7,9 +7,9 @@ #include <math.h> #include "common/string.h" +#include "pgtypeslib_extern.h" #include "dt.h" #include "pgtypes_timestamp.h" -#include "pgtypeslib_extern.h" const int day_tab[2][13] = { {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0}, -- 1.8.3.1
^ permalink raw reply [nested|flat] 17+ messages in thread

* Re: pgsql: Make the order of the header file includes consistent in non-bac
  2019-10-25 02:24 pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <akapila@postgresql.org>
  2019-10-25 03:17 ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
  2019-10-25 03:24   ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  2019-10-25 04:02     ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
@ 2019-10-25 06:17       ` Michael Paquier <michael@paquier.xyz>
  2019-10-25 09:51         ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  2 siblings, 1 reply; 17+ messages in thread

From: Michael Paquier @ 2019-10-25 06:17 UTC (permalink / raw)
  To: Amit Kapila <amit.kapila16@gmail.com>; +Cc: Amit Kapila <akapila@postgresql.org>; pgsql-committers@lists.postgresql.org

On Fri, Oct 25, 2019 at 09:32:29AM +0530, Amit Kapila wrote:
> One possible reason could be that pgtypeslib_extern.h has define like below:
> #ifndef bool
> #define bool char
> #endif /* ndef bool */

Possible.  I have not looked closely.

> It is possible that all the functions that have bool has a parameter
> in dt_common.c treat it as 'char' where as the declaration of same
> functions in dt.h doesn't consider bool as char because now
> pgtypeslib_extern.h is included after dt.h.  It seems that the
> platforms where it failed doesn't have bool defined.  What do you
> think?  I think we can revert the change in that file.
> 
> BTW, prairiedog is also show similar failure and both seems to have
> similar OS except for versions.

Remembering the recent efforts that went behind stdbool.h (see
9a95a77), I think that we should be able to cleanup this header more.
Reverting partially the change looks better for now to put that the
buildfarm back to green.
--
Michael

Attachments:

  signature.asc (application/pgp-signature, 832B) download

^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* Re: pgsql: Make the order of the header file includes consistent in non-bac
  2019-10-25 02:24 pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <akapila@postgresql.org>
  2019-10-25 03:17 ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
  2019-10-25 03:24   ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  2019-10-25 04:02     ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  2019-10-25 06:17       ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
@ 2019-10-25 09:51         ` Amit Kapila <amit.kapila16@gmail.com>
  2019-10-26 02:29           ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
  0 siblings, 1 reply; 17+ messages in thread

From: Amit Kapila @ 2019-10-25 09:51 UTC (permalink / raw)
  To: Michael Paquier <michael@paquier.xyz>; +Cc: Amit Kapila <akapila@postgresql.org>; pgsql-committers@lists.postgresql.org

On Fri, Oct 25, 2019 at 11:47 AM Michael Paquier <michael@paquier.xyz> wrote:
>
> On Fri, Oct 25, 2019 at 09:32:29AM +0530, Amit Kapila wrote:
> > One possible reason could be that pgtypeslib_extern.h has define like below:
> > #ifndef bool
> > #define bool char
> > #endif /* ndef bool */
>
> Possible.  I have not looked closely.
>
> > It is possible that all the functions that have bool has a parameter
> > in dt_common.c treat it as 'char' where as the declaration of same
> > functions in dt.h doesn't consider bool as char because now
> > pgtypeslib_extern.h is included after dt.h.  It seems that the
> > platforms where it failed doesn't have bool defined.  What do you
> > think?  I think we can revert the change in that file.
> >
> > BTW, prairiedog is also show similar failure and both seems to have
> > similar OS except for versions.
>
> Remembering the recent efforts that went behind stdbool.h (see
> 9a95a77), I think that we should be able to cleanup this header more.
> Reverting partially the change looks better for now to put that the
> buildfarm back to green.
>

Reverted and the buildfarm is green again.  Thanks!

-- 
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com





^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* Re: pgsql: Make the order of the header file includes consistent in non-bac
  2019-10-25 02:24 pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <akapila@postgresql.org>
  2019-10-25 03:17 ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
  2019-10-25 03:24   ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  2019-10-25 04:02     ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  2019-10-25 06:17       ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
  2019-10-25 09:51         ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
@ 2019-10-26 02:29           ` Michael Paquier <michael@paquier.xyz>
  0 siblings, 0 replies; 17+ messages in thread

From: Michael Paquier @ 2019-10-26 02:29 UTC (permalink / raw)
  To: Amit Kapila <amit.kapila16@gmail.com>; +Cc: Amit Kapila <akapila@postgresql.org>; pgsql-committers@lists.postgresql.org

On Fri, Oct 25, 2019 at 03:21:13PM +0530, Amit Kapila wrote:
> Reverted and the buildfarm is green again.  Thanks!

Thanks for fixing, and the follow-up thread.  (Just saw the rest as
well.)
--
Michael

Attachments:

  signature.asc (application/pgp-signature, 832B) download

^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* Re: pgsql: Make the order of the header file includes consistent in non-bac
  2019-10-25 02:24 pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <akapila@postgresql.org>
  2019-10-25 03:17 ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
  2019-10-25 03:24   ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  2019-10-25 04:02     ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
@ 2019-10-25 08:00       ` Andrew Gierth <andrew@tao11.riddles.org.uk>
  2019-10-25 09:50         ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  2 siblings, 1 reply; 17+ messages in thread

From: Andrew Gierth @ 2019-10-25 08:00 UTC (permalink / raw)
  To: Amit Kapila <amit.kapila16@gmail.com>; +Cc: Michael Paquier <michael@paquier.xyz>; Amit Kapila <akapila@postgresql.org>; pgsql-committers@lists.postgresql.org

>>>>> "Amit" == Amit Kapila <amit.kapila16@gmail.com> writes:

 Amit> BTW, prairiedog is also show similar failure and both seems to
 Amit> have similar OS except for versions.

Be aware that prairiedog and locust (unlike the rest of the buildfarm)
have compilers whose "bool" type is not 1 byte long; PG can't use that,
so we don't include <stdbool.h> on those platforms.

Looking at c.h, the problem seems to be that when we define our own bool
in the absence of a usable stdbool.h, we do so as a typedef and not a
macro. So pgtypeslib_extern.h ends up redefining it in that case, and
(this bit may be my fault: see d26a810eb) uses a different type to c.h
(char vs. unsigned char).

(stdbool.h is required by spec to do #define bool _Bool rather than a
typedef, hence the difference in behavior)

I'm no expert on the ECPG internals, but this doesn't look like an
exposed interface, so maybe it just shouldn't be trying to #define bool
at all and just rely on c.h (from postgres_fe.h) to declare the type?

-- 
Andrew (irc:RhodiumToad)





^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* Re: pgsql: Make the order of the header file includes consistent in non-bac
  2019-10-25 02:24 pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <akapila@postgresql.org>
  2019-10-25 03:17 ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
  2019-10-25 03:24   ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  2019-10-25 04:02     ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
  2019-10-25 08:00       ` Re: pgsql: Make the order of the header file includes consistent in non-bac Andrew Gierth <andrew@tao11.riddles.org.uk>
@ 2019-10-25 09:50         ` Amit Kapila <amit.kapila16@gmail.com>
  0 siblings, 0 replies; 17+ messages in thread

From: Amit Kapila @ 2019-10-25 09:50 UTC (permalink / raw)
  To: Andrew Gierth <andrew@tao11.riddles.org.uk>; +Cc: Michael Paquier <michael@paquier.xyz>; Amit Kapila <akapila@postgresql.org>; pgsql-committers@lists.postgresql.org

On Fri, Oct 25, 2019 at 1:30 PM Andrew Gierth
<andrew@tao11.riddles.org.uk> wrote:
>
> >>>>> "Amit" == Amit Kapila <amit.kapila16@gmail.com> writes:
>
>  Amit> BTW, prairiedog is also show similar failure and both seems to
>  Amit> have similar OS except for versions.
>
> Be aware that prairiedog and locust (unlike the rest of the buildfarm)
> have compilers whose "bool" type is not 1 byte long; PG can't use that,
> so we don't include <stdbool.h> on those platforms.
>
> Looking at c.h, the problem seems to be that when we define our own bool
> in the absence of a usable stdbool.h, we do so as a typedef and not a
> macro. So pgtypeslib_extern.h ends up redefining it in that case, and
> (this bit may be my fault: see d26a810eb) uses a different type to c.h
> (char vs. unsigned char).
>
> (stdbool.h is required by spec to do #define bool _Bool rather than a
> typedef, hence the difference in behavior)
>
> I'm no expert on the ECPG internals, but this doesn't look like an
> exposed interface, so maybe it just shouldn't be trying to #define bool
> at all and just rely on c.h (from postgres_fe.h) to declare the type?
>

+1.  I think we can discuss this on hackers, so started a thread [1].

[1] - https://www.postgresql.org/message-id/CAA4eK1LmaKO7Du9M9Lo%3DkxGU8sB6aL8fa3sF6z6d5yYYVe3BuQ%40mail.g...

-- 
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com





^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* pgsql: Make the order of the header file includes consistent in backend
@ 2019-11-12 03:03 Amit Kapila <akapila@postgresql.org>
  2019-11-12 11:49 ` Re: pgsql: Make the order of the header file includes consistent in backend Amit Kapila <amit.kapila16@gmail.com>
  0 siblings, 1 reply; 17+ messages in thread

From: Amit Kapila @ 2019-11-12 03:03 UTC (permalink / raw)
  To: pgsql-committers@lists.postgresql.org

Make the order of the header file includes consistent in backend modules.

Similar to commits 7e735035f2 and dddf4cdc33, this commit makes the order
of header file inclusion consistent for backend modules.

In the passing, removed a couple of duplicate inclusions.

Author: Vignesh C
Reviewed-by: Kuntal Ghosh and Amit Kapila
Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/14aec03502302eff6c67981d8fd121175c436ce9

Modified Files
--------------
src/backend/access/brin/brin_minmax.c              |  5 ++--
src/backend/access/brin/brin_pageops.c             |  3 +--
src/backend/access/brin/brin_tuple.c               |  3 +--
src/backend/access/brin/brin_validate.c            |  3 +--
src/backend/access/gin/ginbtree.c                  |  2 +-
src/backend/access/gin/ginfast.c                   | 10 ++++----
src/backend/access/gin/gininsert.c                 |  5 ++--
src/backend/access/gin/ginvalidate.c               |  3 +--
src/backend/access/gist/gist.c                     |  3 +--
src/backend/access/gist/gistget.c                  |  4 +--
src/backend/access/gist/gistutil.c                 |  5 ++--
src/backend/access/hash/hash.c                     |  2 --
src/backend/access/hash/hash_xlog.c                |  6 ++---
src/backend/access/hash/hashinsert.c               |  4 +--
src/backend/access/hash/hashpage.c                 |  3 +--
src/backend/access/hash/hashsearch.c               |  2 +-
src/backend/access/hash/hashutil.c                 |  2 +-
src/backend/access/heap/heapam_handler.c           |  5 +---
src/backend/access/heap/pruneheap.c                |  4 +--
src/backend/access/heap/rewriteheap.c              | 12 ++-------
src/backend/access/nbtree/nbtxlog.c                |  2 +-
src/backend/access/spgist/spgquadtreeproc.c        |  3 +--
src/backend/access/transam/clog.c                  |  2 +-
src/backend/access/transam/parallel.c              |  3 +--
src/backend/access/transam/rmgr.c                  |  4 +--
src/backend/access/transam/slru.c                  |  3 +--
src/backend/access/transam/twophase.c              |  3 +--
src/backend/access/transam/xact.c                  |  3 +--
src/backend/access/transam/xlog.c                  |  6 ++---
src/backend/access/transam/xlogfuncs.c             |  7 +++--
src/backend/access/transam/xloginsert.c            |  2 +-
src/backend/access/transam/xlogreader.c            |  3 +--
src/backend/catalog/aclchk.c                       |  5 ++--
src/backend/catalog/catalog.c                      |  3 +--
src/backend/catalog/index.c                        |  7 +++--
src/backend/catalog/objectaddress.c                | 10 ++++----
src/backend/catalog/partition.c                    |  3 +--
src/backend/catalog/pg_enum.c                      |  3 +--
src/backend/catalog/pg_publication.c               |  9 +++----
src/backend/catalog/pg_shdepend.c                  |  7 +++--
src/backend/catalog/pg_subscription.c              | 10 ++------
src/backend/catalog/pg_type.c                      |  2 +-
src/backend/catalog/storage.c                      |  3 +--
src/backend/commands/alter.c                       |  5 ++--
src/backend/commands/cluster.c                     |  5 ++--
src/backend/commands/copy.c                        |  3 +--
src/backend/commands/createas.c                    |  3 +--
src/backend/commands/dbcommands.c                  |  3 +--
src/backend/commands/event_trigger.c               |  6 ++---
src/backend/commands/functioncmds.c                |  2 +-
src/backend/commands/lockcmds.c                    |  4 +--
src/backend/commands/opclasscmds.c                 |  3 +--
src/backend/commands/policy.c                      |  2 +-
src/backend/commands/publicationcmds.c             | 10 +++-----
src/backend/commands/schemacmds.c                  |  3 +--
src/backend/commands/subscriptioncmds.c            | 12 ++-------
src/backend/commands/tablecmds.c                   |  2 --
src/backend/commands/tablespace.c                  |  3 +--
src/backend/commands/variable.c                    |  4 +--
src/backend/commands/view.c                        |  3 +--
src/backend/executor/execAmi.c                     |  2 --
src/backend/executor/execExprInterp.c              |  5 ++--
src/backend/executor/execGrouping.c                |  2 +-
src/backend/executor/execParallel.c                |  4 +--
src/backend/executor/execProcnode.c                |  3 +--
src/backend/executor/execTuples.c                  |  3 +--
src/backend/executor/nodeAgg.c                     |  3 +--
src/backend/executor/nodeBitmapHeapscan.c          |  3 +--
src/backend/executor/nodeCustom.c                  |  3 +--
src/backend/executor/nodeHash.c                    |  3 +--
src/backend/executor/nodeSubplan.c                 |  3 +--
src/backend/executor/nodeTableFuncscan.c           |  3 +--
src/backend/executor/nodeWindowAgg.c               |  2 +-
src/backend/jit/jit.c                              |  7 ++---
src/backend/jit/llvm/llvmjit.c                     | 18 +++++--------
src/backend/jit/llvm/llvmjit_expr.c                |  3 +--
src/backend/libpq/be-secure.c                      |  5 ++--
src/backend/libpq/hba.c                            |  2 +-
src/backend/nodes/nodeFuncs.c                      |  3 +--
src/backend/optimizer/geqo/geqo_cx.c               |  2 +-
src/backend/optimizer/geqo/geqo_erx.c              |  2 +-
src/backend/optimizer/path/clausesel.c             |  3 +--
src/backend/optimizer/plan/initsplan.c             |  3 +--
src/backend/optimizer/plan/planagg.c               |  3 +--
src/backend/optimizer/plan/planner.c               |  7 +++--
src/backend/optimizer/prep/preptlist.c             |  3 +--
src/backend/optimizer/util/pathnode.c              |  3 +--
src/backend/optimizer/util/plancat.c               |  7 +++--
src/backend/parser/parse_clause.c                  | 12 ++++-----
src/backend/parser/parse_expr.c                    |  3 +--
src/backend/parser/parse_node.c                    |  3 +--
src/backend/parser/parse_relation.c                |  3 +--
src/backend/parser/parse_target.c                  |  3 +--
src/backend/parser/parse_type.c                    |  3 +--
src/backend/parser/scansup.c                       |  3 +--
src/backend/partitioning/partbounds.c              |  2 +-
src/backend/partitioning/partdesc.c                |  4 +--
src/backend/postmaster/bgworker.c                  |  2 +-
src/backend/postmaster/bgwriter.c                  |  3 +--
src/backend/postmaster/fork_process.c              |  3 ++-
src/backend/postmaster/pgstat.c                    |  4 +--
src/backend/replication/basebackup.c               |  3 +--
.../libpqwalreceiver/libpqwalreceiver.c            |  4 +--
src/backend/replication/logical/decode.c           |  7 ++---
src/backend/replication/logical/launcher.c         | 16 +++---------
src/backend/replication/logical/logical.c          | 10 +++-----
src/backend/replication/logical/logicalfuncs.c     | 30 ++++++++--------------
src/backend/replication/logical/message.c          |  9 ++-----
src/backend/replication/logical/origin.c           | 18 +++++--------
src/backend/replication/logical/snapbuild.c        | 15 ++++-------
src/backend/replication/logical/tablesync.c        | 13 +++-------
src/backend/replication/pgoutput/pgoutput.c        |  5 +---
src/backend/replication/slotfuncs.c                |  2 +-
src/backend/rewrite/rowsecurity.c                  |  2 +-
src/backend/statistics/dependencies.c              |  4 +--
src/backend/statistics/mvdistinct.c                |  7 +++--
src/backend/storage/buffer/buf_init.c              |  3 +--
src/backend/storage/buffer/buf_table.c             |  3 +--
src/backend/storage/file/buffile.c                 |  4 +--
src/backend/storage/file/copydir.c                 |  4 +--
src/backend/storage/file/fd.c                      |  3 +--
src/backend/storage/ipc/dsm_impl.c                 |  6 ++---
src/backend/storage/ipc/ipci.c                     |  2 +-
src/backend/storage/ipc/procsignal.c               |  3 +--
src/backend/storage/ipc/sinvaladt.c                |  3 +--
src/backend/storage/lmgr/lwlock.c                  |  2 +-
src/backend/storage/lmgr/proc.c                    |  3 +--
src/backend/storage/lmgr/s_lock.c                  |  3 +--
src/backend/storage/page/checksum.c                |  1 -
src/backend/storage/smgr/md.c                      |  8 +++---
src/backend/storage/sync/sync.c                    |  8 +++---
src/backend/tcop/postgres.c                        |  7 +++--
src/backend/tcop/utility.c                         |  7 +++--
src/backend/tsearch/wparser.c                      |  3 +--
src/backend/utils/adt/acl.c                        |  5 ++--
src/backend/utils/adt/datetime.c                   |  1 -
src/backend/utils/adt/format_type.c                |  2 +-
src/backend/utils/adt/int8.c                       |  3 +--
src/backend/utils/adt/json.c                       |  4 +--
src/backend/utils/adt/jsonb.c                      |  4 +--
src/backend/utils/adt/jsonpath_exec.c              |  5 ++--
src/backend/utils/adt/misc.c                       |  7 +++--
src/backend/utils/adt/oracle_compat.c              |  3 +--
src/backend/utils/adt/rangetypes_gist.c            |  3 +--
src/backend/utils/adt/regproc.c                    |  4 +--
src/backend/utils/adt/ri_triggers.c                |  3 +--
src/backend/utils/adt/ruleutils.c                  |  3 +--
src/backend/utils/adt/tsquery.c                    |  2 +-
src/backend/utils/adt/tsquery_cleanup.c            |  2 +-
src/backend/utils/adt/tsquery_gist.c               |  2 +-
src/backend/utils/adt/tsquery_util.c               |  2 +-
src/backend/utils/adt/tsrank.c                     |  3 +--
src/backend/utils/adt/txid.c                       |  3 +--
src/backend/utils/adt/varchar.c                    |  3 +--
src/backend/utils/cache/evtcache.c                 |  4 +--
src/backend/utils/cache/relcache.c                 |  3 +--
src/backend/utils/cache/relfilenodemap.c           |  2 +-
src/backend/utils/cache/syscache.c                 |  5 ++--
src/backend/utils/init/postinit.c                  |  3 +--
src/backend/utils/misc/guc.c                       |  8 +++---
src/backend/utils/misc/pg_config.c                 |  6 ++---
src/backend/utils/misc/pg_controldata.c            |  2 +-
src/backend/utils/misc/ps_status.c                 |  2 +-
src/backend/utils/misc/superuser.c                 |  3 +--
src/backend/utils/mmgr/slab.c                      |  3 +--
src/backend/utils/time/combocid.c                  |  3 +--
166 files changed, 281 insertions(+), 465 deletions(-)



^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* Re: pgsql: Make the order of the header file includes consistent in backend
  2019-11-12 03:03 pgsql: Make the order of the header file includes consistent in backend Amit Kapila <akapila@postgresql.org>
@ 2019-11-12 11:49 ` Amit Kapila <amit.kapila16@gmail.com>
  2019-11-13 08:33   ` Re: pgsql: Make the order of the header file includes consistent in backend Amit Kapila <amit.kapila16@gmail.com>
  0 siblings, 1 reply; 17+ messages in thread

From: Amit Kapila @ 2019-11-12 11:49 UTC (permalink / raw)
  To: Amit Kapila <akapila@postgresql.org>; +Cc: pgsql-committers@lists.postgresql.org

On Tue, Nov 12, 2019 at 8:33 AM Amit Kapila <akapila@postgresql.org> wrote:
>
> Make the order of the header file includes consistent in backend modules.
>

I see two buildfarm failures at this commit, but none seems to related
to this change.

1. The failure of anole seems to have happened earlier as well.
https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=anole&dt=2019-11-12%2005%3A43%3A59
 --today's failure
https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=anole&dt=2019-07-18%2021%3A57%3A59
-- previous failure

2.  The failure of fairywren seems somewhat random.
https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=fairywren&dt=2019-11-12%2005%3A57%3A00

The log shows:

not ok 44 - pgbench simple update stdout /(?^:builtin: simple update)/

#   Failed test 'pgbench simple update stdout /(?^:builtin: simple update)/'
#   at t/001_pgbench_with_server.pl line 162.
#                   ''
#     doesn't match '(?^:builtin: simple update)'
not ok 45 - pgbench simple update stdout /(?^:clients: 5\b)/

#   Failed test 'pgbench simple update stdout /(?^:clients: 5\b)/'
#   at t/001_pgbench_with_server.pl line 162.
#                   ''
#     doesn't match '(?^:clients: 5\b)'

It is not clear to me how it can be related to this commit.  If
anybody thinks so, please let me know.  I will wait for another run
and see if this gets reproduced.


-- 
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com





^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* Re: pgsql: Make the order of the header file includes consistent in backend
  2019-11-12 03:03 pgsql: Make the order of the header file includes consistent in backend Amit Kapila <akapila@postgresql.org>
  2019-11-12 11:49 ` Re: pgsql: Make the order of the header file includes consistent in backend Amit Kapila <amit.kapila16@gmail.com>
@ 2019-11-13 08:33   ` Amit Kapila <amit.kapila16@gmail.com>
  0 siblings, 0 replies; 17+ messages in thread

From: Amit Kapila @ 2019-11-13 08:33 UTC (permalink / raw)
  To: Amit Kapila <akapila@postgresql.org>; +Cc: pgsql-committers@lists.postgresql.org

On Tue, Nov 12, 2019 at 5:19 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
>
> On Tue, Nov 12, 2019 at 8:33 AM Amit Kapila <akapila@postgresql.org> wrote:
> >
> > Make the order of the header file includes consistent in backend modules.
> >
>
> I see two buildfarm failures at this commit, but none seems to related
> to this change.
>

Both the buildfarm members are green now.  It seems some random issues
unrelated to this patch.

-- 
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com





^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* pgsql: Make the order of the header file includes consistent.
@ 2019-11-25 02:43 Amit Kapila <akapila@postgresql.org>
  0 siblings, 0 replies; 17+ messages in thread

From: Amit Kapila @ 2019-11-25 02:43 UTC (permalink / raw)
  To: pgsql-committers@lists.postgresql.org

Make the order of the header file includes consistent.

Similar to commits 14aec03502, 7e735035f2 and dddf4cdc33, this commit
makes the order of header file inclusion consistent in more places.

Author: Vignesh C
Reviewed-by: Amit Kapila
Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/e0487223ecac9cbb7f673e4ff6d2e4086e591abf

Modified Files
--------------
contrib/bloom/bloom.h                                    |  2 +-
contrib/btree_gist/btree_gist.h                          |  2 +-
contrib/btree_gist/btree_utils_num.h                     |  8 ++++----
contrib/btree_gist/btree_utils_var.h                     |  3 +--
contrib/postgres_fdw/postgres_fdw.h                      |  3 +--
src/backend/libpq/auth.c                                 |  1 -
src/bin/pg_basebackup/receivelog.h                       |  3 +--
src/bin/pg_basebackup/streamutil.h                       |  3 +--
src/bin/pg_dump/pg_backup_archiver.h                     |  4 +---
src/bin/pg_rewind/datapagemap.h                          |  3 +--
src/bin/pg_rewind/filemap.h                              |  5 ++---
src/bin/pg_rewind/pg_rewind.h                            |  4 +---
src/bin/pg_waldump/pg_waldump.c                          |  2 +-
src/bin/psql/command.c                                   | 16 +++++++---------
src/bin/psql/command.h                                   |  3 +--
src/bin/psql/common.h                                    |  2 +-
src/bin/psql/prompt.h                                    |  2 +-
src/bin/psql/settings.h                                  |  3 +--
src/bin/psql/tab-complete.c                              |  6 +++---
src/bin/scripts/common.h                                 |  2 +-
src/include/access/gin_private.h                         |  2 +-
src/include/access/hio.h                                 |  3 +--
src/include/access/htup_details.h                        |  2 +-
src/include/access/relation.h                            |  3 +--
src/include/access/table.h                               |  3 +--
src/include/access/twophase.h                            |  2 +-
src/include/catalog/pg_constraint.h                      |  3 +--
src/include/catalog/pg_conversion.h                      |  3 +--
src/include/catalog/pg_operator.h                        |  3 +--
src/include/catalog/pg_proc.h                            |  3 +--
src/include/catalog/pg_publication.h                     |  3 +--
src/include/catalog/pg_replication_origin.h              |  3 +--
src/include/catalog/pg_subscription_rel.h                |  3 +--
src/include/catalog/pg_type.h                            |  3 +--
src/include/commands/event_trigger.h                     |  2 +-
src/include/executor/nodeBitmapHeapscan.h                |  2 +-
src/include/executor/nodeIndexonlyscan.h                 |  2 +-
src/include/executor/tuptable.h                          |  2 +-
src/include/funcapi.h                                    |  3 +--
src/include/jit/llvmjit.h                                |  4 +---
src/include/nodes/execnodes.h                            |  7 +++----
src/include/replication/decode.h                         |  2 +-
src/include/replication/logical.h                        |  3 +--
src/include/replication/walreceiver.h                    |  2 +-
src/include/rewrite/rewriteHandler.h                     |  2 +-
src/include/statistics/extended_stats_internal.h         |  3 +--
src/include/storage/buf_internals.h                      |  3 +--
src/include/storage/condition_variable.h                 |  2 +-
src/include/storage/lock.h                               |  3 +--
src/include/storage/lwlock.h                             |  2 +-
src/include/storage/standby.h                            |  2 +-
src/include/tsearch/ts_locale.h                          |  2 +-
src/include/utils/date.h                                 |  2 +-
src/include/utils/jsonpath.h                             |  2 +-
src/include/utils/pg_lsn.h                               |  2 +-
src/include/utils/xml.h                                  |  2 +-
src/interfaces/ecpg/ecpglib/descriptor.c                 |  2 +-
src/interfaces/ecpg/ecpglib/ecpglib_extern.h             |  6 +++---
src/interfaces/ecpg/ecpglib/misc.c                       |  2 +-
src/interfaces/ecpg/include/ecpglib.h                    |  5 +++--
src/interfaces/ecpg/preproc/preproc_extern.h             |  3 +--
src/pl/plperl/plperl.c                                   |  5 ++---
src/pl/plpython/plpy_cursorobject.c                      |  8 ++------
src/pl/plpython/plpy_elog.c                              |  6 +-----
src/pl/plpython/plpy_exec.c                              | 16 ++++++----------
src/pl/plpython/plpy_main.c                              | 16 ++++++----------
src/pl/plpython/plpy_planobject.c                        |  7 ++-----
src/pl/plpython/plpy_plpymodule.c                        | 12 ++++--------
src/pl/plpython/plpy_procedure.c                         | 12 ++++--------
src/pl/plpython/plpy_resultobject.c                      |  6 ++----
src/pl/plpython/plpy_spi.c                               | 12 ++++--------
src/pl/plpython/plpy_spi.h                               |  3 +--
src/pl/plpython/plpy_subxactobject.c                     | 10 +++-------
src/pl/plpython/plpy_subxactobject.h                     |  3 +--
src/pl/plpython/plpy_typeio.c                            | 12 ++++--------
src/pl/plpython/plpy_typeio.h                            |  3 +--
src/pl/plpython/plpy_util.c                              | 10 +++-------
.../modules/test_ginpostinglist/test_ginpostinglist.c    |  2 +-
78 files changed, 125 insertions(+), 208 deletions(-)



^ permalink  raw  reply  [nested|flat] 17+ messages in thread

* pgsql: Make the order of the header file includes consistent
@ 2024-03-13 14:07 Peter Eisentraut <peter@eisentraut.org>
  0 siblings, 0 replies; 17+ messages in thread

From: Peter Eisentraut @ 2024-03-13 14:07 UTC (permalink / raw)
  To: pgsql-committers@lists.postgresql.org

Make the order of the header file includes consistent

Similar to commit 7e735035f20.

Author: Richard Guo <guofenglinux@gmail.com>
Reviewed-by: Bharath Rupireddy <bharath.rupireddyforpostgres@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/CAMbWs4-WhpCFMbXCjtJ%2BFzmjfPrp7Hw1pk4p%2BZpU95Kh3ofZ1A%4...

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/97d85be365443eb4bf84373a7468624762382059

Modified Files
--------------
contrib/pageinspect/gistfuncs.c                          | 2 +-
contrib/postgres_fdw/deparse.c                           | 2 +-
contrib/uuid-ossp/uuid-ossp.c                            | 2 +-
src/backend/access/brin/brin_bloom.c                     | 8 ++++----
src/backend/access/brin/brin_minmax_multi.c              | 6 +++---
src/backend/access/common/printsimple.c                  | 2 +-
src/backend/access/hash/hash.c                           | 2 +-
src/backend/access/heap/pruneheap.c                      | 2 +-
src/backend/access/spgist/spgtextproc.c                  | 2 +-
src/backend/access/transam/xlogarchive.c                 | 2 +-
src/backend/access/transam/xlogprefetcher.c              | 4 ++--
src/backend/backup/basebackup_incremental.c              | 2 +-
src/backend/catalog/pg_publication.c                     | 2 +-
src/backend/commands/statscmds.c                         | 2 +-
src/backend/commands/vacuum.c                            | 2 +-
src/backend/optimizer/util/relnode.c                     | 2 +-
src/backend/parser/parse_merge.c                         | 4 ++--
src/backend/parser/parser.c                              | 2 +-
src/backend/postmaster/walsummarizer.c                   | 2 +-
src/backend/replication/logical/tablesync.c              | 4 ++--
src/backend/rewrite/rewriteSearchCycle.c                 | 2 +-
src/backend/statistics/extended_stats.c                  | 2 +-
src/backend/storage/ipc/procsignal.c                     | 4 ++--
src/backend/storage/sync/sync.c                          | 2 +-
src/backend/utils/activity/pgstat_database.c             | 2 +-
src/backend/utils/activity/pgstat_relation.c             | 2 +-
src/backend/utils/activity/pgstat_wal.c                  | 2 +-
src/backend/utils/adt/array_userfuncs.c                  | 4 ++--
src/backend/utils/adt/jsonbsubs.c                        | 2 +-
src/backend/utils/adt/jsonpath.c                         | 2 +-
src/backend/utils/adt/multirangetypes.c                  | 4 ++--
src/backend/utils/adt/multirangetypes_selfuncs.c         | 2 +-
src/backend/utils/adt/numutils.c                         | 2 +-
src/backend/utils/adt/rangetypes_typanalyze.c            | 2 +-
src/backend/utils/error/elog.c                           | 2 +-
src/backend/utils/mb/stringinfo_mb.c                     | 2 +-
src/backend/utils/misc/guc_tables.c                      | 2 +-
src/backend/utils/misc/tzparser.c                        | 2 +-
src/backend/utils/mmgr/aset.c                            | 2 +-
src/backend/utils/mmgr/generation.c                      | 2 +-
src/backend/utils/mmgr/slab.c                            | 2 +-
src/backend/utils/sort/tuplesortvariants.c               | 2 +-
src/bin/pg_basebackup/bbstreamer_file.c                  | 2 +-
src/bin/pg_basebackup/bbstreamer_gzip.c                  | 2 +-
src/bin/pg_basebackup/bbstreamer_lz4.c                   | 2 +-
src/bin/pg_combinebackup/backup_label.c                  | 2 +-
src/bin/pg_combinebackup/pg_combinebackup.c              | 2 +-
src/bin/pg_combinebackup/reconstruct.c                   | 2 +-
src/bin/pg_dump/compress_lz4.c                           | 2 +-
src/bin/pg_dump/compress_zstd.c                          | 2 +-
src/bin/pg_upgrade/controldata.c                         | 2 +-
src/bin/pg_walsummary/pg_walsummary.c                    | 2 +-
src/interfaces/ecpg/test/pg_regress_ecpg.c               | 2 +-
src/pl/plpython/plpy_procedure.c                         | 2 +-
src/test/modules/injection_points/injection_points.c     | 2 +-
src/test/modules/ldap_password_func/ldap_password_func.c | 2 +-
src/test/modules/test_dsa/test_dsa.c                     | 2 +-
src/test/modules/worker_spi/worker_spi.c                 | 2 +-
58 files changed, 69 insertions(+), 69 deletions(-)



^ permalink  raw  reply  [nested|flat] 17+ messages in thread


end of thread, other threads:[~2024-03-13 14:07 UTC | newest]

Thread overview: 17+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2009-07-07 20:32 pgsql: psql backward compatibility fix  For servers older than 8.3, sort Peter Eisentraut <petere@postgresql.org>
2019-10-24 02:46 pgsql: Make the order of the header file includes consistent in contrib Amit Kapila <akapila@postgresql.org>
2019-10-25 02:24 pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <akapila@postgresql.org>
2019-10-25 03:17 ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
2019-10-25 03:24   ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
2019-10-25 04:02     ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
2019-10-25 04:47       ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
2019-10-25 06:17       ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
2019-10-25 09:51         ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
2019-10-26 02:29           ` Re: pgsql: Make the order of the header file includes consistent in non-bac Michael Paquier <michael@paquier.xyz>
2019-10-25 08:00       ` Re: pgsql: Make the order of the header file includes consistent in non-bac Andrew Gierth <andrew@tao11.riddles.org.uk>
2019-10-25 09:50         ` Re: pgsql: Make the order of the header file includes consistent in non-bac Amit Kapila <amit.kapila16@gmail.com>
2019-11-12 03:03 pgsql: Make the order of the header file includes consistent in backend Amit Kapila <akapila@postgresql.org>
2019-11-12 11:49 ` Re: pgsql: Make the order of the header file includes consistent in backend Amit Kapila <amit.kapila16@gmail.com>
2019-11-13 08:33   ` Re: pgsql: Make the order of the header file includes consistent in backend Amit Kapila <amit.kapila16@gmail.com>
2019-11-25 02:43 pgsql: Make the order of the header file includes consistent. Amit Kapila <akapila@postgresql.org>
2024-03-13 14:07 pgsql: Make the order of the header file includes consistent Peter Eisentraut <peter@eisentraut.org>

This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox