Movatterモバイル変換

Skip to content

postgrespro/postgres_clusterPublic

NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commitfc9a62a

tglsfdc

committed

Move logging.h and logging.c from src/fe_utils/ to src/common/.

The original placement of this module in src/fe_utils/ is ill-considered,because several src/common/ modules have dependencies on it, meaning thatlibpgcommon and libpgfeutils now have mutual dependencies. That makes itpointless to have distinct libraries at all. The intended design is thatlibpgcommon is lower-level than libpgfeutils, so only dependencies fromthe latter to the former are acceptable.We already have the precedent that fe_memutils and a couple of othermodules in src/common/ are frontend-only, so it's not stretching anythingout of whack to treat logging.c as a frontend-only module in src/common/.To the extent that such modules help provide a common frontend/backendenvironment for the rest of common/ to use, it's a reasonable design.(logging.c does not yet provide an ereport() emulation, but one candream.)Hence, move these files over, and revert basically all of the build-systemchanges made by commitcc8d415. There are no places that need to grownew dependencies on libpgcommon, further reinforcing the idea that thisis the right solution.Discussion:https://postgr.es/m/a912ffff-f6e4-778a-c86a-cf5c47a12933@2ndquadrant.com

1 parentb71dad2 commitfc9a62aCopy full SHA for fc9a62a

File tree

71 files changed

+102

-115

lines changed

src
- bin
  - initdb
    - initdb.c
  - pg_archivecleanup
    - Makefile
    - pg_archivecleanup.c
  - pg_basebackup
  - pg_checksums
    - Makefile
    - pg_checksums.c
  - pg_controldata
    - Makefile
    - pg_controldata.c
  - pg_ctl
    - Makefile
    - pg_ctl.c
  - pg_dump
  - pg_resetwal
    - Makefile
    - pg_resetwal.c
  - pg_rewind
  - pg_test_fsync
    - Makefile
    - pg_test_fsync.c
  - pg_upgrade
    - pg_upgrade.c
  - pg_waldump
    - Makefile
    - pg_waldump.c
  - pgbench
    - pgbench.c
  - psql
  - scripts
- common
- fe_utils
  - Makefile
  - psqlscan.l
- include/common
  - logging.h
- interfaces/ecpg/test
  - Makefile
- nls-global.mk
- test
  - isolation
    - Makefile
  - regress
    - GNUmakefile
    - pg_regress.c
- tools/msvc
  - Mkvcbuild.pm

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+102

-115

lines changed

`‎src/bin/initdb/initdb.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,9 @@`
`65`	`65`	`#include"catalog/pg_collation_d.h"`
`66`	`66`	`#include"common/file_perm.h"`
`67`	`67`	`#include"common/file_utils.h"`
	`68`	`+#include"common/logging.h"`
`68`	`69`	`#include"common/restricted_token.h"`
`69`	`70`	`#include"common/username.h"`
`70`		`-#include"fe_utils/logging.h"`
`71`	`71`	`#include"fe_utils/string_utils.h"`
`72`	`72`	`#include"getaddrinfo.h"`
`73`	`73`	`#include"getopt_long.h"`

`‎src/bin/pg_archivecleanup/Makefile‎`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,11 @@ subdir = src/bin/pg_archivecleanup`
`7`	`7`	`top_builddir = ../../..`
`8`	`8`	`include$(top_builddir)/src/Makefile.global`
`9`	`9`
`10`		`-LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils`
`11`		`-`
`12`	`10`	`OBJS= pg_archivecleanup.o$(WIN32RES)`
`13`	`11`
`14`	`12`	`all: pg_archivecleanup`
`15`	`13`
`16`		`-pg_archivecleanup:$(OBJS) \| submake-libpgport submake-libpgfeutils`
	`14`	`+pg_archivecleanup:$(OBJS) \| submake-libpgport`
`17`	`15`	`$(CC)$(CFLAGS)$^$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)`
`18`	`16`
`19`	`17`	`install: all installdirs`

`‎src/bin/pg_archivecleanup/pg_archivecleanup.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`#include"pg_getopt.h"`
`19`	`19`
`20`		`-#include"fe_utils/logging.h"`
	`20`	`+#include"common/logging.h"`
`21`	`21`
`22`	`22`	`#include"access/xlog_internal.h"`
`23`	`23`

`‎src/bin/pg_basebackup/pg_basebackup.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@`
`29`	`29`	`#include"access/xlog_internal.h"`
`30`	`30`	`#include"common/file_perm.h"`
`31`	`31`	`#include"common/file_utils.h"`
	`32`	`+#include"common/logging.h"`
`32`	`33`	`#include"common/string.h"`
`33`		`-#include"fe_utils/logging.h"`
`34`	`34`	`#include"fe_utils/string_utils.h"`
`35`	`35`	`#include"getopt_long.h"`
`36`	`36`	`#include"libpq-fe.h"`

`‎src/bin/pg_basebackup/pg_receivewal.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`#include<unistd.h>`
`21`	`21`
`22`	`22`	`#include"common/file_perm.h"`
`23`		`-#include"fe_utils/logging.h"`
	`23`	`+#include"common/logging.h"`
`24`	`24`	`#include"libpq-fe.h"`
`25`	`25`	`#include"access/xlog_internal.h"`
`26`	`26`	`#include"getopt_long.h"`

`‎src/bin/pg_basebackup/pg_recvlogical.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`#include"access/xlog_internal.h"`
`26`	`26`	`#include"common/file_perm.h"`
`27`	`27`	`#include"common/fe_memutils.h"`
`28`		`-#include"fe_utils/logging.h"`
	`28`	`+#include"common/logging.h"`
`29`	`29`	`#include"getopt_long.h"`
`30`	`30`	`#include"libpq-fe.h"`
`31`	`31`	`#include"libpq/pqsignal.h"`

`‎src/bin/pg_basebackup/receivelog.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`#include"libpq-fe.h"`
`28`	`28`	`#include"access/xlog_internal.h"`
`29`	`29`	`#include"common/file_utils.h"`
`30`		`-#include"fe_utils/logging.h"`
	`30`	`+#include"common/logging.h"`
`31`	`31`
`32`	`32`
`33`	`33`	`/* fd and filename for currently open WAL file */`

`‎src/bin/pg_basebackup/streamutil.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@`
`24`	`24`	`#include"access/xlog_internal.h"`
`25`	`25`	`#include"common/fe_memutils.h"`
`26`	`26`	`#include"common/file_perm.h"`
	`27`	`+#include"common/logging.h"`
`27`	`28`	`#include"datatype/timestamp.h"`
`28`	`29`	`#include"fe_utils/connect.h"`
`29`		`-#include"fe_utils/logging.h"`
`30`	`30`	`#include"port/pg_bswap.h"`
`31`	`31`	`#include"pqexpbuffer.h"`
`32`	`32`

`‎src/bin/pg_checksums/Makefile‎`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,11 @@ subdir = src/bin/pg_checksums`
`15`	`15`	`top_builddir = ../../..`
`16`	`16`	`include$(top_builddir)/src/Makefile.global`
`17`	`17`
`18`		`-LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils`
`19`		`-`
`20`	`18`	`OBJS= pg_checksums.o$(WIN32RES)`
`21`	`19`
`22`	`20`	`all: pg_checksums`
`23`	`21`
`24`		`-pg_checksums:$(OBJS) \| submake-libpgport submake-libpgfeutils`
	`22`	`+pg_checksums:$(OBJS) \| submake-libpgport`
`25`	`23`	`$(CC)$(CFLAGS)$^$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)`
`26`	`24`
`27`	`25`	`install: all installdirs`

`‎src/bin/pg_checksums/pg_checksums.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`#include"common/controldata_utils.h"`
`24`	`24`	`#include"common/file_perm.h"`
`25`	`25`	`#include"common/file_utils.h"`
`26`		`-#include"fe_utils/logging.h"`
	`26`	`+#include"common/logging.h"`
`27`	`27`	`#include"getopt_long.h"`
`28`	`28`	`#include"pg_getopt.h"`
`29`	`29`	`#include"storage/bufpage.h"`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp