Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit85b9ef5

michaelpq

committed

Remove unnecessary definition of CancelRequested in bin/scripts/

This variable is now part of the refactored code for query cancellationin fe_utils. This fixes an oversight in commita4fd3aa. While on it,improve some header includes in bin/scripts/.Author: Michael PaquierReviewed-by: Fabien CoelhoDiscussion:https://postgr.es/m/20191203101625.GF1634@paquier.xyz

1 parentb527394 commit85b9ef5Copy full SHA for 85b9ef5

File tree

6 files changed

+5

-3

lines changed

src/bin/scripts

6 files changed

+5

-3

lines changed

`‎src/bin/scripts/clusterdb.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`#include"postgres_fe.h"`
`13`	`13`	`#include"common.h"`
`14`	`14`	`#include"common/logging.h"`
	`15`	`+#include"fe_utils/cancel.h"`
`15`	`16`	`#include"fe_utils/simple_list.h"`
`16`	`17`	`#include"fe_utils/string_utils.h"`
`17`	`18`

`‎src/bin/scripts/common.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`#include"common.h"`
`21`	`21`	`#include"common/logging.h"`
	`22`	`+#include"fe_utils/cancel.h"`
`22`	`23`	`#include"fe_utils/connect.h"`
`23`	`24`	`#include"fe_utils/string_utils.h"`
`24`	`25`

`‎src/bin/scripts/common.h`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`#defineCOMMON_H`
`11`	`11`
`12`	`12`	`#include"common/username.h"`
`13`		`-#include"fe_utils/cancel.h"`
`14`	`13`	`#include"getopt_long.h"/* pgrminclude ignore */`
`15`	`14`	`#include"libpq-fe.h"`
`16`	`15`	`#include"pqexpbuffer.h"/* pgrminclude ignore */`
`@@ -22,8 +21,6 @@ enum trivalue`
`22`	`21`	`TRI_YES`
`23`	`22`	`};`
`24`	`23`
`25`		`-externboolCancelRequested;`
`26`		`-`
`27`	`24`	`typedefvoid (help_handler) (constcharprogname);`
`28`	`25`
`29`	`26`	`externvoidhandle_help_version_opts(intargc,char*argv[],`

`‎src/bin/scripts/reindexdb.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`#include"catalog/pg_class_d.h"`
`15`	`15`	`#include"common.h"`
`16`	`16`	`#include"common/logging.h"`
	`17`	`+#include"fe_utils/cancel.h"`
`17`	`18`	`#include"fe_utils/connect.h"`
`18`	`19`	`#include"fe_utils/simple_list.h"`
`19`	`20`	`#include"fe_utils/string_utils.h"`

`‎src/bin/scripts/scripts_parallel.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`
`25`	`25`	`#include"common.h"`
`26`	`26`	`#include"common/logging.h"`
	`27`	`+#include"fe_utils/cancel.h"`
`27`	`28`	`#include"scripts_parallel.h"`
`28`	`29`
`29`	`30`	`staticvoidinit_slot(ParallelSlotslot,PGconnconn);`

`‎src/bin/scripts/vacuumdb.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`#include"common.h"`
`18`	`18`	`#include"common/logging.h"`
	`19`	`+#include"fe_utils/cancel.h"`
`19`	`20`	`#include"fe_utils/connect.h"`
`20`	`21`	`#include"fe_utils/simple_list.h"`
`21`	`22`	`#include"fe_utils/string_utils.h"`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp