pgindent run for release 9.3
authorBruce Momjian <bruce@momjian.us>
Wed, 29 May 2013 20:58:43 +0000 (16:58 -0400)
committerBruce Momjian <bruce@momjian.us>
Wed, 29 May 2013 20:58:43 +0000 (16:58 -0400)
This is the first run of the Perl-based pgindent script.  Also update
pgindent instructions.

367 files changed:
contrib/btree_gist/btree_bit.c
contrib/btree_gist/btree_text.c
contrib/btree_gist/btree_ts.c
contrib/btree_gist/btree_utils_num.c
contrib/btree_gist/btree_utils_var.c
contrib/dblink/dblink.c
contrib/file_fdw/file_fdw.c
contrib/hstore/hstore_io.c
contrib/oid2name/oid2name.c
contrib/pg_archivecleanup/pg_archivecleanup.c
contrib/pg_standby/pg_standby.c
contrib/pg_test_timing/pg_test_timing.c
contrib/pg_trgm/trgm_op.c
contrib/pg_upgrade/check.c
contrib/pg_upgrade/controldata.c
contrib/pg_upgrade/exec.c
contrib/pg_upgrade/file.c
contrib/pg_upgrade/info.c
contrib/pg_upgrade/option.c
contrib/pg_upgrade/page.c
contrib/pg_upgrade/parallel.c
contrib/pg_upgrade/pg_upgrade.c
contrib/pg_upgrade/pg_upgrade.h
contrib/pg_upgrade/relfilenode.c
contrib/pg_upgrade/server.c
contrib/pg_upgrade/tablespace.c
contrib/pg_upgrade/util.c
contrib/pg_xlogdump/compat.c
contrib/pg_xlogdump/pg_xlogdump.c
contrib/pg_xlogdump/rmgrdesc.c
contrib/pg_xlogdump/rmgrdesc.h
contrib/pgbench/pgbench.c
contrib/pgcrypto/imath.h
contrib/pgcrypto/pgp.h
contrib/pgrowlocks/pgrowlocks.c
contrib/pgstattuple/pgstatindex.c
contrib/postgres_fdw/connection.c
contrib/postgres_fdw/postgres_fdw.c
contrib/postgres_fdw/postgres_fdw.h
contrib/sepgsql/hooks.c
contrib/sepgsql/label.c
contrib/sepgsql/proc.c
contrib/sepgsql/relation.c
contrib/sepgsql/schema.c
contrib/unaccent/unaccent.c
contrib/vacuumlo/vacuumlo.c
contrib/worker_spi/worker_spi.c
src/backend/access/gin/ginbtree.c
src/backend/access/gist/gistbuild.c
src/backend/access/gist/gistget.c
src/backend/access/gist/gistutil.c
src/backend/access/gist/gistxlog.c
src/backend/access/hash/hashinsert.c
src/backend/access/hash/hashsearch.c
src/backend/access/heap/heapam.c
src/backend/access/heap/rewriteheap.c
src/backend/access/heap/visibilitymap.c
src/backend/access/nbtree/nbtpage.c
src/backend/access/nbtree/nbtxlog.c
src/backend/access/rmgrdesc/clogdesc.c
src/backend/access/rmgrdesc/dbasedesc.c
src/backend/access/rmgrdesc/gindesc.c
src/backend/access/rmgrdesc/gistdesc.c
src/backend/access/rmgrdesc/hashdesc.c
src/backend/access/rmgrdesc/heapdesc.c
src/backend/access/rmgrdesc/mxactdesc.c
src/backend/access/rmgrdesc/nbtdesc.c
src/backend/access/rmgrdesc/relmapdesc.c
src/backend/access/rmgrdesc/seqdesc.c
src/backend/access/rmgrdesc/smgrdesc.c
src/backend/access/rmgrdesc/spgdesc.c
src/backend/access/rmgrdesc/standbydesc.c
src/backend/access/rmgrdesc/tblspcdesc.c
src/backend/access/rmgrdesc/xactdesc.c
src/backend/access/rmgrdesc/xlogdesc.c
src/backend/access/spgist/spgtextproc.c
src/backend/access/transam/multixact.c
src/backend/access/transam/timeline.c
src/backend/access/transam/xact.c
src/backend/access/transam/xlog.c
src/backend/access/transam/xlogarchive.c
src/backend/access/transam/xlogfuncs.c
src/backend/access/transam/xlogreader.c
src/backend/bootstrap/bootstrap.c
src/backend/catalog/aclchk.c
src/backend/catalog/catalog.c
src/backend/catalog/dependency.c
src/backend/catalog/heap.c
src/backend/catalog/namespace.c
src/backend/catalog/objectaccess.c
src/backend/catalog/objectaddress.c
src/backend/catalog/pg_constraint.c
src/backend/catalog/pg_enum.c
src/backend/catalog/pg_operator.c
src/backend/catalog/pg_proc.c
src/backend/catalog/pg_shdepend.c
src/backend/catalog/storage.c
src/backend/commands/aggregatecmds.c
src/backend/commands/alter.c
src/backend/commands/async.c
src/backend/commands/cluster.c
src/backend/commands/copy.c
src/backend/commands/createas.c
src/backend/commands/dbcommands.c
src/backend/commands/event_trigger.c
src/backend/commands/explain.c
src/backend/commands/functioncmds.c
src/backend/commands/indexcmds.c
src/backend/commands/matview.c
src/backend/commands/opclasscmds.c
src/backend/commands/operatorcmds.c
src/backend/commands/proclang.c
src/backend/commands/sequence.c
src/backend/commands/tablecmds.c
src/backend/commands/trigger.c
src/backend/commands/typecmds.c
src/backend/commands/user.c
src/backend/commands/vacuum.c
src/backend/commands/vacuumlazy.c
src/backend/executor/execMain.c
src/backend/executor/execQual.c
src/backend/executor/functions.c
src/backend/executor/nodeLockRows.c
src/backend/executor/nodeModifyTable.c
src/backend/executor/nodeSeqscan.c
src/backend/executor/spi.c
src/backend/lib/binaryheap.c
src/backend/libpq/auth.c
src/backend/libpq/hba.c
src/backend/libpq/pqcomm.c
src/backend/main/main.c
src/backend/optimizer/geqo/geqo_cx.c
src/backend/optimizer/geqo/geqo_px.c
src/backend/optimizer/path/allpaths.c
src/backend/optimizer/path/costsize.c
src/backend/optimizer/path/equivclass.c
src/backend/optimizer/path/indxpath.c
src/backend/optimizer/path/joinpath.c
src/backend/optimizer/plan/analyzejoins.c
src/backend/optimizer/plan/initsplan.c
src/backend/optimizer/plan/planagg.c
src/backend/optimizer/plan/planner.c
src/backend/optimizer/prep/prepjointree.c
src/backend/optimizer/util/clauses.c
src/backend/optimizer/util/pathnode.c
src/backend/parser/analyze.c
src/backend/parser/check_keywords.pl
src/backend/parser/parse_agg.c
src/backend/parser/parse_clause.c
src/backend/parser/parse_expr.c
src/backend/parser/parse_relation.c
src/backend/parser/parse_target.c
src/backend/parser/parse_utilcmd.c
src/backend/port/sysv_shmem.c
src/backend/postmaster/autovacuum.c
src/backend/postmaster/checkpointer.c
src/backend/postmaster/fork_process.c
src/backend/postmaster/pgarch.c
src/backend/postmaster/pgstat.c
src/backend/postmaster/postmaster.c
src/backend/postmaster/syslogger.c
src/backend/regex/regc_nfa.c
src/backend/regex/regprefix.c
src/backend/replication/basebackup.c
src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
src/backend/replication/syncrep.c
src/backend/replication/walreceiver.c
src/backend/replication/walsender.c
src/backend/rewrite/rewriteDefine.c
src/backend/rewrite/rewriteHandler.c
src/backend/rewrite/rewriteManip.c
src/backend/storage/buffer/bufmgr.c
src/backend/storage/buffer/localbuf.c
src/backend/storage/ipc/procarray.c
src/backend/storage/ipc/standby.c
src/backend/storage/lmgr/lock.c
src/backend/storage/lmgr/predicate.c
src/backend/storage/lmgr/proc.c
src/backend/storage/lmgr/spin.c
src/backend/storage/page/bufpage.c
src/backend/storage/page/checksum.c
src/backend/storage/smgr/smgr.c
src/backend/tcop/postgres.c
src/backend/tcop/pquery.c
src/backend/tsearch/ts_selfuncs.c
src/backend/utils/adt/array_typanalyze.c
src/backend/utils/adt/arrayfuncs.c
src/backend/utils/adt/date.c
src/backend/utils/adt/datetime.c
src/backend/utils/adt/formatting.c
src/backend/utils/adt/json.c
src/backend/utils/adt/jsonfuncs.c
src/backend/utils/adt/misc.c
src/backend/utils/adt/numeric.c
src/backend/utils/adt/pg_locale.c
src/backend/utils/adt/pseudotypes.c
src/backend/utils/adt/rangetypes.c
src/backend/utils/adt/rangetypes_gist.c
src/backend/utils/adt/rangetypes_selfuncs.c
src/backend/utils/adt/rangetypes_spgist.c
src/backend/utils/adt/rangetypes_typanalyze.c
src/backend/utils/adt/regproc.c
src/backend/utils/adt/ri_triggers.c
src/backend/utils/adt/ruleutils.c
src/backend/utils/adt/selfuncs.c
src/backend/utils/adt/timestamp.c
src/backend/utils/adt/tsquery_rewrite.c
src/backend/utils/adt/varlena.c
src/backend/utils/adt/xml.c
src/backend/utils/cache/catcache.c
src/backend/utils/cache/evtcache.c
src/backend/utils/cache/plancache.c
src/backend/utils/cache/relcache.c
src/backend/utils/cache/syscache.c
src/backend/utils/error/elog.c
src/backend/utils/hash/dynahash.c
src/backend/utils/init/miscinit.c
src/backend/utils/init/postinit.c
src/backend/utils/mb/mbutils.c
src/backend/utils/mb/wchar.c
src/backend/utils/misc/guc.c
src/backend/utils/resowner/resowner.c
src/backend/utils/sort/tuplestore.c
src/backend/utils/time/tqual.c
src/bin/initdb/initdb.c
src/bin/pg_basebackup/pg_basebackup.c
src/bin/pg_basebackup/pg_receivexlog.c
src/bin/pg_basebackup/receivelog.c
src/bin/pg_basebackup/streamutil.c
src/bin/pg_ctl/pg_ctl.c
src/bin/pg_dump/parallel.c
src/bin/pg_dump/parallel.h
src/bin/pg_dump/pg_backup_archiver.c
src/bin/pg_dump/pg_backup_archiver.h
src/bin/pg_dump/pg_dump.c
src/bin/pg_dump/pg_dump.h
src/bin/pg_resetxlog/pg_resetxlog.c
src/bin/pgevent/pgevent.c
src/bin/psql/command.c
src/bin/psql/copy.c
src/bin/psql/create_help.pl
src/bin/psql/describe.c
src/bin/psql/print.c
src/bin/psql/startup.c
src/bin/psql/tab-complete.c
src/bin/scripts/pg_isready.c
src/common/fe_memutils.c
src/common/relpath.c
src/include/access/gist.h
src/include/access/heapam.h
src/include/access/heapam_xlog.h
src/include/access/htup_details.h
src/include/access/multixact.h
src/include/access/rmgr.h
src/include/access/sysattr.h
src/include/access/timeline.h
src/include/access/xlog.h
src/include/access/xlog_internal.h
src/include/c.h
src/include/catalog/heap.h
src/include/catalog/indexing.h
src/include/catalog/objectaccess.h
src/include/catalog/objectaddress.h
src/include/catalog/pg_class.h
src/include/catalog/pg_constraint.h
src/include/catalog/pg_control.h
src/include/catalog/pg_enum.h
src/include/catalog/pg_event_trigger.h
src/include/catalog/pg_operator.h
src/include/catalog/pg_proc.h
src/include/catalog/pg_statistic.h
src/include/commands/alter.h
src/include/commands/collationcmds.h
src/include/commands/comment.h
src/include/commands/conversioncmds.h
src/include/commands/copy.h
src/include/commands/dbcommands.h
src/include/commands/defrem.h
src/include/commands/event_trigger.h
src/include/commands/extension.h
src/include/commands/matview.h
src/include/commands/proclang.h
src/include/commands/schemacmds.h
src/include/commands/seclabel.h
src/include/commands/sequence.h
src/include/commands/tablecmds.h
src/include/commands/tablespace.h
src/include/commands/trigger.h
src/include/commands/typecmds.h
src/include/commands/user.h
src/include/commands/view.h
src/include/common/fe_memutils.h
src/include/common/relpath.h
src/include/lib/binaryheap.h
src/include/libpq/hba.h
src/include/libpq/libpq.h
src/include/libpq/pqcomm.h
src/include/mb/pg_wchar.h
src/include/miscadmin.h
src/include/nodes/parsenodes.h
src/include/nodes/primnodes.h
src/include/nodes/relation.h
src/include/optimizer/planner.h
src/include/parser/parse_node.h
src/include/parser/parse_relation.h
src/include/port.h
src/include/port/win32.h
src/include/postgres.h
src/include/postmaster/bgworker.h
src/include/postmaster/postmaster.h
src/include/replication/walreceiver.h
src/include/rewrite/rewriteDefine.h
src/include/rewrite/rewriteManip.h
src/include/storage/bufpage.h
src/include/storage/large_object.h
src/include/storage/predicate_internals.h
src/include/storage/relfilenode.h
src/include/storage/standby.h
src/include/tcop/utility.h
src/include/utils/builtins.h
src/include/utils/elog.h
src/include/utils/evtcache.h
src/include/utils/guc_tables.h
src/include/utils/jsonapi.h
src/include/utils/palloc.h
src/include/utils/plancache.h
src/include/utils/rel.h
src/include/utils/reltrigger.h
src/interfaces/ecpg/compatlib/informix.c
src/interfaces/ecpg/ecpglib/typename.c
src/interfaces/ecpg/pgtypeslib/datetime.c
src/interfaces/ecpg/pgtypeslib/interval.c
src/interfaces/ecpg/pgtypeslib/numeric.c
src/interfaces/ecpg/pgtypeslib/timestamp.c
src/interfaces/ecpg/preproc/type.c
src/interfaces/libpq/fe-auth.c
src/interfaces/libpq/fe-connect.c
src/interfaces/libpq/fe-exec.c
src/interfaces/libpq/fe-print.c
src/interfaces/libpq/fe-protocol3.c
src/interfaces/libpq/libpq-events.h
src/pl/plperl/plperl.c
src/pl/plperl/plperl.h
src/pl/plperl/plperl_helpers.h
src/pl/plpgsql/src/pl_scanner.c
src/pl/plpgsql/src/plpgsql.h
src/pl/plpython/plpy_elog.c
src/pl/plpython/plpy_util.c
src/port/pgcheckdir.c
src/port/pqsignal.c
src/port/sprompt.c
src/port/wait_error.c
src/test/isolation/isolationtester.h
src/timezone/zic.c
src/tools/copyright.pl
src/tools/git_changelog
src/tools/msvc/Install.pm
src/tools/msvc/MSBuildProject.pm
src/tools/msvc/Mkvcbuild.pm
src/tools/msvc/Project.pm
src/tools/msvc/Solution.pm
src/tools/msvc/VCBuildProject.pm
src/tools/msvc/vcregress.pl
src/tools/pginclude/pgcheckdefines
src/tools/pgindent/README
src/tools/pgindent/pgindent
src/tools/pgindent/typedefs.list

index 5c0d198b09049e579d8016c0675496717a0c4d8b..d94abcb3cf51d74b3a628f5c5af270b1ef9066aa 100644 (file)
@@ -97,7 +97,6 @@ gbt_bit_xfrm(bytea *leaf)
 static GBT_VARKEY *
 gbt_bit_l2n(GBT_VARKEY *leaf)
 {
-
    GBT_VARKEY *out = leaf;
    GBT_VARKEY_R r = gbt_var_key_readable(leaf);
    bytea      *o;
index 277820dc0a6b422ba4248b11ebeb4f6be8d493f3..56790a998317b7171be7838b0251de0805530853 100644 (file)
@@ -121,7 +121,6 @@ gbt_text_compress(PG_FUNCTION_ARGS)
 Datum
 gbt_bpchar_compress(PG_FUNCTION_ARGS)
 {
-
    GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
    GISTENTRY  *retval;
 
index 05609232d250322e6575a66c639e316a3850593e..bf82709dd8657935d15a43aa81abae5fb63431f4 100644 (file)
@@ -382,7 +382,6 @@ gbt_ts_union(PG_FUNCTION_ARGS)
 Datum
 gbt_ts_penalty(PG_FUNCTION_ARGS)
 {
-
    tsKEY      *origentry = (tsKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
    tsKEY      *newentry = (tsKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
    float      *result = (float *) PG_GETARG_POINTER(2);
index 832dbc500b12eed061a1c6b8ac883315a94ed40c..5e52ab542bfe4f82ac57e31447ca2c18b2c30017 100644 (file)
@@ -137,7 +137,6 @@ gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec, const gbtree_nin
 bool
 gbt_num_same(const GBT_NUMKEY *a, const GBT_NUMKEY *b, const gbtree_ninfo *tinfo)
 {
-
    GBT_NUMKEY_R b1,
                b2;
 
@@ -159,7 +158,6 @@ gbt_num_same(const GBT_NUMKEY *a, const GBT_NUMKEY *b, const gbtree_ninfo *tinfo
 void
 gbt_num_bin_union(Datum *u, GBT_NUMKEY *e, const gbtree_ninfo *tinfo)
 {
-
    GBT_NUMKEY_R rd;
 
    rd.lower = &e[0];
index d7387e63d6d4136dfe44fff6a5a4a3ffa3ff6a50..c7c6faafc67e76a8aa9263b241d576d93067a2c9 100644 (file)
@@ -56,7 +56,6 @@ gbt_var_decompress(PG_FUNCTION_ARGS)
 GBT_VARKEY_R
 gbt_var_key_readable(const GBT_VARKEY *k)
 {
-
    GBT_VARKEY_R r;
 
    r.lower = (bytea *) &(((char *) k)[VARHDRSZ]);
@@ -270,7 +269,6 @@ gbt_var_bin_union(Datum *u, GBT_VARKEY *e, Oid collation,
 GISTENTRY *
 gbt_var_compress(GISTENTRY *entry, const gbtree_vinfo *tinfo)
 {
-
    GISTENTRY  *retval;
 
    if (entry->leafkey)
@@ -299,7 +297,6 @@ GBT_VARKEY *
 gbt_var_union(const GistEntryVector *entryvec, int32 *size, Oid collation,
              const gbtree_vinfo *tinfo)
 {
-
    int         i = 0,
                numranges = entryvec->n;
    GBT_VARKEY *cur;
index e8ad94ba841532ca20bd441167e0b2d7df973ade..e617f9b399d61e399ddeadf7a67d8b62e280ecfe 100644 (file)
@@ -1973,7 +1973,7 @@ dblink_fdw_validator(PG_FUNCTION_ARGS)
            ereport(ERROR,
                    (errcode(ERRCODE_FDW_OUT_OF_MEMORY),
                     errmsg("out of memory"),
-                    errdetail("could not get libpq's default connection options")));
+            errdetail("could not get libpq's default connection options")));
    }
 
    /* Validate each supplied option. */
@@ -1984,9 +1984,9 @@ dblink_fdw_validator(PG_FUNCTION_ARGS)
        if (!is_valid_dblink_option(options, def->defname, context))
        {
            /*
-            * Unknown option, or invalid option for the context specified,
-            * so complain about it.  Provide a hint with list of valid
-            * options for the context.
+            * Unknown option, or invalid option for the context specified, so
+            * complain about it.  Provide a hint with list of valid options
+            * for the context.
             */
            StringInfoData buf;
            const PQconninfoOption *opt;
index d1cca1ec3ed66b091a95ec6cd258c0a9e8bd70bb..c5c797c1a4c76b445d3794e7f00948ced4aac276 100644 (file)
@@ -140,8 +140,8 @@ static void fileGetOptions(Oid foreigntableid,
               char **filename, List **other_options);
 static List *get_file_fdw_attribute_options(Oid relid);
 static bool check_selective_binary_conversion(RelOptInfo *baserel,
-                                             Oid foreigntableid,
-                                             List **columns);
+                                 Oid foreigntableid,
+                                 List **columns);
 static void estimate_size(PlannerInfo *root, RelOptInfo *baserel,
              FileFdwPlanState *fdw_private);
 static void estimate_costs(PlannerInfo *root, RelOptInfo *baserel,
@@ -478,7 +478,7 @@ fileGetForeignPaths(PlannerInfo *root,
                   &startup_cost, &total_cost);
 
    /*
-    * Create a ForeignPath node and add it as only possible path.  We use the
+    * Create a ForeignPath node and add it as only possible path.  We use the
     * fdw_private list of the path to carry the convert_selectively option;
     * it will be propagated into the fdw_private list of the Plan node.
     */
@@ -770,7 +770,7 @@ check_selective_binary_conversion(RelOptInfo *baserel,
    /* Add all the attributes used by restriction clauses. */
    foreach(lc, baserel->baserestrictinfo)
    {
-       RestrictInfo   *rinfo = (RestrictInfo *) lfirst(lc);
+       RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);
 
        pull_varattnos((Node *) rinfo->clause, baserel->relid,
                       &attrs_used);
index 088f0058ed064130e96265a57f40de0c4a85a957..7df960645c79b54e90574772b2deccdd1e231fbb 100644 (file)
@@ -1300,7 +1300,7 @@ hstore_to_json_loose(PG_FUNCTION_ARGS)
             * digit as numeric - could be a zip code or similar
             */
            if (src->len > 0 &&
-               !(src->data[0] == '0' && isdigit((unsigned char) src->data[1])) &&
+           !(src->data[0] == '0' && isdigit((unsigned char) src->data[1])) &&
                strspn(src->data, "+-0123456789Ee.") == src->len)
            {
                /*
@@ -1308,9 +1308,9 @@ hstore_to_json_loose(PG_FUNCTION_ARGS)
                 * value. Ignore any actual parsed value.
                 */
                char       *endptr = "junk";
-               long        lval;
+               long        lval;
 
-               lval =  strtol(src->data, &endptr, 10);
+               lval = strtol(src->data, &endptr, 10);
                (void) lval;
                if (*endptr == '\0')
                {
@@ -1323,7 +1323,7 @@ hstore_to_json_loose(PG_FUNCTION_ARGS)
                else
                {
                    /* not an int - try a double */
-                   double dval;
+                   double      dval;
 
                    dval = strtod(src->data, &endptr);
                    (void) dval;
index 8341a1ffeffe8091fae093c272879add0f6e3d28..cdec94205bc13842780f8f4466c2053df9e1e848 100644 (file)
@@ -215,7 +215,7 @@ add_one_elt(char *eltname, eary *eary)
    {
        eary      ->alloc *= 2;
        eary      ->array = (char **) pg_realloc(eary->array,
-                                                eary->alloc * sizeof(char *));
+                                              eary->alloc * sizeof(char *));
    }
 
    eary      ->array[eary->num] = pg_strdup(eltname);
index e97a11cb49a8519ba2ba0b5416a333a6a2a04309..f12331a62ecaef4b8966aa1d24e0847820dece1d 100644 (file)
@@ -299,8 +299,8 @@ main(int argc, char **argv)
                dryrun = true;
                break;
            case 'x':
-               additional_ext = strdup(optarg);        /* Extension to remove from
-                                                * xlogfile names */
+               additional_ext = strdup(optarg);        /* Extension to remove
+                                                        * from xlogfile names */
                break;
            default:
                fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);
index 11615eb438b81bcccaac16ce8e93106e99c8ffdb..a3f40fbe61aa3da876414da8e6a640f47688b193 100644 (file)
@@ -593,7 +593,7 @@ main(int argc, char **argv)
     * There's no way to trigger failover via signal on Windows.
     */
    (void) pqsignal(SIGUSR1, sighandler);
-   (void) pqsignal(SIGINT, sighandler);    /* deprecated, use SIGUSR1 */
+   (void) pqsignal(SIGINT, sighandler);        /* deprecated, use SIGUSR1 */
    (void) pqsignal(SIGQUIT, sigquit_handler);
 #endif
 
index 191c621376ef0e2b6ff444c25948e43a7d5eab26..0bf9127e105a8cd53cfcd86cb466205893faae67 100644 (file)
@@ -18,7 +18,7 @@ static uint64 test_timing(int32);
 static void output(uint64 loop_count);
 
 /* record duration in powers of 2 microseconds */
-int64 histogram[32];
+int64      histogram[32];
 
 int
 main(int argc, char *argv[])
@@ -110,8 +110,11 @@ test_timing(int32 duration)
    uint64      total_time;
    int64       time_elapsed = 0;
    uint64      loop_count = 0;
-   uint64      prev, cur;
-   instr_time  start_time, end_time, temp;
+   uint64      prev,
+               cur;
+   instr_time  start_time,
+               end_time,
+               temp;
 
    total_time = duration > 0 ? duration * 1000000 : 0;
 
@@ -120,7 +123,8 @@ test_timing(int32 duration)
 
    while (time_elapsed < total_time)
    {
-       int32       diff, bits = 0;
+       int32       diff,
+                   bits = 0;
 
        prev = cur;
        INSTR_TIME_SET_CURRENT(temp);
@@ -163,12 +167,13 @@ test_timing(int32 duration)
 static void
 output(uint64 loop_count)
 {
-   int64       max_bit = 31, i;
+   int64       max_bit = 31,
+               i;
 
    /* find highest bit value */
    while (max_bit > 0 && histogram[max_bit] == 0)
        max_bit--;
-       
+
    printf("Histogram of timing durations:\n");
    printf("%6s   %10s %10s\n", "< usec", "% of total", "count");
 
@@ -179,6 +184,6 @@ output(uint64 loop_count)
        /* lame hack to work around INT64_FORMAT deficiencies */
        snprintf(buf, sizeof(buf), INT64_FORMAT, histogram[i]);
        printf("%6ld    %9.5f %10s\n", 1l << i,
-               (double) histogram[i] * 100 / loop_count, buf);
+              (double) histogram[i] * 100 / loop_count, buf);
    }
 }
index 76e470c77855fd7b6bbd85299edef5907ff83fc7..c632a586639c2cc27a0990e9b261c57a5581a347 100644 (file)
@@ -347,8 +347,8 @@ get_wildcard_part(const char *str, int lenstr,
            else
            {
                /*
-                * Back up endword to the escape character when stopping at
-                * an escaped char, so that subsequent get_wildcard_part will
+                * Back up endword to the escape character when stopping at an
+                * escaped char, so that subsequent get_wildcard_part will
                 * restart from the escape character.  We assume here that
                 * escape chars are single-byte.
                 */
index 35783d0a2038adc546304510c3f771f9f07b7b10..1f67e602defd362d3a8e66ab6b987d71f3df43ec 100644 (file)
@@ -28,7 +28,7 @@ static char *get_canonical_locale_name(int category, const char *locale);
  * fix_path_separator
  * For non-Windows, just return the argument.
  * For Windows convert any forward slash to a backslash
- * such as is suitable for arguments to builtin commands 
+ * such as is suitable for arguments to builtin commands
  * like RMDIR and DEL.
  */
 static char *
@@ -36,8 +36,8 @@ fix_path_separator(char *path)
 {
 #ifdef WIN32
 
-   char *result;
-   char *c;
+   char       *result;
+   char       *c;
 
    result = pg_strdup(path);
 
@@ -46,11 +46,9 @@ fix_path_separator(char *path)
            *c = '\\';
 
    return result;
-
 #else
 
    return path;
-
 #endif
 }
 
@@ -156,21 +154,21 @@ check_new_cluster(void)
    check_is_super_user(&new_cluster);
 
    /*
-    *  We don't restore our own user, so both clusters must match have
-    *  matching install-user oids.
+    * We don't restore our own user, so both clusters must match have
+    * matching install-user oids.
     */
    if (old_cluster.install_role_oid != new_cluster.install_role_oid)
        pg_log(PG_FATAL,
-       "Old and new cluster install users have different values for pg_authid.oid.\n");
+              "Old and new cluster install users have different values for pg_authid.oid.\n");
 
    /*
-    *  We only allow the install user in the new cluster because other
-    *  defined users might match users defined in the old cluster and
-    *  generate an error during pg_dump restore.
+    * We only allow the install user in the new cluster because other defined
+    * users might match users defined in the old cluster and generate an
+    * error during pg_dump restore.
     */
    if (new_cluster.role_count != 1)
        pg_log(PG_FATAL, "Only the install user can be defined in the new cluster.\n");
-    
+
    check_for_prepared_transactions(&new_cluster);
 }
 
@@ -247,14 +245,14 @@ output_completion_banner(char *analyze_script_file_name,
 
    if (deletion_script_file_name)
        pg_log(PG_REPORT,
-              "Running this script will delete the old cluster's data files:\n"
+           "Running this script will delete the old cluster's data files:\n"
               "    %s\n",
               deletion_script_file_name);
    else
        pg_log(PG_REPORT,
               "Could not create a script to delete the old cluster's data\n"
-              "files because user-defined tablespaces exist in the old cluster\n"
-              "directory.  The old cluster's contents must be deleted manually.\n");
+         "files because user-defined tablespaces exist in the old cluster\n"
+       "directory.  The old cluster's contents must be deleted manually.\n");
 }
 
 
@@ -323,8 +321,8 @@ check_cluster_compatibility(bool live_check)
    /* We read the real port number for PG >= 9.1 */
    if (live_check && GET_MAJOR_VERSION(old_cluster.major_version) < 901 &&
        old_cluster.port == DEF_PGUPORT)
-           pg_log(PG_FATAL, "When checking a pre-PG 9.1 live old server, "
-                  "you must specify the old server's port number.\n");
+       pg_log(PG_FATAL, "When checking a pre-PG 9.1 live old server, "
+              "you must specify the old server's port number.\n");
 
    if (live_check && old_cluster.port == new_cluster.port)
        pg_log(PG_FATAL, "When checking a live server, "
@@ -366,18 +364,18 @@ set_locale_and_encoding(ClusterInfo *cluster)
        if (GET_MAJOR_VERSION(cluster->major_version) < 902)
        {
            /*
-            *  Pre-9.2 did not canonicalize the supplied locale names
-            *  to match what the system returns, while 9.2+ does, so
-            *  convert pre-9.2 to match.
+            * Pre-9.2 did not canonicalize the supplied locale names to match
+            * what the system returns, while 9.2+ does, so convert pre-9.2 to
+            * match.
             */
            ctrl->lc_collate = get_canonical_locale_name(LC_COLLATE,
-                              pg_strdup(PQgetvalue(res, 0, i_datcollate)));
+                               pg_strdup(PQgetvalue(res, 0, i_datcollate)));
            ctrl->lc_ctype = get_canonical_locale_name(LC_CTYPE,
-                              pg_strdup(PQgetvalue(res, 0, i_datctype)));
-       }
+                                 pg_strdup(PQgetvalue(res, 0, i_datctype)));
+       }
        else
        {
-           ctrl->lc_collate = pg_strdup(PQgetvalue(res, 0, i_datcollate));
+           ctrl->lc_collate = pg_strdup(PQgetvalue(res, 0, i_datcollate));
            ctrl->lc_ctype = pg_strdup(PQgetvalue(res, 0, i_datctype));
        }
 
@@ -410,21 +408,21 @@ check_locale_and_encoding(ControlData *oldctrl,
                          ControlData *newctrl)
 {
    /*
-    *  These are often defined with inconsistent case, so use pg_strcasecmp().
-    *  They also often use inconsistent hyphenation, which we cannot fix, e.g.
-    *  UTF-8 vs. UTF8, so at least we display the mismatching values.
+    * These are often defined with inconsistent case, so use pg_strcasecmp().
+    * They also often use inconsistent hyphenation, which we cannot fix, e.g.
+    * UTF-8 vs. UTF8, so at least we display the mismatching values.
     */
    if (pg_strcasecmp(oldctrl->lc_collate, newctrl->lc_collate) != 0)
        pg_log(PG_FATAL,
-              "lc_collate cluster values do not match:  old \"%s\", new \"%s\"\n",
+        "lc_collate cluster values do not match:  old \"%s\", new \"%s\"\n",
               oldctrl->lc_collate, newctrl->lc_collate);
    if (pg_strcasecmp(oldctrl->lc_ctype, newctrl->lc_ctype) != 0)
        pg_log(PG_FATAL,
-              "lc_ctype cluster values do not match:  old \"%s\", new \"%s\"\n",
+          "lc_ctype cluster values do not match:  old \"%s\", new \"%s\"\n",
               oldctrl->lc_ctype, newctrl->lc_ctype);
    if (pg_strcasecmp(oldctrl->encoding, newctrl->encoding) != 0)
        pg_log(PG_FATAL,
-              "encoding cluster values do not match:  old \"%s\", new \"%s\"\n",
+          "encoding cluster values do not match:  old \"%s\", new \"%s\"\n",
               oldctrl->encoding, newctrl->encoding);
 }
 
@@ -597,16 +595,16 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)
             SCRIPT_EXT);
 
    /*
-    *  Some users (oddly) create tablespaces inside the cluster data
-    *  directory.  We can't create a proper old cluster delete script
-    *  in that case.
+    * Some users (oddly) create tablespaces inside the cluster data
+    * directory.  We can't create a proper old cluster delete script in that
+    * case.
     */
    strlcpy(old_cluster_pgdata, old_cluster.pgdata, MAXPGPATH);
    canonicalize_path(old_cluster_pgdata);
    for (tblnum = 0; tblnum < os_info.num_old_tablespaces; tblnum++)
    {
        char        old_tablespace_dir[MAXPGPATH];
-       
+
        strlcpy(old_tablespace_dir, os_info.old_tablespaces[tblnum], MAXPGPATH);
        canonicalize_path(old_tablespace_dir);
        if (path_is_prefix_of_path(old_cluster_pgdata, old_tablespace_dir))
@@ -649,7 +647,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)
            /* remove PG_VERSION? */
            if (GET_MAJOR_VERSION(old_cluster.major_version) <= 804)
                fprintf(script, RM_CMD " %s%s%cPG_VERSION\n",
-                       fix_path_separator(os_info.old_tablespaces[tblnum]), 
+                       fix_path_separator(os_info.old_tablespaces[tblnum]),
                        fix_path_separator(old_cluster.tablespace_suffix),
                        PATH_SEPARATOR);
 
@@ -668,7 +666,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)
             * or a version-specific subdirectory.
             */
            fprintf(script, RMDIR_CMD " %s%s\n",
-                   fix_path_separator(os_info.old_tablespaces[tblnum]), 
+                   fix_path_separator(os_info.old_tablespaces[tblnum]),
                    fix_path_separator(old_cluster.tablespace_suffix));
    }
 
@@ -997,7 +995,7 @@ get_canonical_locale_name(int category, const char *locale)
 
    save = setlocale(category, NULL);
    if (!save)
-        pg_log(PG_FATAL, "failed to get the current locale\n");
+       pg_log(PG_FATAL, "failed to get the current locale\n");
 
    /* 'save' may be pointing at a modifiable scratch variable, so copy it. */
    save = pg_strdup(save);
@@ -1006,13 +1004,13 @@ get_canonical_locale_name(int category, const char *locale)
    res = setlocale(category, locale);
 
    if (!res)
-        pg_log(PG_FATAL, "failed to get system local name for \"%s\"\n", res);
+       pg_log(PG_FATAL, "failed to get system local name for \"%s\"\n", res);
 
    res = pg_strdup(res);
 
    /* restore old value. */
    if (!setlocale(category, save))
-        pg_log(PG_FATAL, "failed to restore old locale \"%s\"\n", save);
+       pg_log(PG_FATAL, "failed to restore old locale \"%s\"\n", save);
 
    pg_free(save);
 
index d1acff5c9f87b2517e0f9bbdef9d564d4a438d0a..d2d8785271d9543717f04927c3bc3a8aac50c9dc 100644 (file)
@@ -472,10 +472,10 @@ get_control_data(ClusterInfo *cluster, bool live_check)
    pg_free(lc_messages);
 
    /*
-    * Before 9.3, pg_resetxlog reported the xlogid and segno of the first
-    * log file after reset as separate lines. Starting with 9.3, it reports
-    * the WAL file name. If the old cluster is older than 9.3, we construct
-    * the WAL file name from the xlogid and segno.
+    * Before 9.3, pg_resetxlog reported the xlogid and segno of the first log
+    * file after reset as separate lines. Starting with 9.3, it reports the
+    * WAL file name. If the old cluster is older than 9.3, we construct the
+    * WAL file name from the xlogid and segno.
     */
    if (GET_MAJOR_VERSION(cluster->major_version) <= 902)
    {
@@ -499,8 +499,8 @@ get_control_data(ClusterInfo *cluster, bool live_check)
        !got_date_is_int || !got_float8_pass_by_value || !got_data_checksum_version)
    {
        pg_log(PG_REPORT,
-           "The %s cluster lacks some required control information:\n",
-           CLUSTER_NAME(cluster));
+              "The %s cluster lacks some required control information:\n",
+              CLUSTER_NAME(cluster));
 
        if (!got_xid)
            pg_log(PG_REPORT, "  checkpoint next XID\n");
@@ -576,7 +576,7 @@ check_control_data(ControlData *oldctrl,
 {
    if (oldctrl->align == 0 || oldctrl->align != newctrl->align)
        pg_log(PG_FATAL,
-              "old and new pg_controldata alignments are invalid or do not match\n"
+       "old and new pg_controldata alignments are invalid or do not match\n"
               "Likely one cluster is a 32-bit install, the other 64-bit\n");
 
    if (oldctrl->blocksz == 0 || oldctrl->blocksz != newctrl->blocksz)
@@ -621,7 +621,10 @@ check_control_data(ControlData *oldctrl,
               "options.\n");
    }
 
-   /* We might eventually allow upgrades from checksum to no-checksum clusters. */
+   /*
+    * We might eventually allow upgrades from checksum to no-checksum
+    * clusters.
+    */
    if (oldctrl->data_checksum_version != newctrl->data_checksum_version)
    {
        pg_log(PG_FATAL,
index af752a66d0067428a956fcee39e4952f82335d7a..005ded4af4995b805ecc72209f222a070b11b162 100644 (file)
@@ -44,6 +44,7 @@ exec_prog(const char *log_file, const char *opt_log_file,
 {
    int         result;
    int         written;
+
 #define MAXCMDLEN (2 * MAXPGPATH)
    char        cmd[MAXCMDLEN];
    mode_t      old_umask = 0;
@@ -67,15 +68,15 @@ exec_prog(const char *log_file, const char *opt_log_file,
 
 #ifdef WIN32
    {
-       /* 
-        * "pg_ctl -w stop" might have reported that the server has
-        * stopped because the postmaster.pid file has been removed,
-        * but "pg_ctl -w start" might still be in the process of
-        * closing and might still be holding its stdout and -l log
-        * file descriptors open.  Therefore, try to open the log 
-        * file a few more times.
+       /*
+        * "pg_ctl -w stop" might have reported that the server has stopped
+        * because the postmaster.pid file has been removed, but "pg_ctl -w
+        * start" might still be in the process of closing and might still be
+        * holding its stdout and -l log file descriptors open.  Therefore,
+        * try to open the log file a few more times.
         */
-       int iter;
+       int         iter;
+
        for (iter = 0; iter < 4 && log == NULL; iter++)
        {
            sleep(1);
@@ -122,12 +123,13 @@ exec_prog(const char *log_file, const char *opt_log_file,
    }
 
 #ifndef WIN32
-   /* 
-    *  We can't do this on Windows because it will keep the "pg_ctl start"
-    *  output filename open until the server stops, so we do the \n\n above
-    *  on that platform.  We use a unique filename for "pg_ctl start" that is
-    *  never reused while the server is running, so it works fine.  We could
-    *  log these commands to a third file, but that just adds complexity.
+
+   /*
+    * We can't do this on Windows because it will keep the "pg_ctl start"
+    * output filename open until the server stops, so we do the \n\n above on
+    * that platform.  We use a unique filename for "pg_ctl start" that is
+    * never reused while the server is running, so it works fine.  We could
+    * log these commands to a third file, but that just adds complexity.
     */
    if ((log = fopen_priv(log_file, "a")) == NULL)
        pg_log(PG_FATAL, "cannot write to log file %s\n", log_file);
@@ -178,7 +180,6 @@ pid_lock_file_exists(const char *datadir)
 void
 verify_directories(void)
 {
-
 #ifndef WIN32
    if (access(".", R_OK | W_OK | X_OK) != 0)
 #else
index 62e8deb69b503bf5a86bd09504dd168495a4adfd..dfeb79f255d9524af7bd6b06961746b1dd67fcb8 100644 (file)
@@ -127,14 +127,13 @@ linkAndUpdateFile(pageCnvCtx *pageConverter,
 static int
 copy_file(const char *srcfile, const char *dstfile, bool force)
 {
-
 #define COPY_BUF_SIZE (50 * BLCKSZ)
 
    int         src_fd;
    int         dest_fd;
    char       *buffer;
    int         ret = 0;
-   int         save_errno = 0;
+   int         save_errno = 0;
 
    if ((srcfile == NULL) || (dstfile == NULL))
        return -1;
index c5c36981eab56568db4ff30427bbe0ad01655753..72b515d12e03a8c790f319df9cc459792166c148 100644 (file)
@@ -60,10 +60,9 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db,
         * table names change during ALTER TABLE ALTER COLUMN SET TYPE. In >=
         * 9.0, TOAST relation names always use heap table oids, hence we
         * cannot check relation names when upgrading from pre-9.0. Clusters
-        * upgraded to 9.0 will get matching TOAST names.
-        * If index names don't match primary key constraint names, this will
-        * fail because pg_dump dumps constraint names and pg_upgrade checks
-        * index names.
+        * upgraded to 9.0 will get matching TOAST names. If index names don't
+        * match primary key constraint names, this will fail because pg_dump
+        * dumps constraint names and pg_upgrade checks index names.
         */
        if (strcmp(old_rel->nspname, new_rel->nspname) != 0 ||
            ((GET_MAJOR_VERSION(old_cluster.major_version) >= 900 ||
@@ -79,7 +78,10 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db,
        num_maps++;
    }
 
-   /* Do this check after the loop so hopefully we will produce a clearer error above */
+   /*
+    * Do this check after the loop so hopefully we will produce a clearer
+    * error above
+    */
    if (old_db->rel_arr.nrels != new_db->rel_arr.nrels)
        pg_log(PG_FATAL, "old and new databases \"%s\" have a different number of relations\n",
               old_db->db_name);
@@ -285,8 +287,11 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
             "LEFT OUTER JOIN pg_catalog.pg_index i "
             "     ON c.oid = i.indexrelid "
             "WHERE relkind IN ('r', 'm', 'i'%s) AND "
-           /* pg_dump only dumps valid indexes;  testing indisready is
-            * necessary in 9.2, and harmless in earlier/later versions. */
+
+   /*
+    * pg_dump only dumps valid indexes;  testing indisready is necessary in
+    * 9.2, and harmless in earlier/later versions.
+    */
             " i.indisvalid IS DISTINCT FROM false AND "
             " i.indisready IS DISTINCT FROM false AND "
    /* exclude possible orphaned temp tables */
@@ -309,8 +314,8 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
    PQclear(executeQueryOrDie(conn, "%s", query));
 
    /*
-    *  Get TOAST tables and indexes;  we have to gather the TOAST tables in
-    *  later steps because we can't schema-qualify TOAST tables.
+    * Get TOAST tables and indexes;  we have to gather the TOAST tables in
+    * later steps because we can't schema-qualify TOAST tables.
     */
    PQclear(executeQueryOrDie(conn,
                              "INSERT INTO info_rels "
@@ -335,8 +340,8 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
    /* we preserve pg_class.oid so we sort by it to match old/new */
             "ORDER BY 1;",
    /* 9.2 removed the spclocation column */
-          (GET_MAJOR_VERSION(cluster->major_version) <= 901) ?
-          "t.spclocation" : "pg_catalog.pg_tablespace_location(t.oid) AS spclocation");
+            (GET_MAJOR_VERSION(cluster->major_version) <= 901) ?
+            "t.spclocation" : "pg_catalog.pg_tablespace_location(t.oid) AS spclocation");
 
    res = executeQueryOrDie(conn, "%s", query);
 
@@ -437,5 +442,5 @@ print_rel_infos(RelInfoArr *rel_arr)
    for (relnum = 0; relnum < rel_arr->nrels; relnum++)
        pg_log(PG_VERBOSE, "relname: %s.%s: reloid: %u reltblspace: %s\n",
               rel_arr->rels[relnum].nspname, rel_arr->rels[relnum].relname,
-              rel_arr->rels[relnum].reloid, rel_arr->rels[relnum].tablespace);
+            rel_arr->rels[relnum].reloid, rel_arr->rels[relnum].tablespace);
 }
index aee8d3d15374ed15ec45a1aa93d3ec5f862d0f85..1459ca9096694705abb7df71f3351e5f508b023f 100644 (file)
@@ -314,8 +314,8 @@ check_required_directory(char **dirpath, char **configpath,
    }
 
    /*
-    * Trim off any trailing path separators because we construct paths
-    * by appending to this path.
+    * Trim off any trailing path separators because we construct paths by
+    * appending to this path.
     */
 #ifndef WIN32
    if ((*dirpath)[strlen(*dirpath) - 1] == '/')
@@ -398,10 +398,10 @@ void
 get_sock_dir(ClusterInfo *cluster, bool live_check)
 {
 #ifdef HAVE_UNIX_SOCKETS
+
    /*
-    *  sockdir and port were added to postmaster.pid in PG 9.1.
-    *  Pre-9.1 cannot process pg_ctl -w for sockets in non-default
-    *  locations.
+    * sockdir and port were added to postmaster.pid in PG 9.1. Pre-9.1 cannot
+    * process pg_ctl -w for sockets in non-default locations.
     */
    if (GET_MAJOR_VERSION(cluster->major_version) >= 901)
    {
@@ -415,26 +415,28 @@ get_sock_dir(ClusterInfo *cluster, bool live_check)
        else
        {
            /*
-            *  If we are doing a live check, we will use the old cluster's Unix
-            *  domain socket directory so we can connect to the live server.
+            * If we are doing a live check, we will use the old cluster's
+            * Unix domain socket directory so we can connect to the live
+            * server.
             */
            unsigned short orig_port = cluster->port;
-           char        filename[MAXPGPATH], line[MAXPGPATH];
-           FILE        *fp;
+           char        filename[MAXPGPATH],
+                       line[MAXPGPATH];
+           FILE       *fp;
            int         lineno;
-   
+
            snprintf(filename, sizeof(filename), "%s/postmaster.pid",
                     cluster->pgdata);
            if ((fp = fopen(filename, "r")) == NULL)
                pg_log(PG_FATAL, "Cannot open file %s: %m\n", filename);
-   
+
            for (lineno = 1;
-                lineno <= Max(LOCK_FILE_LINE_PORT, LOCK_FILE_LINE_SOCKET_DIR);
+              lineno <= Max(LOCK_FILE_LINE_PORT, LOCK_FILE_LINE_SOCKET_DIR);
                 lineno++)
            {
                if (fgets(line, sizeof(line), fp) == NULL)
                    pg_log(PG_FATAL, "Cannot read line %d from %s: %m\n", lineno, filename);
-   
+
                /* potentially overwrite user-supplied value */
                if (lineno == LOCK_FILE_LINE_PORT)
                    sscanf(line, "%hu", &old_cluster.port);
@@ -446,18 +448,21 @@ get_sock_dir(ClusterInfo *cluster, bool live_check)
                }
            }
            fclose(fp);
-   
+
            /* warn of port number correction */
            if (orig_port != DEF_PGUPORT && old_cluster.port != orig_port)
                pg_log(PG_WARNING, "User-supplied old port number %hu corrected to %hu\n",
-               orig_port, cluster->port);
+                      orig_port, cluster->port);
        }
    }
    else
-       /* Can't get sockdir and pg_ctl -w can't use a non-default, use default */
-       cluster->sockdir = NULL;
 
-#else /* !HAVE_UNIX_SOCKETS */
+       /*
+        * Can't get sockdir and pg_ctl -w can't use a non-default, use
+        * default
+        */
+       cluster->sockdir = NULL;
+#else                          /* !HAVE_UNIX_SOCKETS */
    cluster->sockdir = NULL;
 #endif
 }
index fb044d1b62c9f603c8d9b83d232bde2d34aca047..8f8527df5c6602c37bc17fb095e3d481d3020e64 100644 (file)
@@ -59,11 +59,11 @@ setupPageConverter(void)
    if (newPageVersion != oldPageVersion)
    {
        /*
-        * The clusters use differing page layouts, see if we can find a plugin
-        * that knows how to convert from the old page layout to the new page
-        * layout.
+        * The clusters use differing page layouts, see if we can find a
+        * plugin that knows how to convert from the old page layout to the
+        * new page layout.
         */
-   
+
        if ((converter = loadConverterPlugin(newPageVersion, oldPageVersion)) == NULL)
            pg_log(PG_FATAL, "could not find plugin to convert from old page layout to new page layout\n");
 
@@ -161,6 +161,4 @@ loadConverterPlugin(uint16 newPageVersion, uint16 oldPageVersion)
    }
 }
 
-
-
 #endif
index 688a53112c2f8a884282fab5ef46bbf62aec94f6..8725170d1b544f6a7950ece8443ff50b6ac54334 100644 (file)
@@ -20,7 +20,7 @@
 #include <io.h>
 #endif
 
-static int parallel_jobs;
+static int parallel_jobs;
 
 #ifdef WIN32
 /*
@@ -28,31 +28,32 @@ static int parallel_jobs;
  * it can be passed to WaitForMultipleObjects().  We use two arrays
  * so the thread_handles array can be passed to WaitForMultipleObjects().
  */
-HANDLE *thread_handles;
+HANDLE    *thread_handles;
 
-typedef struct {
-   char log_file[MAXPGPATH];
-   char opt_log_file[MAXPGPATH];
-   char cmd[MAX_STRING];
+typedef struct
+{
+   char        log_file[MAXPGPATH];
+   char        opt_log_file[MAXPGPATH];
+   char        cmd[MAX_STRING];
 } exec_thread_arg;
 
-typedef struct {
-   DbInfoArr *old_db_arr;
-   DbInfoArr *new_db_arr;
-   char old_pgdata[MAXPGPATH];
-   char new_pgdata[MAXPGPATH];
-   char old_tablespace[MAXPGPATH];
+typedef struct
+{
+   DbInfoArr  *old_db_arr;
+   DbInfoArr  *new_db_arr;
+   char        old_pgdata[MAXPGPATH];
+   char        new_pgdata[MAXPGPATH];
+   char        old_tablespace[MAXPGPATH];
 } transfer_thread_arg;
 
 exec_thread_arg **exec_thread_args;
 transfer_thread_arg **transfer_thread_args;
 
 /* track current thread_args struct so reap_child() can be used for all cases */
-void **cur_thread_args;
-
-DWORD win32_exec_prog(exec_thread_arg *args);
-DWORD win32_transfer_all_new_dbs(transfer_thread_arg *args);
+void     **cur_thread_args;
 
+DWORD      win32_exec_prog(exec_thread_arg *args);
+DWORD      win32_transfer_all_new_dbs(transfer_thread_arg *args);
 #endif
 
 /*
@@ -67,11 +68,12 @@ parallel_exec_prog(const char *log_file, const char *opt_log_file,
 {
    va_list     args;
    char        cmd[MAX_STRING];
+
 #ifndef WIN32
    pid_t       child;
 #else
    HANDLE      child;
-   exec_thread_arg *new_arg;
+   exec_thread_arg *new_arg;
 #endif
 
    va_start(args, fmt);
@@ -85,8 +87,8 @@ parallel_exec_prog(const char *log_file, const char *opt_log_file,
    {
        /* parallel */
 #ifdef WIN32
-       cur_thread_args = (void **)exec_thread_args;
-#endif 
+       cur_thread_args = (void **) exec_thread_args;
+#endif
        /* harvest any dead children */
        while (reap_child(false) == true)
            ;
@@ -94,10 +96,10 @@ parallel_exec_prog(const char *log_file, const char *opt_log_file,
        /* must we wait for a dead child? */
        if (parallel_jobs >= user_opts.jobs)
            reap_child(true);
-           
+
        /* set this before we start the job */
        parallel_jobs++;
-   
+
        /* Ensure stdio state is quiesced before forking */
        fflush(NULL);
 
@@ -112,22 +114,22 @@ parallel_exec_prog(const char *log_file, const char *opt_log_file,
 #else
        if (thread_handles == NULL)
        {
-           int i;
+           int         i;
 
            thread_handles = pg_malloc(user_opts.jobs * sizeof(HANDLE));
            exec_thread_args = pg_malloc(user_opts.jobs * sizeof(exec_thread_arg *));
 
            /*
-            *  For safety and performance, we keep the args allocated during
-            *  the entire life of the process, and we don't free the args
-            *  in a thread different from the one that allocated it.
+            * For safety and performance, we keep the args allocated during
+            * the entire life of the process, and we don't free the args in a
+            * thread different from the one that allocated it.
             */
            for (i = 0; i < user_opts.jobs; i++)
                exec_thread_args[i] = pg_malloc(sizeof(exec_thread_arg));
        }
 
        /* use first empty array element */
-       new_arg = exec_thread_args[parallel_jobs-1];
+       new_arg = exec_thread_args[parallel_jobs - 1];
 
        /* Can only pass one pointer into the function, so use a struct */
        strcpy(new_arg->log_file, log_file);
@@ -135,11 +137,11 @@ parallel_exec_prog(const char *log_file, const char *opt_log_file,
        strcpy(new_arg->cmd, cmd);
 
        child = (HANDLE) _beginthreadex(NULL, 0, (void *) win32_exec_prog,
-                       new_arg, 0, NULL);
+                                       new_arg, 0, NULL);
        if (child == 0)
            pg_log(PG_FATAL, "could not create worker thread: %s\n", strerror(errno));
 
-       thread_handles[parallel_jobs-1] = child;
+       thread_handles[parallel_jobs - 1] = child;
 #endif
    }
 
@@ -151,7 +153,7 @@ parallel_exec_prog(const char *log_file, const char *opt_log_file,
 DWORD
 win32_exec_prog(exec_thread_arg *args)
 {
-   int ret;
+   int         ret;
 
    ret = !exec_prog(args->log_file, args->opt_log_file, true, "%s", args->cmd);
 
@@ -167,15 +169,16 @@ win32_exec_prog(exec_thread_arg *args)
  * This has the same API as transfer_all_new_dbs, except it does parallel execution
  * by transfering multiple tablespaces in parallel
  */
-void parallel_transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
-                                  char *old_pgdata, char *new_pgdata,
-                                  char *old_tablespace)
+void
+parallel_transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
+                             char *old_pgdata, char *new_pgdata,
+                             char *old_tablespace)
 {
 #ifndef WIN32
    pid_t       child;
 #else
    HANDLE      child;
-   transfer_thread_arg *new_arg;
+   transfer_thread_arg *new_arg;
 #endif
 
    if (user_opts.jobs <= 1)
@@ -185,7 +188,7 @@ void parallel_transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
    {
        /* parallel */
 #ifdef WIN32
-       cur_thread_args = (void **)transfer_thread_args;
+       cur_thread_args = (void **) transfer_thread_args;
 #endif
        /* harvest any dead children */
        while (reap_child(false) == true)
@@ -194,10 +197,10 @@ void parallel_transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
        /* must we wait for a dead child? */
        if (parallel_jobs >= user_opts.jobs)
            reap_child(true);
-           
+
        /* set this before we start the job */
        parallel_jobs++;
-   
+
        /* Ensure stdio state is quiesced before forking */
        fflush(NULL);
 
@@ -217,22 +220,22 @@ void parallel_transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
 #else
        if (thread_handles == NULL)
        {
-           int i;
+           int         i;
 
            thread_handles = pg_malloc(user_opts.jobs * sizeof(HANDLE));
            transfer_thread_args = pg_malloc(user_opts.jobs * sizeof(transfer_thread_arg *));
 
            /*
-            *  For safety and performance, we keep the args allocated during
-            *  the entire life of the process, and we don't free the args
-            *  in a thread different from the one that allocated it.
+            * For safety and performance, we keep the args allocated during
+            * the entire life of the process, and we don't free the args in a
+            * thread different from the one that allocated it.
             */
            for (i = 0; i < user_opts.jobs; i++)
                transfer_thread_args[i] = pg_malloc(sizeof(transfer_thread_arg));
        }
 
        /* use first empty array element */
-       new_arg = transfer_thread_args[parallel_jobs-1];
+       new_arg = transfer_thread_args[parallel_jobs - 1];
 
        /* Can only pass one pointer into the function, so use a struct */
        new_arg->old_db_arr = old_db_arr;
@@ -242,11 +245,11 @@ void parallel_transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
        strcpy(new_arg->old_tablespace, old_tablespace);
 
        child = (HANDLE) _beginthreadex(NULL, 0, (void *) win32_exec_prog,
-                       new_arg, 0, NULL);
+                                       new_arg, 0, NULL);
        if (child == 0)
            pg_log(PG_FATAL, "could not create worker thread: %s\n", strerror(errno));
 
-       thread_handles[parallel_jobs-1] = child;
+       thread_handles[parallel_jobs - 1] = child;
 #endif
    }
 
@@ -274,11 +277,11 @@ bool
 reap_child(bool wait_for_child)
 {
 #ifndef WIN32
-   int work_status;
-   int ret;
+   int         work_status;
+   int         ret;
 #else
-   int             thread_num;
-   DWORD           res;
+   int         thread_num;
+   DWORD       res;
 #endif
 
    if (user_opts.jobs <= 1 || parallel_jobs == 0)
@@ -293,18 +296,17 @@ reap_child(bool wait_for_child)
 
    if (WEXITSTATUS(work_status) != 0)
        pg_log(PG_FATAL, "child worker exited abnormally: %s\n", strerror(errno));
-
 #else
    /* wait for one to finish */
    thread_num = WaitForMultipleObjects(parallel_jobs, thread_handles,
-                   false, wait_for_child ? INFINITE : 0);
+                                       false, wait_for_child ? INFINITE : 0);
 
    if (thread_num == WAIT_TIMEOUT || thread_num == WAIT_FAILED)
        return false;
 
    /* compute thread index in active_threads */
    thread_num -= WAIT_OBJECT_0;
-   
+
    /* get the result */
    GetExitCodeThread(thread_handles[thread_num], &res);
    if (res != 0)
@@ -313,18 +315,18 @@ reap_child(bool wait_for_child)
    /* dispose of handle to stop leaks */
    CloseHandle(thread_handles[thread_num]);
 
-   /*  Move last slot into dead child's position */
+   /* Move last slot into dead child's position */
    if (thread_num != parallel_jobs - 1)
    {
-       void *tmp_args;
-   
+       void       *tmp_args;
+
        thread_handles[thread_num] = thread_handles[parallel_jobs - 1];
 
        /*
-        *  We must swap the arg struct pointers because the thread we
-        *  just moved is active, and we must make sure it is not
-        *  reused by the next created thread.  Instead, the new thread
-        *  will use the arg struct of the thread that just died.
+        * We must swap the arg struct pointers because the thread we just
+        * moved is active, and we must make sure it is not reused by the next
+        * created thread.  Instead, the new thread will use the arg struct of
+        * the thread that just died.
         */
        tmp_args = cur_thread_args[thread_num];
        cur_thread_args[thread_num] = cur_thread_args[parallel_jobs - 1];
index 489b68003c376a1a310990d70940eec529afd27d..3af6314184f2f59f302972a53aaace1347e75add 100644 (file)
@@ -134,7 +134,7 @@ main(int argc, char **argv)
        disable_old_cluster();
 
    transfer_all_new_tablespaces(&old_cluster.dbarr, &new_cluster.dbarr,
-                        old_cluster.pgdata, new_cluster.pgdata);
+                                old_cluster.pgdata, new_cluster.pgdata);
 
    /*
     * Assuming OIDs are only used in system tables, there is no need to
@@ -193,14 +193,13 @@ setup(char *argv0, bool *live_check)
    if (pid_lock_file_exists(old_cluster.pgdata))
    {
        /*
-        *  If we have a postmaster.pid file, try to start the server.  If
-        *  it starts, the pid file was stale, so stop the server.  If it
-        *  doesn't start, assume the server is running.  If the pid file
-        *  is left over from a server crash, this also allows any committed
-        *  transactions stored in the WAL to be replayed so they are not
-        *  lost, because WAL files are not transfered from old to new
-        *  servers.
-        */     
+        * If we have a postmaster.pid file, try to start the server.  If it
+        * starts, the pid file was stale, so stop the server.  If it doesn't
+        * start, assume the server is running.  If the pid file is left over
+        * from a server crash, this also allows any committed transactions
+        * stored in the WAL to be replayed so they are not lost, because WAL
+        * files are not transfered from old to new servers.
+        */
        if (start_postmaster(&old_cluster, false))
            stop_postmaster(false);
        else
@@ -220,7 +219,7 @@ setup(char *argv0, bool *live_check)
            stop_postmaster(false);
        else
            pg_log(PG_FATAL, "There seems to be a postmaster servicing the new cluster.\n"
-              "Please shutdown that postmaster and try again.\n");
+                  "Please shutdown that postmaster and try again.\n");
    }
 
    /* get path to pg_upgrade executable */
@@ -312,9 +311,9 @@ create_new_objects(void)
    prep_status("Adding support functions to new cluster");
 
    /*
-    *  Technically, we only need to install these support functions in new
-    *  databases that also exist in the old cluster, but for completeness
-    *  we process all new databases.
+    * Technically, we only need to install these support functions in new
+    * databases that also exist in the old cluster, but for completeness we
+    * process all new databases.
     */
    for (dbnum = 0; dbnum < new_cluster.dbarr.ndbs; dbnum++)
    {
@@ -330,21 +329,22 @@ create_new_objects(void)
 
    for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)
    {
-       char sql_file_name[MAXPGPATH], log_file_name[MAXPGPATH];
-       DbInfo     *old_db = &old_cluster.dbarr.dbs[dbnum];
+       char        sql_file_name[MAXPGPATH],
+                   log_file_name[MAXPGPATH];
+       DbInfo     *old_db = &old_cluster.dbarr.dbs[dbnum];
 
        pg_log(PG_STATUS, "%s", old_db->db_name);
        snprintf(sql_file_name, sizeof(sql_file_name), DB_DUMP_FILE_MASK, old_db->db_oid);
        snprintf(log_file_name, sizeof(log_file_name), DB_DUMP_LOG_FILE_MASK, old_db->db_oid);
 
        /*
-        *  pg_dump only produces its output at the end, so there is little
-        *  parallelism if using the pipe.
+        * pg_dump only produces its output at the end, so there is little
+        * parallelism if using the pipe.
         */
        parallel_exec_prog(log_file_name, NULL,
-                 "\"%s/pg_restore\" %s --exit-on-error --verbose --dbname \"%s\" \"%s\"",
-                 new_cluster.bindir, cluster_conn_opts(&new_cluster),
-                 old_db->db_name, sql_file_name);
+                          "\"%s/pg_restore\" %s --exit-on-error --verbose --dbname \"%s\" \"%s\"",
+                        new_cluster.bindir, cluster_conn_opts(&new_cluster),
+                          old_db->db_name, sql_file_name);
    }
 
    /* reap all children */
@@ -418,6 +418,7 @@ copy_clog_xlog_xid(void)
        copy_subdir_files("pg_multixact/offsets");
        copy_subdir_files("pg_multixact/members");
        prep_status("Setting next multixact ID and offset for new cluster");
+
        /*
         * we preserve all files and contents, so we must preserve both "next"
         * counters here and the oldest multi present on system.
@@ -434,6 +435,7 @@ copy_clog_xlog_xid(void)
    else if (new_cluster.controldata.cat_ver >= MULTIXACT_FORMATCHANGE_CAT_VER)
    {
        prep_status("Setting oldest multixact ID on new cluster");
+
        /*
         * We don't preserve files in this case, but it's important that the
         * oldest multi is set to the latest value used by the old system, so
@@ -549,7 +551,6 @@ set_frozenxids(void)
 static void
 cleanup(void)
 {
-
    fclose(log_opts.internal);
 
    /* Remove dump and log files? */
@@ -567,8 +568,9 @@ cleanup(void)
        if (old_cluster.dbarr.dbs)
            for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)
            {
-               char sql_file_name[MAXPGPATH], log_file_name[MAXPGPATH];
-               DbInfo     *old_db = &old_cluster.dbarr.dbs[dbnum];
+               char        sql_file_name[MAXPGPATH],
+                           log_file_name[MAXPGPATH];
+               DbInfo     *old_db = &old_cluster.dbarr.dbs[dbnum];
 
                snprintf(sql_file_name, sizeof(sql_file_name), DB_DUMP_FILE_MASK, old_db->db_oid);
                unlink(sql_file_name);
index 00f719791c8fae6bb9a45dece2bdc42b11e85a0e..0d44f4e4477cf5bd2b95508d041e0b8924cda876 100644 (file)
@@ -73,24 +73,24 @@ extern char *output_files[];
 #define pg_copy_file       copy_file
 #define pg_mv_file         rename
 #define pg_link_file       link
-#define PATH_SEPARATOR      '/'
+#define PATH_SEPARATOR     '/'
 #define RM_CMD             "rm -f"
 #define RMDIR_CMD          "rm -rf"
 #define SCRIPT_EXT         "sh"
 #define ECHO_QUOTE "'"
-#define ECHO_BLANK  ""
+#define ECHO_BLANK ""
 #else
 #define pg_copy_file       CopyFile
 #define pg_mv_file         pgrename
 #define pg_link_file       win32_pghardlink
 #define sleep(x)           Sleep(x * 1000)
-#define PATH_SEPARATOR      '\\'
+#define PATH_SEPARATOR     '\\'
 #define RM_CMD             "DEL /q"
 #define RMDIR_CMD          "RMDIR /s/q"
 #define SCRIPT_EXT         "bat"
 #define EXE_EXT                ".exe"
 #define ECHO_QUOTE ""
-#define ECHO_BLANK  "."
+#define ECHO_BLANK "."
 #endif
 
 #define CLUSTER_NAME(cluster)  ((cluster) == &old_cluster ? "old" : \
@@ -122,8 +122,8 @@ extern char *output_files[];
 typedef struct
 {
    /* Can't use NAMEDATALEN;  not guaranteed to fit on client */
-   char        *nspname;       /* namespace name */
-   char        *relname;       /* relation name */
+   char       *nspname;        /* namespace name */
+   char       *relname;        /* relation name */
    Oid         reloid;         /* relation oid */
    Oid         relfilenode;    /* relation relfile node */
    /* relation tablespace path, or "" for the cluster default */
@@ -155,8 +155,8 @@ typedef struct
    Oid         old_relfilenode;
    Oid         new_relfilenode;
    /* the rest are used only for logging and error reporting */
-   char        *nspname;       /* namespaces */
-   char        *relname;
+   char       *nspname;        /* namespaces */
+   char       *relname;
 } FileNameMap;
 
 /*
@@ -165,7 +165,7 @@ typedef struct
 typedef struct
 {
    Oid         db_oid;         /* oid of the database */
-   char        *db_name;       /* database name */
+   char       *db_name;        /* database name */
    char        db_tblspace[MAXPGPATH]; /* database default tablespace path */
    RelInfoArr  rel_arr;        /* array of all user relinfos */
 } DbInfo;
@@ -254,8 +254,8 @@ typedef struct
    char        major_version_str[64];  /* string PG_VERSION of cluster */
    uint32      bin_version;    /* version returned from pg_ctl */
    Oid         pg_database_oid;    /* OID of pg_database relation */
-   Oid         install_role_oid;   /* OID of connected role */
-   Oid         role_count;         /* number of roles defined in the cluster */
+   Oid         install_role_oid;       /* OID of connected role */
+   Oid         role_count;     /* number of roles defined in the cluster */
    char       *tablespace_suffix;      /* directory specification */
 } ClusterInfo;
 
@@ -312,12 +312,12 @@ extern OSInfo os_info;
 /* check.c */
 
 void       output_check_banner(bool live_check);
-void       check_and_dump_old_cluster(bool live_check,
-                 char **sequence_script_file_name);
+void check_and_dump_old_cluster(bool live_check,
+                          char **sequence_script_file_name);
 void       check_new_cluster(void);
 void       report_clusters_compatible(void);
 void       issue_warnings(char *sequence_script_file_name);
-void       output_completion_banner(char *analyze_script_file_name,
+void output_completion_banner(char *analyze_script_file_name,
                         char *deletion_script_file_name);
 void       check_cluster_versions(void);
 void       check_cluster_compatibility(bool live_check);
@@ -413,11 +413,11 @@ void      get_sock_dir(ClusterInfo *cluster, bool live_check);
 /* relfilenode.c */
 
 void       get_pg_database_relfilenode(ClusterInfo *cluster);
-void       transfer_all_new_tablespaces(DbInfoArr *old_db_arr,
-                  DbInfoArr *new_db_arr, char *old_pgdata, char *new_pgdata);
-void       transfer_all_new_dbs(DbInfoArr *old_db_arr,
+void transfer_all_new_tablespaces(DbInfoArr *old_db_arr,
+                 DbInfoArr *new_db_arr, char *old_pgdata, char *new_pgdata);
+void transfer_all_new_dbs(DbInfoArr *old_db_arr,
                   DbInfoArr *new_db_arr, char *old_pgdata, char *new_pgdata,
-                  char *old_tablespace);
+                    char *old_tablespace);
 
 /* tablespace.c */
 
@@ -477,11 +477,11 @@ void old_8_3_invalidate_bpchar_pattern_ops_indexes(ClusterInfo *cluster,
 char      *old_8_3_create_sequence_script(ClusterInfo *cluster);
 
 /* parallel.c */
-void       parallel_exec_prog(const char *log_file, const char *opt_log_file,
-         const char *fmt,...)
+void
+parallel_exec_prog(const char *log_file, const char *opt_log_file,
+                  const char *fmt,...)
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));
-void       parallel_transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
-                                         char *old_pgdata, char *new_pgdata,
-                                         char *old_tablespace);
+void parallel_transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
+                             char *old_pgdata, char *new_pgdata,
+                             char *old_tablespace);
 bool       reap_child(bool wait_for_child);
-
index 56c702e258162bb6e6c7fc9b3004f7dcae0f0b74..53e0700801a866957b313bc7cfaee54b9882cb3f 100644 (file)
@@ -18,7 +18,7 @@
 static void transfer_single_new_db(pageCnvCtx *pageConverter,
                       FileNameMap *maps, int size, char *old_tablespace);
 static void transfer_relfile(pageCnvCtx *pageConverter, FileNameMap *map,
-                            const char *suffix);
+                const char *suffix);
 
 
 /*
@@ -29,32 +29,32 @@ static void transfer_relfile(pageCnvCtx *pageConverter, FileNameMap *map,
  */
 void
 transfer_all_new_tablespaces(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
-                   char *old_pgdata, char *new_pgdata)
+                            char *old_pgdata, char *new_pgdata)
 {
    pg_log(PG_REPORT, "%s user relation files\n",
      user_opts.transfer_mode == TRANSFER_MODE_LINK ? "Linking" : "Copying");
 
    /*
-    *  Transfering files by tablespace is tricky because a single database
-    *  can use multiple tablespaces.  For non-parallel mode, we just pass a
-    *  NULL tablespace path, which matches all tablespaces.  In parallel mode,
-    *  we pass the default tablespace and all user-created tablespaces
-    *  and let those operations happen in parallel.
+    * Transfering files by tablespace is tricky because a single database can
+    * use multiple tablespaces.  For non-parallel mode, we just pass a NULL
+    * tablespace path, which matches all tablespaces.  In parallel mode, we
+    * pass the default tablespace and all user-created tablespaces and let
+    * those operations happen in parallel.
     */
    if (user_opts.jobs <= 1)
        parallel_transfer_all_new_dbs(old_db_arr, new_db_arr, old_pgdata,
                                      new_pgdata, NULL);
    else
    {
-       int tblnum;
+       int         tblnum;
 
        /* transfer default tablespace */
        parallel_transfer_all_new_dbs(old_db_arr, new_db_arr, old_pgdata,
-                             new_pgdata, old_pgdata);
+                                     new_pgdata, old_pgdata);
 
        for (tblnum = 0; tblnum < os_info.num_old_tablespaces; tblnum++)
            parallel_transfer_all_new_dbs(old_db_arr, new_db_arr, old_pgdata,
-                                 new_pgdata, os_info.old_tablespaces[tblnum]);
+                               new_pgdata, os_info.old_tablespaces[tblnum]);
        /* reap all children */
        while (reap_child(true) == true)
            ;
@@ -75,7 +75,7 @@ transfer_all_new_tablespaces(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
  */
 void
 transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
-                   char *old_pgdata, char *new_pgdata, char *old_tablespace)
+                    char *old_pgdata, char *new_pgdata, char *old_tablespace)
 {
    int         old_dbnum,
                new_dbnum;
@@ -170,11 +170,11 @@ transfer_single_new_db(pageCnvCtx *pageConverter,
 {
    int         mapnum;
    bool        vm_crashsafe_match = true;
-   
+
    /*
     * Do the old and new cluster disagree on the crash-safetiness of the vm
-     * files?  If so, do not copy them.
-     */
+    * files?  If so, do not copy them.
+    */
    if (old_cluster.controldata.cat_ver < VISIBILITY_MAP_CRASHSAFE_CAT_VER &&
        new_cluster.controldata.cat_ver >= VISIBILITY_MAP_CRASHSAFE_CAT_VER)
        vm_crashsafe_match = false;
@@ -186,7 +186,7 @@ transfer_single_new_db(pageCnvCtx *pageConverter,
        {
            /* transfer primary file */
            transfer_relfile(pageConverter, &maps[mapnum], "");
-   
+
            /* fsm/vm files added in PG 8.4 */
            if (GET_MAJOR_VERSION(old_cluster.major_version) >= 804)
            {
@@ -217,13 +217,11 @@ transfer_relfile(pageCnvCtx *pageConverter, FileNameMap *map,
    int         fd;
    int         segno;
    char        extent_suffix[65];
-   
+
    /*
-    * Now copy/link any related segments as well. Remember, PG breaks
-    * large files into 1GB segments, the first segment has no extension,
-    * subsequent segments are named relfilenode.1, relfilenode.2,
-    * relfilenode.3.
-    * copied.
+    * Now copy/link any related segments as well. Remember, PG breaks large
+    * files into 1GB segments, the first segment has no extension, subsequent
+    * segments are named relfilenode.1, relfilenode.2, relfilenode.3. copied.
     */
    for (segno = 0;; segno++)
    {
@@ -233,12 +231,12 @@ transfer_relfile(pageCnvCtx *pageConverter, FileNameMap *map,
            snprintf(extent_suffix, sizeof(extent_suffix), ".%d", segno);
 
        snprintf(old_file, sizeof(old_file), "%s%s/%u/%u%s%s", map->old_tablespace,
-                map->old_tablespace_suffix, map->old_db_oid, map->old_relfilenode,
+          map->old_tablespace_suffix, map->old_db_oid, map->old_relfilenode,
                 type_suffix, extent_suffix);
        snprintf(new_file, sizeof(new_file), "%s%s/%u/%u%s%s", map->new_tablespace,
-                map->new_tablespace_suffix, map->new_db_oid, map->new_relfilenode,
+          map->new_tablespace_suffix, map->new_db_oid, map->new_relfilenode,
                 type_suffix, extent_suffix);
-   
+
        /* Is it an extent, fsm, or vm file? */
        if (type_suffix[0] != '\0' || segno != 0)
        {
@@ -257,18 +255,18 @@ transfer_relfile(pageCnvCtx *pageConverter, FileNameMap *map,
        }
 
        unlink(new_file);
-   
+
        /* Copying files might take some time, so give feedback. */
        pg_log(PG_STATUS, "%s", old_file);
-   
+
        if ((user_opts.transfer_mode == TRANSFER_MODE_LINK) && (pageConverter != NULL))
            pg_log(PG_FATAL, "This upgrade requires page-by-page conversion, "
                   "you must use copy mode instead of link mode.\n");
-   
+
        if (user_opts.transfer_mode == TRANSFER_MODE_COPY)
        {
            pg_log(PG_VERBOSE, "copying \"%s\" to \"%s\"\n", old_file, new_file);
-   
+
            if ((msg = copyAndUpdateFile(pageConverter, old_file, new_file, true)) != NULL)
                pg_log(PG_FATAL, "error while copying relation \"%s.%s\" (\"%s\" to \"%s\"): %s\n",
                       map->nspname, map->relname, old_file, new_file, msg);
@@ -276,14 +274,13 @@ transfer_relfile(pageCnvCtx *pageConverter, FileNameMap *map,
        else
        {
            pg_log(PG_VERBOSE, "linking \"%s\" to \"%s\"\n", old_file, new_file);
-   
+
            if ((msg = linkAndUpdateFile(pageConverter, old_file, new_file)) != NULL)
                pg_log(PG_FATAL,
                       "error while creating link for relation \"%s.%s\" (\"%s\" to \"%s\"): %s\n",
                       map->nspname, map->relname, old_file, new_file, msg);
        }
-   }
+   }
 
    return;
 }
-
index ed6775935bc0e743e86d3e648a82bb98a5253643..c1d459dd8220e79def97d220a4e3814a1634ad04 100644 (file)
@@ -79,7 +79,7 @@ get_db_conn(ClusterInfo *cluster, const char *db_name)
 char *
 cluster_conn_opts(ClusterInfo *cluster)
 {
-   static char conn_opts[MAXPGPATH + NAMEDATALEN + 100];
+   static char conn_opts[MAXPGPATH + NAMEDATALEN + 100];
 
    if (cluster->sockdir)
        snprintf(conn_opts, sizeof(conn_opts),
@@ -192,7 +192,7 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
    strcat(socket_string,
           " -c listen_addresses='' -c unix_socket_permissions=0700");
 
-   /* Have a sockdir?  Tell the postmaster. */
+   /* Have a sockdir?  Tell the postmaster. */
    if (cluster->sockdir)
        snprintf(socket_string + strlen(socket_string),
                 sizeof(socket_string) - strlen(socket_string),
@@ -215,13 +215,13 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
     * win on ext4.
     */
    snprintf(cmd, sizeof(cmd),
-            "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" -o \"-p %d%s%s %s%s\" start",
+         "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" -o \"-p %d%s%s %s%s\" start",
          cluster->bindir, SERVER_LOG_FILE, cluster->pgconfig, cluster->port,
             (cluster->controldata.cat_ver >=
              BINARY_UPGRADE_SERVER_FLAG_CAT_VER) ? " -b" :
             " -c autovacuum=off -c autovacuum_freeze_max_age=2000000000",
             (cluster == &new_cluster) ?
-               " -c synchronous_commit=off -c fsync=off -c full_page_writes=off" : "",
+     " -c synchronous_commit=off -c fsync=off -c full_page_writes=off" : "",
             cluster->pgopts ? cluster->pgopts : "", socket_string);
 
    /*
@@ -229,7 +229,7 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
     * it might supply a reason for the failure.
     */
    pg_ctl_return = exec_prog(SERVER_START_LOG_FILE,
-                             /* pass both file names if they differ */
+   /* pass both file names if they differ */
                              (strcmp(SERVER_LOG_FILE,
                                      SERVER_START_LOG_FILE) != 0) ?
                              SERVER_LOG_FILE : NULL,
@@ -238,7 +238,7 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
 
    if (!pg_ctl_return && !throw_error)
        return false;
-                             
+
    /* Check to see if we can connect to the server; if not, report it. */
    if ((conn = get_db_conn(cluster, "template1")) == NULL ||
        PQstatus(conn) != CONNECTION_OK)
index 805e402d4a7f10197160f101baaf533c00e12272..4747e7906e73898249dbe99d78ffddc0b765cde3 100644 (file)
@@ -59,7 +59,7 @@ get_tablespace_paths(void)
 
    if ((os_info.num_old_tablespaces = PQntuples(res)) != 0)
        os_info.old_tablespaces = (char **) pg_malloc(
-                                  os_info.num_old_tablespaces * sizeof(char *));
+                              os_info.num_old_tablespaces * sizeof(char *));
    else
        os_info.old_tablespaces = NULL;
 
index 4e51ed72e9837071cc2d0800a875687d8983db83..4da7658c6cd7830c60b415a8219bd52aec3c7b4d 100644 (file)
@@ -40,8 +40,8 @@ void
 end_progress_output(void)
 {
    /*
-    *  In case nothing printed; pass a space so gcc doesn't complain about
-    *  empty format string.
+    * In case nothing printed; pass a space so gcc doesn't complain about
+    * empty format string.
     */
    prep_status(" ");
 }
@@ -114,13 +114,13 @@ pg_log(eLogType type, char *fmt,...)
            /* for output to a display, do leading truncation and append \r */
            if (isatty(fileno(stdout)))
                /* -2 because we use a 2-space indent */
-               printf("  %s%-*.*s\r", 
-                       /* prefix with "..." if we do leading truncation */
-                       strlen(message) <= MESSAGE_WIDTH - 2 ? "" : "...",
-                       MESSAGE_WIDTH - 2, MESSAGE_WIDTH - 2,
-                       /* optional leading truncation */
-                       strlen(message) <= MESSAGE_WIDTH - 2 ? message :
-                       message + strlen(message) - MESSAGE_WIDTH + 3 + 2);
+               printf("  %s%-*.*s\r",
+               /* prefix with "..." if we do leading truncation */
+                      strlen(message) <= MESSAGE_WIDTH - 2 ? "" : "...",
+                      MESSAGE_WIDTH - 2, MESSAGE_WIDTH - 2,
+               /* optional leading truncation */
+                      strlen(message) <= MESSAGE_WIDTH - 2 ? message :
+                      message + strlen(message) - MESSAGE_WIDTH + 3 + 2);
            else
                printf("  %s\n", _(message));
            break;
index 3f3912193aed7e3730dff677501282559ebcaf15..bff76e85d40db1abbc6734c1d424176b51d90697 100644 (file)
@@ -41,7 +41,7 @@ timestamptz_to_time_t(TimestampTz t)
 
 /*
  * Stopgap implementation of timestamptz_to_str that doesn't depend on backend
- * infrastructure.  This will work for timestamps that are within the range
+ * infrastructure. This will work for timestamps that are within the range
  * of the platform time_t type.  (pg_time_t is compatible except for possibly
  * being wider.)
  *
@@ -77,7 +77,7 @@ timestamptz_to_str(TimestampTz dt)
  * be linked/called.
  */
 void
-appendStringInfo(StringInfo str, const char *fmt, ...)
+appendStringInfo(StringInfo str, const char *fmt,...)
 {
    va_list     args;
 
index 1dd9034d5318f5b0ecaa801accb9202a4fd4f561..70dc8d15d5006fdaa8ab9194c31a57e6c7f9e05c 100644 (file)
@@ -73,7 +73,7 @@ fatal_error(const char *fmt,...)
 static void
 print_rmgr_list(void)
 {
-   int     i;
+   int         i;
 
    for (i = 0; i < RM_MAX_ID + 1; i++)
    {
@@ -88,7 +88,8 @@ print_rmgr_list(void)
 static bool
 verify_directory(const char *directory)
 {
-   DIR *dir = opendir(directory);
+   DIR        *dir = opendir(directory);
+
    if (dir == NULL)
        return false;
    closedir(dir);
@@ -113,7 +114,7 @@ split_path(const char *path, char **dir, char **fname)
    if (sep != NULL)
    {
        *dir = pg_strdup(path);
-       (*dir)[(sep - path) + 1] = '\0';    /* no strndup */
+       (*dir)[(sep - path) + 1] = '\0';        /* no strndup */
        *fname = pg_strdup(sep + 1);
    }
    /* local directory */
@@ -596,7 +597,7 @@ main(int argc, char **argv)
        else if (!XLByteInSeg(private.startptr, segno))
        {
            fprintf(stderr,
-                   "%s: start log position %X/%X is not inside file \"%s\"\n",
+                 "%s: start log position %X/%X is not inside file \"%s\"\n",
                    progname,
                    (uint32) (private.startptr >> 32),
                    (uint32) private.startptr,
@@ -672,9 +673,9 @@ main(int argc, char **argv)
                    (uint32) private.startptr);
 
    /*
-    * Display a message that we're skipping data if `from` wasn't a pointer to
-    * the start of a record and also wasn't a pointer to the beginning of a
-    * segment (e.g. we were used in file mode).
+    * Display a message that we're skipping data if `from` wasn't a pointer
+    * to the start of a record and also wasn't a pointer to the beginning of
+    * segment (e.g. we were used in file mode).
     */
    if (first_record != private.startptr && (private.startptr % XLogSegSize) != 0)
        printf("first record is after %X/%X, at %X/%X, skipping over %u bytes\n",
index 0508c8dae91cf0e8589ad8903e31f29952f9e97b..13ab7457265a6751b992787ae748f0cac7d6ec16 100644 (file)
@@ -33,4 +33,3 @@
 const RmgrDescData RmgrDescTable[RM_MAX_ID + 1] = {
 #include "access/rmgrlist.h"
 };
-
index 2341739a14e1cdd1673d5eb3988de9ad1bd737c5..edf82577514e5fdc45e614f939c897bbd38230ab 100644 (file)
@@ -13,9 +13,9 @@
 typedef struct RmgrDescData
 {
    const char *rm_name;
-   void      (*rm_desc) (StringInfo buf, uint8 xl_info, char *rec);
+   void        (*rm_desc) (StringInfo buf, uint8 xl_info, char *rec);
 } RmgrDescData;
 
 extern const RmgrDescData RmgrDescTable[];
 
-#endif /* RMGRDESC_H */
+#endif   /* RMGRDESC_H */
index 24dab1f3362efb161578b0356ba8d874f74ff262..8ff662370969fa32da832844dc4dcca4d500aa4a 100644 (file)
@@ -162,7 +162,8 @@ char       *index_tablespace = NULL;
 
 bool       use_log;            /* log transaction latencies to a file */
 bool       use_quiet;          /* quiet logging onto stderr */
-int            agg_interval;       /* log aggregates instead of individual transactions */
+int            agg_interval;       /* log aggregates instead of individual
+                                * transactions */
 bool       is_connect;         /* establish connection for each transaction */
 bool       is_latencies;       /* report per-command latencies */
 int            main_pid;           /* main process id used in log filename */
@@ -261,13 +262,14 @@ typedef struct
 typedef struct
 {
 
-   long    start_time;         /* when does the interval start */
-   int     cnt;                /* number of transactions */
-   double  min_duration;       /* min/max durations */
-   double  max_duration;
-   double  sum;                /* sum(duration), sum(duration^2) - for estimates */
-   double  sum2;
-   
+   long        start_time;     /* when does the interval start */
+   int         cnt;            /* number of transactions */
+   double      min_duration;   /* min/max durations */
+   double      max_duration;
+   double      sum;            /* sum(duration), sum(duration^2) - for
+                                * estimates */
+   double      sum2;
+
 } AggVals;
 
 static Command **sql_files[MAX_FILES]; /* SQL script files */
@@ -874,12 +876,13 @@ clientDone(CState *st, bool ok)
 }
 
 static
-void agg_vals_init(AggVals * aggs, instr_time start)
+void
+agg_vals_init(AggVals *aggs, instr_time start)
 {
    /* basic counters */
-   aggs->cnt = 0;      /* number of transactions */
-   aggs->sum = 0;      /* SUM(duration) */
-   aggs->sum2 = 0;     /* SUM(duration*duration) */
+   aggs->cnt = 0;              /* number of transactions */
+   aggs->sum = 0;              /* SUM(duration) */
+   aggs->sum2 = 0;             /* SUM(duration*duration) */
 
    /* min and max transaction duration */
    aggs->min_duration = 0;
@@ -891,7 +894,7 @@ void agg_vals_init(AggVals * aggs, instr_time start)
 
 /* return false iff client should be disconnected */
 static bool
-doCustom(TState *thread, CState *st, instr_time *conn_time, FILE *logfile, AggVals * agg)
+doCustom(TState *thread, CState *st, instr_time *conn_time, FILE *logfile, AggVals *agg)
 {
    PGresult   *res;
    Command   **commands;
@@ -964,31 +967,39 @@ top:
                /* should we aggregate the results or not? */
                if (agg_interval > 0)
                {
-                   /* are we still in the same interval? if yes, accumulate the
-                   * values (print them otherwise) */
+                   /*
+                    * are we still in the same interval? if yes, accumulate
+                    * the values (print them otherwise)
+                    */
                    if (agg->start_time + agg_interval >= INSTR_TIME_GET_DOUBLE(now))
                    {
                        agg->cnt += 1;
-                       agg->sum  += usec;
+                       agg->sum += usec;
                        agg->sum2 += usec * usec;
 
                        /* first in this aggregation interval */
                        if ((agg->cnt == 1) || (usec < agg->min_duration))
-                           agg->min_duration =  usec;
+                           agg->min_duration = usec;
 
                        if ((agg->cnt == 1) || (usec > agg->max_duration))
                            agg->max_duration = usec;
                    }
                    else
                    {
-                       /* Loop until we reach the interval of the current transaction (and
-                        * print all the empty intervals in between). */
+                       /*
+                        * Loop until we reach the interval of the current
+                        * transaction (and print all the empty intervals in
+                        * between).
+                        */
                        while (agg->start_time + agg_interval < INSTR_TIME_GET_DOUBLE(now))
                        {
-                           /* This is a non-Windows branch (thanks to the ifdef in usage), so
-                            * we don't need to handle this in a special way (see below). */
+                           /*
+                            * This is a non-Windows branch (thanks to the
+                            * ifdef in usage), so we don't need to handle
+                            * this in a special way (see below).
+                            */
                            fprintf(logfile, "%ld %d %.0f %.0f %.0f %.0f\n",
-                                   agg->start_time, agg->cnt, agg->sum, agg->sum2,
+                             agg->start_time, agg->cnt, agg->sum, agg->sum2,
                                    agg->min_duration, agg->max_duration);
 
                            /* move to the next inteval */
@@ -1002,7 +1013,10 @@ top:
                            agg->sum2 = 0;
                        }
 
-                       /* and now update the reset values (include the current) */
+                       /*
+                        * and now update the reset values (include the
+                        * current)
+                        */
                        agg->cnt = 1;
                        agg->min_duration = usec;
                        agg->max_duration = usec;
@@ -1014,12 +1028,20 @@ top:
                {
                    /* no, print raw transactions */
 #ifndef WIN32
-                   /* This is more than we really ought to know about instr_time */
+
+                   /*
+                    * This is more than we really ought to know about
+                    * instr_time
+                    */
                    fprintf(logfile, "%d %d %.0f %d %ld %ld\n",
                            st->id, st->cnt, usec, st->use_file,
                            (long) now.tv_sec, (long) now.tv_usec);
 #else
-                   /* On Windows, instr_time doesn't provide a timestamp anyway */
+
+                   /*
+                    * On Windows, instr_time doesn't provide a timestamp
+                    * anyway
+                    */
                    fprintf(logfile, "%d %d %.0f %d 0 0\n",
                            st->id, st->cnt, usec, st->use_file);
 #endif
@@ -1234,11 +1256,11 @@ top:
            }
 
            /*
-            * getrand() needs to be able to subtract max from min and add
-            * one to the result without overflowing.  Since we know max > min,
-            * we can detect overflow just by checking for a negative result.
-            * But we must check both that the subtraction doesn't overflow,
-            * and that adding one to the result doesn't overflow either.
+            * getrand() needs to be able to subtract max from min and add one
+            * to the result without overflowing.  Since we know max > min, we
+            * can detect overflow just by checking for a negative result. But
+            * we must check both that the subtraction doesn't overflow, and
+            * that adding one to the result doesn't overflow either.
             */
            if (max - min < 0 || (max - min) + 1 < 0)
            {
@@ -1418,7 +1440,6 @@ disconnect_all(CState *state, int length)
 static void
 init(bool is_no_vacuum)
 {
-
 /* The scale factor at/beyond which 32bit integers are incapable of storing
  * 64bit values.
  *
@@ -1446,8 +1467,8 @@ init(bool is_no_vacuum)
        {
            "pgbench_history",
            scale >= SCALE_32BIT_THRESHOLD
-               ? "tid int,bid int,aid bigint,delta int,mtime timestamp,filler char(22)"
-               : "tid int,bid int,aid    int,delta int,mtime timestamp,filler char(22)",
+           ? "tid int,bid int,aid bigint,delta int,mtime timestamp,filler char(22)"
+           : "tid int,bid int,aid    int,delta int,mtime timestamp,filler char(22)",
            0
        },
        {
@@ -1458,8 +1479,8 @@ init(bool is_no_vacuum)
        {
            "pgbench_accounts",
            scale >= SCALE_32BIT_THRESHOLD
-               ? "aid bigint not null,bid int,abalance int,filler char(84)"
-               : "aid    int not null,bid int,abalance int,filler char(84)",
+           ? "aid bigint not null,bid int,abalance int,filler char(84)"
+           : "aid    int not null,bid int,abalance int,filler char(84)",
            1
        },
        {
@@ -1488,8 +1509,10 @@ init(bool is_no_vacuum)
    int64       k;
 
    /* used to track elapsed time and estimate of the remaining time */
-   instr_time  start, diff;
-   double      elapsed_sec, remaining_sec;
+   instr_time  start,
+               diff;
+   double      elapsed_sec,
+               remaining_sec;
    int         log_interval = 1;
 
    if ((con = doConnect()) == NULL)
@@ -1573,9 +1596,11 @@ init(bool is_no_vacuum)
            exit(1);
        }
 
-       /* If we want to stick with the original logging, print a message each
-        * 100k inserted rows. */
-       if ((! use_quiet) && (j % 100000 == 0))
+       /*
+        * If we want to stick with the original logging, print a message each
+        * 100k inserted rows.
+        */
+       if ((!use_quiet) && (j % 100000 == 0))
        {
            INSTR_TIME_SET_CURRENT(diff);
            INSTR_TIME_SUBTRACT(diff, start);
@@ -1584,9 +1609,9 @@ init(bool is_no_vacuum)
            remaining_sec = (scale * naccounts - j) * elapsed_sec / j;
 
            fprintf(stderr, INT64_FORMAT " of " INT64_FORMAT " tuples (%d%%) done (elapsed %.2f s, remaining %.2f s).\n",
-                           j, (int64)naccounts * scale,
-                           (int) (((int64) j * 100) / (naccounts * scale)),
-                           elapsed_sec, remaining_sec);
+                   j, (int64) naccounts * scale,
+                   (int) (((int64) j * 100) / (naccounts * scale)),
+                   elapsed_sec, remaining_sec);
        }
        /* let's not call the timing for each row, but only each 100 rows */
        else if (use_quiet && (j % 100 == 0))
@@ -1598,14 +1623,15 @@ init(bool is_no_vacuum)
            remaining_sec = (scale * naccounts - j) * elapsed_sec / j;
 
            /* have we reached the next interval (or end)? */
-           if ((j == scale * naccounts) || (elapsed_sec >= log_interval * LOG_STEP_SECONDS)) {
+           if ((j == scale * naccounts) || (elapsed_sec >= log_interval * LOG_STEP_SECONDS))
+           {
 
                fprintf(stderr, INT64_FORMAT " of " INT64_FORMAT " tuples (%d%%) done (elapsed %.2f s, remaining %.2f s).\n",
-                       j, (int64)naccounts * scale,
+                       j, (int64) naccounts * scale,
                        (int) (((int64) j * 100) / (naccounts * scale)), elapsed_sec, remaining_sec);
 
                /* skip to the next interval */
-               log_interval = (int)ceil(elapsed_sec/LOG_STEP_SECONDS);
+               log_interval = (int) ceil(elapsed_sec / LOG_STEP_SECONDS);
            }
        }
 
@@ -2393,17 +2419,20 @@ main(int argc, char **argv)
        exit(1);
    }
 
-   if (agg_interval > 0 && (! use_log)) {
+   if (agg_interval > 0 && (!use_log))
+   {
        fprintf(stderr, "log aggregation is allowed only when actually logging transactions\n");
        exit(1);
    }
 
-   if ((duration > 0) && (agg_interval > duration)) {
+   if ((duration > 0) && (agg_interval > duration))
+   {
        fprintf(stderr, "number of seconds for aggregation (%d) must not be higher that test duration (%d)\n", agg_interval, duration);
        exit(1);
    }
 
-   if ((duration > 0) && (agg_interval > 0) && (duration % agg_interval != 0)) {
+   if ((duration > 0) && (agg_interval > 0) && (duration % agg_interval != 0))
+   {
        fprintf(stderr, "duration (%d) must be a multiple of aggregation interval (%d)\n", duration, agg_interval);
        exit(1);
    }
@@ -2670,7 +2699,7 @@ threadRun(void *arg)
    AggVals     aggs;
 
    result = pg_malloc(sizeof(TResult));
-   
+
    INSTR_TIME_SET_ZERO(result->conn_time);
 
    /* open log file if requested */
@@ -2706,7 +2735,7 @@ threadRun(void *arg)
    INSTR_TIME_SUBTRACT(result->conn_time, thread->start_time);
 
    agg_vals_init(&aggs, thread->start_time);
-   
+
    /* send start up queries in async manner */
    for (i = 0; i < nstate; i++)
    {
index f2b02d0cd7fa9a43ac2a07328ed0c2e7a5df0e1c..cd48c143195b102b2f9fc72c6ffa50891ecb0d0f 100644 (file)
@@ -117,14 +117,11 @@ mp_result mp_int_mul_value(mp_int a, int value, mp_int c);
 mp_result  mp_int_mul_pow2(mp_int a, int p2, mp_int c);
 mp_result  mp_int_sqr(mp_int a, mp_int c);     /* c = a * a */
 
-mp_result
-mp_int_div(mp_int a, mp_int b, /* q = a / b */
+mp_result mp_int_div(mp_int a, mp_int b,   /* q = a / b */
           mp_int q, mp_int r); /* r = a % b */
-mp_result
-mp_int_div_value(mp_int a, int value,  /* q = a / value */
+mp_result mp_int_div_value(mp_int a, int value,    /* q = a / value */
                 mp_int q, int *r);     /* r = a % value */
-mp_result
-mp_int_div_pow2(mp_int a, int p2,      /* q = a / 2^p2  */
+mp_result mp_int_div_pow2(mp_int a, int p2,        /* q = a / 2^p2  */
                mp_int q, mp_int r);    /* r = q % 2^p2  */
 mp_result  mp_int_mod(mp_int a, mp_int m, mp_int c);   /* c = a % m */
 
@@ -143,17 +140,13 @@ int           mp_int_divisible_value(mp_int a, int v);
 /* Returns k >= 0 such that z = 2^k, if one exists; otherwise < 0 */
 int            mp_int_is_pow2(mp_int z);
 
-mp_result
-mp_int_exptmod(mp_int a, mp_int b, mp_int m,
+mp_result mp_int_exptmod(mp_int a, mp_int b, mp_int m,
               mp_int c);       /* c = a^b (mod m) */
-mp_result
-mp_int_exptmod_evalue(mp_int a, int value,
+mp_result mp_int_exptmod_evalue(mp_int a, int value,
                      mp_int m, mp_int c);      /* c = a^v (mod m) */
-mp_result
-mp_int_exptmod_bvalue(int value, mp_int b,
+mp_result mp_int_exptmod_bvalue(int value, mp_int b,
                      mp_int m, mp_int c);      /* c = v^b (mod m) */
-mp_result
-mp_int_exptmod_known(mp_int a, mp_int b,
+mp_result mp_int_exptmod_known(mp_int a, mp_int b,
                     mp_int m, mp_int mu,
                     mp_int c); /* c = a^b (mod m) */
 mp_result  mp_int_redux_const(mp_int m, mp_int c);
@@ -162,8 +155,7 @@ mp_result   mp_int_invmod(mp_int a, mp_int m, mp_int c);        /* c = 1/a (mod m) */
 
 mp_result  mp_int_gcd(mp_int a, mp_int b, mp_int c);   /* c = gcd(a, b)   */
 
-mp_result
-mp_int_egcd(mp_int a, mp_int b, mp_int c,      /* c = gcd(a, b)   */
+mp_result mp_int_egcd(mp_int a, mp_int b, mp_int c,        /* c = gcd(a, b)   */
            mp_int x, mp_int y);    /* c = ax + by     */
 
 mp_result  mp_int_sqrt(mp_int a, mp_int c);    /* c = floor(sqrt(q)) */
index 7ae01ccc4dbb66aec89a37a91632c1c7057675f1..3022abf75d8cdab1f661943fff073be52bbfc687 100644 (file)
@@ -265,8 +265,7 @@ int         pgp_s2k_read(PullFilter *src, PGP_S2K *s2k);
 int            pgp_s2k_process(PGP_S2K *s2k, int cipher, const uint8 *key, int klen);
 
 typedef struct PGP_CFB PGP_CFB;
-int
-pgp_cfb_create(PGP_CFB **ctx_p, int algo,
+int pgp_cfb_create(PGP_CFB **ctx_p, int algo,
               const uint8 *key, int key_len, int recync, uint8 *iv);
 void       pgp_cfb_free(PGP_CFB *ctx);
 int            pgp_cfb_encrypt(PGP_CFB *ctx, const uint8 *data, int len, uint8 *dst);
index 98aa7c80c085f6d59e446a8713d7af712104194c..075d78131a017b88f6ab4ae8439466dbfdbbe23d 100644 (file)
@@ -124,7 +124,7 @@ pgrowlocks(PG_FUNCTION_ARGS)
    /* scan the relation */
    while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
    {
-       HTSU_Result htsu;
+       HTSU_Result htsu;
        TransactionId xmax;
        uint16      infomask;
 
@@ -152,7 +152,7 @@ pgrowlocks(PG_FUNCTION_ARGS)
            values = (char **) palloc(mydata->ncolumns * sizeof(char *));
 
            values[Atnum_tid] = (char *) DirectFunctionCall1(tidout,
-                                                            PointerGetDatum(&tuple->t_self));
+                                           PointerGetDatum(&tuple->t_self));
 
            values[Atnum_xmax] = palloc(NCHARS * sizeof(char));
            snprintf(values[Atnum_xmax], NCHARS, "%d", xmax);
@@ -166,7 +166,7 @@ pgrowlocks(PG_FUNCTION_ARGS)
                values[Atnum_ismulti] = pstrdup("true");
 
                allow_old = !(infomask & HEAP_LOCK_MASK) &&
-                            (infomask & HEAP_XMAX_LOCK_ONLY);
+                   (infomask & HEAP_XMAX_LOCK_ONLY);
                nmembers = GetMultiXactIdMembers(xmax, &members, allow_old);
                if (nmembers == -1)
                {
@@ -280,8 +280,8 @@ pgrowlocks(PG_FUNCTION_ARGS)
            result = HeapTupleGetDatum(tuple);
 
            /*
-            * no need to pfree what we allocated; it's on a short-lived memory
-            * context anyway
+            * no need to pfree what we allocated; it's on a short-lived
+            * memory context anyway
             */
 
            SRF_RETURN_NEXT(funcctx, result);
index 984ff7c45a063580774eaad6276b31790c9334ed..97f897ec1e5bb17d94ba170c0190bdd9d8b044bf 100644 (file)
@@ -93,7 +93,7 @@ typedef struct GinIndexStat
 {
    int32       version;
 
-   BlockNumber pending_pages;
+   BlockNumber pending_pages;
    int64       pending_tuples;
 } GinIndexStat;
 
@@ -324,7 +324,7 @@ pgstatginindex(PG_FUNCTION_ARGS)
    Relation    rel;
    Buffer      buffer;
    Page        page;
-   GinMetaPageData *metadata;
+   GinMetaPageData *metadata;
    GinIndexStat stats;
    HeapTuple   tuple;
    TupleDesc   tupleDesc;
@@ -351,7 +351,7 @@ pgstatginindex(PG_FUNCTION_ARGS)
    if (RELATION_IS_OTHER_TEMP(rel))
        ereport(ERROR,
                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                errmsg("cannot access temporary indexes of other sessions")));
+              errmsg("cannot access temporary indexes of other sessions")));
 
    /*
     * Read metapage
index 7b9e8c1b6fa67b530e3013ec8365a670a75916b7..ab098bea3af616c55cc7571936a8448b5b8b40d9 100644 (file)
@@ -326,7 +326,7 @@ configure_remote_session(PGconn *conn)
     * anyway.  However it makes the regression test outputs more predictable.
     *
     * We don't risk setting remote zone equal to ours, since the remote
-    * server might use a different timezone database.  Instead, use UTC
+    * server might use a different timezone database.  Instead, use UTC
     * (quoted, because very old servers are picky about case).
     */
    do_sql_command(conn, "SET timezone = 'UTC'");
index 49dfe2c5edb0f480c36d622c15fae3b83cb4d432..cbfecc4dd4235c74d7e42d7ae3be40bbf3bd921c 100644 (file)
@@ -133,7 +133,7 @@ typedef struct PgFdwScanState
 
    /* extracted fdw_private data */
    char       *query;          /* text of SELECT command */
-   List       *retrieved_attrs; /* list of retrieved attribute numbers */
+   List       *retrieved_attrs;    /* list of retrieved attribute numbers */
 
    /* for remote query execution */
    PGconn     *conn;           /* connection for the scan */
@@ -174,7 +174,7 @@ typedef struct PgFdwModifyState
    char       *query;          /* text of INSERT/UPDATE/DELETE command */
    List       *target_attrs;   /* list of target attribute numbers */
    bool        has_returning;  /* is there a RETURNING clause? */
-   List       *retrieved_attrs; /* attr numbers retrieved by RETURNING */
+   List       *retrieved_attrs;    /* attr numbers retrieved by RETURNING */
 
    /* info about parameters for prepared statement */
    AttrNumber  ctidAttno;      /* attnum of input resjunk ctid column */
@@ -192,7 +192,7 @@ typedef struct PgFdwAnalyzeState
 {
    Relation    rel;            /* relcache entry for the foreign table */
    AttInMetadata *attinmeta;   /* attribute datatype conversion metadata */
-   List       *retrieved_attrs; /* attr numbers retrieved by query */
+   List       *retrieved_attrs;    /* attr numbers retrieved by query */
 
    /* collected sample rows */
    HeapTuple  *rows;           /* array of size targrows */
@@ -424,8 +424,8 @@ postgresGetForeignRelSize(PlannerInfo *root,
 
    /*
     * If the table or the server is configured to use remote estimates,
-    * identify which user to do remote access as during planning.  This
-    * should match what ExecCheckRTEPerms() does.  If we fail due to lack of
+    * identify which user to do remote access as during planning.  This
+    * should match what ExecCheckRTEPerms() does.  If we fail due to lack of
     * permissions, the query would have failed at runtime anyway.
     */
    if (fpinfo->use_remote_estimate)
@@ -447,7 +447,7 @@ postgresGetForeignRelSize(PlannerInfo *root,
 
    /*
     * Identify which attributes will need to be retrieved from the remote
-    * server.  These include all attrs needed for joins or final output, plus
+    * server.  These include all attrs needed for joins or final output, plus
     * all attrs used in the local_conds.  (Note: if we end up using a
     * parameterized scan, it's possible that some of the join clauses will be
     * sent to the remote and thus we wouldn't really need to retrieve the
@@ -921,7 +921,7 @@ postgresBeginForeignScan(ForeignScanState *node, int eflags)
    fsstate->query = strVal(list_nth(fsplan->fdw_private,
                                     FdwScanPrivateSelectSql));
    fsstate->retrieved_attrs = (List *) list_nth(fsplan->fdw_private,
-                                                FdwScanPrivateRetrievedAttrs);
+                                              FdwScanPrivateRetrievedAttrs);
 
    /* Create contexts for batches of tuples and per-tuple temp workspace. */
    fsstate->batch_cxt = AllocSetContextCreate(estate->es_query_cxt,
@@ -1305,7 +1305,7 @@ postgresBeginForeignModify(ModifyTableState *mtstate,
    fmstate->has_returning = intVal(list_nth(fdw_private,
                                             FdwModifyPrivateHasReturning));
    fmstate->retrieved_attrs = (List *) list_nth(fdw_private,
-                                                FdwModifyPrivateRetrievedAttrs);
+                                            FdwModifyPrivateRetrievedAttrs);
 
    /* Create context for per-tuple temp workspace. */
    fmstate->temp_cxt = AllocSetContextCreate(estate->es_query_cxt,
@@ -1903,7 +1903,7 @@ create_cursor(ForeignScanState *node)
     * Notice that we pass NULL for paramTypes, thus forcing the remote server
     * to infer types for all parameters.  Since we explicitly cast every
     * parameter (see deparse.c), the "inference" is trivial and will produce
-    * the desired result.  This allows us to avoid assuming that the remote
+    * the desired result.  This allows us to avoid assuming that the remote
     * server has the same OIDs we do for the parameters' types.
     *
     * We don't use a PG_TRY block here, so be careful not to throw error
@@ -2488,7 +2488,7 @@ analyze_row_processor(PGresult *res, int row, PgFdwAnalyzeState *astate)
        astate->rows[pos] = make_tuple_from_result_row(res, row,
                                                       astate->rel,
                                                       astate->attinmeta,
-                                                      astate->retrieved_attrs,
+                                                    astate->retrieved_attrs,
                                                       astate->temp_cxt);
 
        MemoryContextSwitchTo(oldcontext);
index 2939d2b61da5ee417ee1c26ebc3c1c7aa90e8853..c782d4fea12055e97f06542911292dc82992fb79 100644 (file)
@@ -71,6 +71,6 @@ extern void deparseDeleteSql(StringInfo buf, PlannerInfo *root,
                 List **retrieved_attrs);
 extern void deparseAnalyzeSizeSql(StringInfo buf, Relation rel);
 extern void deparseAnalyzeSql(StringInfo buf, Relation rel,
-                             List **retrieved_attrs);
+                 List **retrieved_attrs);
 
 #endif   /* POSTGRES_FDW_H */
index a1320e86381a9b398b8d6a39cdd4f68242d199c5..d950b3e96419eabff9048dd9e15319815c391441 100644 (file)
@@ -98,7 +98,7 @@ sepgsql_object_access(ObjectAccessType access,
        case OAT_POST_CREATE:
            {
                ObjectAccessPostCreate *pc_arg = arg;
-               bool    is_internal;
+               bool        is_internal;
 
                is_internal = pc_arg ? pc_arg->is_internal : false;
 
@@ -107,7 +107,7 @@ sepgsql_object_access(ObjectAccessType access,
                    case DatabaseRelationId:
                        Assert(!is_internal);
                        sepgsql_database_post_create(objectId,
-                                                    sepgsql_context_info.createdb_dtemplate);
+                                   sepgsql_context_info.createdb_dtemplate);
                        break;
 
                    case NamespaceRelationId:
@@ -190,8 +190,8 @@ sepgsql_object_access(ObjectAccessType access,
 
        case OAT_POST_ALTER:
            {
-               ObjectAccessPostAlter  *pa_arg = arg;
-               bool    is_internal = pa_arg->is_internal;
+               ObjectAccessPostAlter *pa_arg = arg;
+               bool        is_internal = pa_arg->is_internal;
 
                switch (classId)
                {
@@ -207,21 +207,21 @@ sepgsql_object_access(ObjectAccessType access,
 
                    case RelationRelationId:
                        if (subId == 0)
-                        {
+                       {
                            /*
                             * A case when we don't want to apply permission
                             * check is that relation is internally altered
-                            * without user's intention. E.g, no need to
-                            * check on toast table/index to be renamed at
-                            * end of the table rewrites.
+                            * without user's intention. E.g, no need to check
+                            * on toast table/index to be renamed at end of
+                            * the table rewrites.
                             */
                            if (is_internal)
-                                break;
+                               break;
 
                            sepgsql_relation_setattr(objectId);
-                        }
-                        else
-                            sepgsql_attribute_setattr(objectId, subId);
+                       }
+                       else
+                           sepgsql_attribute_setattr(objectId, subId);
                        break;
 
                    case ProcedureRelationId:
@@ -238,11 +238,11 @@ sepgsql_object_access(ObjectAccessType access,
 
        case OAT_NAMESPACE_SEARCH:
            {
-               ObjectAccessNamespaceSearch   *ns_arg = arg;
+               ObjectAccessNamespaceSearch *ns_arg = arg;
 
                /*
-                * If stacked extension already decided not to allow users
-                * to search this schema, we just stick with that decision.
+                * If stacked extension already decided not to allow users to
+                * search this schema, we just stick with that decision.
                 */
                if (!ns_arg->result)
                    break;
index 6146399e8079e17ab251018aba7bfa3abd46ab3d..17b832efe228be5b46fa578058341ae97f48cd7c 100644 (file)
@@ -351,9 +351,8 @@ sepgsql_fmgr_hook(FmgrHookEventType event,
                 *
                 * Also, db_procedure:entrypoint permission should be checked
                 * whether this procedure can perform as an entrypoint of the
-                * trusted procedure, or not.
-                * Note that db_procedure:execute permission shall be checked
-                * individually.
+                * trusted procedure, or not. Note that db_procedure:execute
+                * permission shall be checked individually.
                 */
                if (stack->new_label)
                {
index 0230028b2a832e10970e16c8f5f9ab22ac539c37..c89f31a789ce7ef4d348fa91dc228baa8afffec5 100644 (file)
@@ -236,16 +236,16 @@ sepgsql_proc_relabel(Oid functionId, const char *seclabel)
 void
 sepgsql_proc_setattr(Oid functionId)
 {
-   Relation        rel;
-   ScanKeyData     skey;
-   SysScanDesc     sscan;
-   HeapTuple       oldtup;
-   HeapTuple       newtup;
-   Form_pg_proc    oldform;
-   Form_pg_proc    newform;
-   uint32          required;
-   ObjectAddress   object;
-   char           *audit_name;
+   Relation    rel;
+   ScanKeyData skey;
+   SysScanDesc sscan;
+   HeapTuple   oldtup;
+   HeapTuple   newtup;
+   Form_pg_proc oldform;
+   Form_pg_proc newform;
+   uint32      required;
+   ObjectAddress object;
+   char       *audit_name;
 
    /*
     * Fetch newer catalog
@@ -297,7 +297,7 @@ sepgsql_proc_setattr(Oid functionId)
 
    sepgsql_avc_check_perms(&object,
                            SEPG_CLASS_DB_PROCEDURE,
-                            required,
+                           required,
                            audit_name,
                            true);
    /* cleanups */
index c1fd1c2e19e3bceb5dc4830c2f996a621eb99466..a3005ad89763d01330b6393fb7334ffb230477db 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "sepgsql.h"
 
-static void        sepgsql_index_modify(Oid indexOid);
+static void sepgsql_index_modify(Oid indexOid);
 
 /*
  * sepgsql_attribute_post_create
@@ -571,13 +571,13 @@ sepgsql_relation_relabel(Oid relOid, const char *seclabel)
 void
 sepgsql_relation_setattr(Oid relOid)
 {
-   Relation        rel;
-   ScanKeyData     skey;
-   SysScanDesc     sscan;
-   HeapTuple       oldtup;
-   HeapTuple       newtup;
-   Form_pg_class   oldform;
-   Form_pg_class   newform;
+   Relation    rel;
+   ScanKeyData skey;
+   SysScanDesc sscan;
+   HeapTuple   oldtup;
+   HeapTuple   newtup;
+   Form_pg_class oldform;
+   Form_pg_class newform;
    ObjectAddress object;
    char       *audit_name;
    uint16_t    tclass;
@@ -680,8 +680,8 @@ sepgsql_relation_setattr_extra(Relation catalog,
                               AttrNumber anum_relation_id,
                               AttrNumber anum_extra_id)
 {
-   ScanKeyData skey;
-   SysScanDesc sscan;
+   ScanKeyData skey;
+   SysScanDesc sscan;
    HeapTuple   tuple;
    Datum       datum;
    bool        isnull;
@@ -708,7 +708,7 @@ sepgsql_relation_setattr_extra(Relation catalog,
 
 /*
  * sepgsql_index_modify
- *         Handle index create, update, drop
+ *     Handle index create, update, drop
  *
  * Unlike other relation kinds, indexes do not have their own security labels,
  * so instead of doing checks directly, treat them as extra attributes of their
index 442ccd4f61a87c8cc24da7b6c88c6813e8049780..709de23adccf2bdf6495b1c1a51076be1a585119 100644 (file)
@@ -81,6 +81,7 @@ sepgsql_schema_post_create(Oid namespaceId)
                                      tcontext,
                                      SEPG_CLASS_DB_SCHEMA,
                                      nsp_name);
+
    /*
     * check db_schema:{create}
     */
index 5c122c18321940d880036c84f0844773763b12e7..2770d895b2ef6e4b73585f6ea3a654d2ee4962fe 100644 (file)
@@ -40,7 +40,7 @@ typedef struct TrieChar
 static TrieChar *
 placeChar(TrieChar *node, unsigned char *str, int lenstr, char *replaceTo, int replacelen)
 {
-   TrieChar *curnode;
+   TrieChar   *curnode;
 
    if (!node)
    {
@@ -77,7 +77,7 @@ placeChar(TrieChar *node, unsigned char *str, int lenstr, char *replaceTo, int r
 static TrieChar *
 initTrie(char *filename)
 {
-   TrieChar *volatile rootTrie = NULL;
+   TrieChar   *volatile rootTrie = NULL;
    MemoryContext ccxt = CurrentMemoryContext;
    tsearch_readline_state trst;
    volatile bool skip;
@@ -162,8 +162,8 @@ initTrie(char *filename)
 
                if (state >= 3)
                    rootTrie = placeChar(rootTrie,
-                                              (unsigned char *) src, srclen,
-                                              trg, trglen);
+                                        (unsigned char *) src, srclen,
+                                        trg, trglen);
 
                pfree(line);
            }
index 607849c9120ec2b0f6c85ef98d2528276c675a53..70f7ea70ba08dc11eb1d037aabc2d18f75e49a32 100644 (file)
@@ -82,7 +82,7 @@ vacuumlo(const char *database, const struct _param * param)
     */
    do
    {
-#define PARAMS_ARRAY_SIZE      7
+#define PARAMS_ARRAY_SIZE     7
 
        const char *keywords[PARAMS_ARRAY_SIZE];
        const char *values[PARAMS_ARRAY_SIZE];
index 344455cd579e7409fad3418d930094496c469760..414721a70fe9e43737d3b55c81ef10e34ba795e4 100644 (file)
 
 PG_MODULE_MAGIC;
 
-void   _PG_init(void);
+void       _PG_init(void);
 
 /* flags set by signal handlers */
 static volatile sig_atomic_t got_sighup = false;
 static volatile sig_atomic_t got_sigterm = false;
 
 /* GUC variables */
-static int  worker_spi_naptime = 10;
-static int  worker_spi_total_workers = 2;
+static int worker_spi_naptime = 10;
+static int worker_spi_total_workers = 2;
 
 
 typedef struct worktable
 {
-   const char     *schema;
-   const char     *name;
+   const char *schema;
+   const char *name;
 } worktable;
 
 /*
  * Signal handler for SIGTERM
- *         Set a flag to let the main loop to terminate, and set our latch to wake
- *         it up.
+ *     Set a flag to let the main loop to terminate, and set our latch to wake
+ *     it up.
  */
 static void
 worker_spi_sigterm(SIGNAL_ARGS)
@@ -79,8 +79,8 @@ worker_spi_sigterm(SIGNAL_ARGS)
 
 /*
  * Signal handler for SIGHUP
- *         Set a flag to let the main loop to reread the config file, and set
- *         our latch to wake it up.
+ *     Set a flag to let the main loop to reread the config file, and set
+ *     our latch to wake it up.
  */
 static void
 worker_spi_sighup(SIGNAL_ARGS)
@@ -97,10 +97,10 @@ worker_spi_sighup(SIGNAL_ARGS)
 static void
 initialize_worker_spi(worktable *table)
 {
-   int     ret;
-   int     ntup;
-   bool    isnull;
-   StringInfoData  buf;
+   int         ret;
+   int         ntup;
+   bool        isnull;
+   StringInfoData buf;
 
    SetCurrentStatementStartTimestamp();
    StartTransactionCommand();
@@ -132,11 +132,11 @@ initialize_worker_spi(worktable *table)
        appendStringInfo(&buf,
                         "CREATE SCHEMA \"%s\" "
                         "CREATE TABLE \"%s\" ("
-                        "      type text CHECK (type IN ('total', 'delta')), "
+              "        type text CHECK (type IN ('total', 'delta')), "
                         "      value   integer)"
-                        "CREATE UNIQUE INDEX \"%s_unique_total\" ON \"%s\" (type) "
+                 "CREATE UNIQUE INDEX \"%s_unique_total\" ON \"%s\" (type) "
                         "WHERE type = 'total'",
-                        table->schema, table->name, table->name, table->name);
+                      table->schema, table->name, table->name, table->name);
 
        /* set statement start time */
        SetCurrentStatementStartTimestamp();
@@ -156,8 +156,8 @@ initialize_worker_spi(worktable *table)
 static void
 worker_spi_main(void *main_arg)
 {
-   worktable      *table = (worktable *) main_arg;
-   StringInfoData  buf;
+   worktable  *table = (worktable *) main_arg;
+   StringInfoData buf;
 
    /* We're now ready to receive signals */
    BackgroundWorkerUnblockSignals();
@@ -170,7 +170,7 @@ worker_spi_main(void *main_arg)
    initialize_worker_spi(table);
 
    /*
-    * Quote identifiers passed to us.  Note that this must be done after
+    * Quote identifiers passed to us.  Note that this must be done after
     * initialize_worker_spi, because that routine assumes the names are not
     * quoted.
     *
@@ -200,8 +200,8 @@ worker_spi_main(void *main_arg)
     */
    while (!got_sigterm)
    {
-       int     ret;
-       int     rc;
+       int         ret;
+       int         rc;
 
        /*
         * Background workers mustn't call usleep() or any direct equivalent:
@@ -221,27 +221,27 @@ worker_spi_main(void *main_arg)
        /*
         * In case of a SIGHUP, just reload the configuration.
         */
-        if (got_sighup)
-        {
-            got_sighup = false;
-            ProcessConfigFile(PGC_SIGHUP);
-        }
+       if (got_sighup)
+       {
+           got_sighup = false;
+           ProcessConfigFile(PGC_SIGHUP);
+       }
 
        /*
         * Start a transaction on which we can run queries.  Note that each
         * StartTransactionCommand() call should be preceded by a
         * SetCurrentStatementStartTimestamp() call, which sets both the time
         * for the statement we're about the run, and also the transaction
-        * start time.  Also, each other query sent to SPI should probably be
+        * start time.  Also, each other query sent to SPI should probably be
         * preceded by SetCurrentStatementStartTimestamp(), so that statement
         * start time is always up to date.
         *
         * The SPI_connect() call lets us run queries through the SPI manager,
-        * and the PushActiveSnapshot() call creates an "active" snapshot which
-        * is necessary for queries to have MVCC data to work on.
+        * and the PushActiveSnapshot() call creates an "active" snapshot
+        * which is necessary for queries to have MVCC data to work on.
         *
-        * The pgstat_report_activity() call makes our activity visible through
-        * the pgstat views.
+        * The pgstat_report_activity() call makes our activity visible
+        * through the pgstat views.
         */
        SetCurrentStatementStartTimestamp();
        StartTransactionCommand();
@@ -258,12 +258,12 @@ worker_spi_main(void *main_arg)
 
        if (SPI_processed > 0)
        {
-           bool    isnull;
-           int32   val;
+           bool        isnull;
+           int32       val;
 
            val = DatumGetInt32(SPI_getbinval(SPI_tuptable->vals[0],
-                                              SPI_tuptable->tupdesc,
-                                              1, &isnull));
+                                             SPI_tuptable->tupdesc,
+                                             1, &isnull));
            if (!isnull)
                elog(LOG, "%s: count in %s.%s is now %d",
                     MyBgworkerEntry->bgw_name,
@@ -291,36 +291,36 @@ worker_spi_main(void *main_arg)
 void
 _PG_init(void)
 {
-   BackgroundWorker    worker;
-   worktable          *table;
-   unsigned int        i;
-   char                name[20];
+   BackgroundWorker worker;
+   worktable  *table;
+   unsigned int i;
+   char        name[20];
 
    /* get the configuration */
    DefineCustomIntVariable("worker_spi.naptime",
-               "Duration between each check (in seconds).",
-               NULL,
-               &worker_spi_naptime,
-               10,
-               1,
-               INT_MAX,
-               PGC_SIGHUP,
-               0,
-               NULL,
-               NULL,
-               NULL);
+                           "Duration between each check (in seconds).",
+                           NULL,
+                           &worker_spi_naptime,
+                           10,
+                           1,
+                           INT_MAX,
+                           PGC_SIGHUP,
+                           0,
+                           NULL,
+                           NULL,
+                           NULL);
    DefineCustomIntVariable("worker_spi.total_workers",
-               "Number of workers.",
-               NULL,
-               &worker_spi_total_workers,
-               2,
-               1,
-               100,
-               PGC_POSTMASTER,
-               0,
-               NULL,
-               NULL,
-               NULL);
+                           "Number of workers.",
+                           NULL,
+                           &worker_spi_total_workers,
+                           2,
+                           1,
+                           100,
+                           PGC_POSTMASTER,
+                           0,
+                           NULL,
+                           NULL,
+                           NULL);
 
    /* set up common data for all our workers */
    worker.bgw_flags = BGWORKER_SHMEM_ACCESS |
index 7acc8f646ec8a4693fb3fbe925958e80e7dea5e9..2a6be4b1a9954c480761baedb40f7875501ceaae 100644 (file)
@@ -173,7 +173,6 @@ void
 ginFindParents(GinBtree btree, GinBtreeStack *stack,
               BlockNumber rootBlkno)
 {
-
    Page        page;
    Buffer      buffer;
    BlockNumber blkno,
index 46f7ce65635269106e8fc5b847adf10097ba5a09..2f2edb8362628fd63e1367fbfe9b7209f1bd2f1b 100644 (file)
@@ -610,9 +610,9 @@ gistProcessItup(GISTBuildState *buildstate, IndexTuple itup,
        newtup = gistgetadjusted(indexrel, idxtuple, itup, giststate);
        if (newtup)
        {
-           blkno  = gistbufferinginserttuples(buildstate, buffer, level,
-                                              &newtup, 1, childoffnum,
-                                     InvalidBlockNumber, InvalidOffsetNumber);
+           blkno = gistbufferinginserttuples(buildstate, buffer, level,
+                                             &newtup, 1, childoffnum,
+                                   InvalidBlockNumber, InvalidOffsetNumber);
            /* gistbufferinginserttuples() released the buffer */
        }
        else
@@ -680,7 +680,7 @@ gistbufferinginserttuples(GISTBuildState *buildstate, Buffer buffer, int level,
    GISTBuildBuffers *gfbb = buildstate->gfbb;
    List       *splitinfo;
    bool        is_split;
-   BlockNumber placed_to_blk = InvalidBlockNumber;
+   BlockNumber placed_to_blk = InvalidBlockNumber;
 
    is_split = gistplacetopage(buildstate->indexrel,
                               buildstate->freespace,
index cef31ce66e99be832f7f3d00e6b9abc1a40bc43a..e97ab8f3fd59397d21100657fe3fa6c934d70110 100644 (file)
@@ -364,8 +364,9 @@ gistScanPage(IndexScanDesc scan, GISTSearchItem *pageItem, double *myDistances,
                item->blkno = ItemPointerGetBlockNumber(&it->t_tid);
 
                /*
-                * LSN of current page is lsn of parent page for child. We only
-                * have a shared lock, so we need to get the LSN atomically.
+                * LSN of current page is lsn of parent page for child. We
+                * only have a shared lock, so we need to get the LSN
+                * atomically.
                 */
                item->data.parentlsn = BufferGetLSNAtomic(buffer);
            }
index f7d50ddb7120c83c240a06f71338822e34825dd2..b9c1967ebc0161683b7ae3982a0e735841aed85c 100644 (file)
@@ -414,7 +414,7 @@ gistchoose(Relation r, Page p, IndexTuple it,   /* it has compressed entry */
     * some inserts to go to other equally-good subtrees.
     *
     * keep_current_best is -1 if we haven't yet had to make a random choice
-    * whether to keep the current best tuple.  If we have done so, and
+    * whether to keep the current best tuple.  If we have done so, and
     * decided to keep it, keep_current_best is 1; if we've decided to
     * replace, keep_current_best is 0.  (This state will be reset to -1 as
     * soon as we've made the replacement, but sometimes we make the choice in
@@ -810,8 +810,8 @@ gistGetFakeLSN(Relation rel)
    if (rel->rd_rel->relpersistence == RELPERSISTENCE_TEMP)
    {
        /*
-        * Temporary relations are only accessible in our session, so a
-        * simple backend-local counter will do.
+        * Temporary relations are only accessible in our session, so a simple
+        * backend-local counter will do.
         */
        return counter++;
    }
index 3daeea396bedf179046da90fa3402fa76fa0503a..17946bfec3f718ae9b9c4b6d90d50f5ea05669e0 100644 (file)
@@ -38,7 +38,7 @@ static MemoryContext opCtx;       /* working memory for operations */
  * follow-right flag, because that change is not included in the full-page
  * image.  To be sure that the intermediate state with the wrong flag value is
  * not visible to concurrent Hot Standby queries, this function handles
- * restoring the full-page image as well as updating the flag.  (Note that
+ * restoring the full-page image as well as updating the flag. (Note that
  * we never need to do anything else to the child page in the current WAL
  * action.)
  */
@@ -89,7 +89,7 @@ gistRedoPageUpdateRecord(XLogRecPtr lsn, XLogRecord *record)
 
    /*
     * We need to acquire and hold lock on target page while updating the left
-    * child page.  If we have a full-page image of target page, getting the
+    * child page.  If we have a full-page image of target page, getting the
     * lock is a side-effect of restoring that image.  Note that even if the
     * target page no longer exists, we'll still attempt to replay the change
     * on the child page.
index 63be2f37872cb799af2833cc9fc57fd7c44374b9..4508a36bd051bc7e828f157e3eab811865ed5863 100644 (file)
@@ -90,7 +90,7 @@ _hash_doinsert(Relation rel, IndexTuple itup)
 
        /*
         * If the previous iteration of this loop locked what is still the
-        * correct target bucket, we are done.  Otherwise, drop any old lock
+        * correct target bucket, we are done.  Otherwise, drop any old lock
         * and lock what now appears to be the correct bucket.
         */
        if (retry)