diff options
author | Robert Haas <rhaas@postgresql.org> | 2021-02-05 13:33:38 -0500 |
---|---|---|
committer | Robert Haas <rhaas@postgresql.org> | 2021-02-05 13:33:38 -0500 |
commit | e955bd4b6c2bcdbd253837f6cf4c7520b98e69d4 (patch) | |
tree | bc8e70ed9fbe9bee458299dc6f76b20311185cf7 /src/bin/scripts/scripts_parallel.h | |
parent | c444472af5c202067a9ecb0ff8df7370fb1ea8f4 (diff) | |
download | postgresql-e955bd4b6c2bcdbd253837f6cf4c7520b98e69d4.tar.gz postgresql-e955bd4b6c2bcdbd253837f6cf4c7520b98e69d4.zip |
Move some code from src/bin/scripts to src/fe_utils to permit reuse.
The parallel slots infrastructure (which implements client-side
multiplexing of server connections doing similar things, not
threading or multiple processes or anything like that) are moved from
src/bin/scripts/scripts_parallel.c to src/fe_utils/parallel_slot.c.
The functions consumeQueryResult() and processQueryResult() which were
previously part of src/bin/scripts/common.c are now moved into that
file as well, becoming static helper functions. This might need to be
changed in the future, but currently they're not used for anything
else.
Some other functions from src/bin/scripts/common.c are moved to to
src/fe_utils and are split up among several files. connectDatabase(),
connectMaintenanceDatabase(), and disconnectDatabase() are moved to
connect_utils.c. executeQuery(), executeCommand(), and
executeMaintenanceCommand() are move to query_utils.c.
handle_help_version_opts() is moved to option_utils.c.
Mark Dilger, reviewed by me. The larger patch series of which this is
a part has also had review from Peter Geoghegan, Andres Freund, Álvaro
Herrera, Michael Paquier, and Amul Sul, but I don't know whether any
of them have reviewed this bit specifically.
Discussion: http://postgr.es/m/12ED3DA8-25F0-4B68-937D-D907CFBF08E7@enterprisedb.com
Discussion: http://postgr.es/m/5F743835-3399-419C-8324-2D424237E999@enterprisedb.com
Discussion: http://postgr.es/m/70655DF3-33CE-4527-9A4D-DDEB582B6BA0@enterprisedb.com
Diffstat (limited to 'src/bin/scripts/scripts_parallel.h')
-rw-r--r-- | src/bin/scripts/scripts_parallel.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/bin/scripts/scripts_parallel.h b/src/bin/scripts/scripts_parallel.h deleted file mode 100644 index f62692510a8..00000000000 --- a/src/bin/scripts/scripts_parallel.h +++ /dev/null @@ -1,36 +0,0 @@ -/*------------------------------------------------------------------------- - * - * scripts_parallel.h - * Parallel support for bin/scripts/ - * - * Copyright (c) 2003-2021, PostgreSQL Global Development Group - * - * src/bin/scripts/scripts_parallel.h - * - *------------------------------------------------------------------------- - */ -#ifndef SCRIPTS_PARALLEL_H -#define SCRIPTS_PARALLEL_H - -#include "common.h" -#include "libpq-fe.h" - - -typedef struct ParallelSlot -{ - PGconn *connection; /* One connection */ - bool isFree; /* Is it known to be idle? */ -} ParallelSlot; - -extern ParallelSlot *ParallelSlotsGetIdle(ParallelSlot *slots, int numslots); - -extern ParallelSlot *ParallelSlotsSetup(const ConnParams *cparams, - const char *progname, bool echo, - PGconn *conn, int numslots); - -extern void ParallelSlotsTerminate(ParallelSlot *slots, int numslots); - -extern bool ParallelSlotsWaitCompletion(ParallelSlot *slots, int numslots); - - -#endif /* SCRIPTS_PARALLEL_H */ |