NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit382ceff

committed

Phase 3 of pgindent updates.

Don't move parenthesized lines to the left, even if that means theyflow past the right margin.By default, BSD indent lines up statement continuation lines that arewithin parentheses so that they start just to the right of the precedingleft parenthesis. However, traditionally, if that resulted in thecontinuation line extending to the right of the desired right margin,then indent would push it left just far enough to not overrun the margin,if it could do so without making the continuation line start to the left ofthe current statement indent. That makes for a weird mix of indentationsunless one has been completely rigid about never violating the 80-columnlimit.This behavior has been pretty universally panned by Postgres developers.Hence, disable it with indent's new -lpl switch, so that parenthesizedlines are always lined up with the preceding left paren.This patch is much less interesting than the first round of indentchanges, but also bulkier, so I thought it best to separate the effects.Discussion:https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.orgDiscussion:https://postgr.es/m/30527.1495162840@sss.pgh.pa.us

1 parentc7b8998 commit382ceffCopy full SHA for 382ceff

File tree

568 files changed

+4747

-4745

lines changed

contrib
- adminpack
  - adminpack.c
- amcheck
  - verify_nbtree.c
- auth_delay
  - auth_delay.c
- auto_explain
  - auto_explain.c
- bloom
  - bloom.h
  - blvacuum.c
- btree_gin
  - btree_gin.c
- btree_gist
  - btree_cash.c
  - btree_date.c
  - btree_enum.c
  - btree_float4.c
  - btree_float8.c
  - btree_inet.c
  - btree_int2.c
  - btree_int4.c
  - btree_int8.c
  - btree_interval.c
  - btree_macaddr.c
  - btree_macaddr8.c
  - btree_oid.c
  - btree_time.c
  - btree_ts.c
  - btree_utils_var.c
  - btree_uuid.c
- cube
  - cube.c
- dblink
  - dblink.c
- earthdistance
  - earthdistance.c
- file_fdw
  - file_fdw.c
- hstore
  - hstore_io.c
  - hstore_op.c
- intarray
  - _int_bool.c
  - _int_gist.c
  - _int_op.c
  - _int_selfuncs.c
- isn
  - isn.c
- ltree
  - _ltree_op.c
  - lquery_op.c
  - ltree.h
  - ltree_gist.c
  - ltree_io.c
- oid2name
  - oid2name.c
- pageinspect
  - brinfuncs.c
  - btreefuncs.c
  - ginfuncs.c
  - hashfuncs.c
  - heapfuncs.c
  - rawpage.c
- passwordcheck
  - passwordcheck.c
- pg_prewarm
  - pg_prewarm.c
- pg_standby
  - pg_standby.c
- pg_stat_statements
  - pg_stat_statements.c
- pg_visibility
  - pg_visibility.c
- pgcrypto
  - crypt-blowfish.c
  - crypt-gensalt.c
  - pgp-pgsql.c
  - px-crypt.h
- pgrowlocks
  - pgrowlocks.c
- pgstattuple
  - pgstatapprox.c
  - pgstatindex.c
- postgres_fdw
  - connection.c
  - deparse.c
  - option.c
  - postgres_fdw.c
- seg
  - seg.c
- sepgsql
  - hooks.c
  - label.c
  - proc.c
  - uavc.c
- spi
  - refint.c
- sslinfo
  - sslinfo.c
- tablefunc
  - tablefunc.c
- tcn
  - tcn.c
- test_decoding
  - test_decoding.c
- unaccent
  - unaccent.c
- xml2
  - xpath.c
  - xslt_proc.c
src
- backend
  - access
    - brin
    - common
      - indextuple.c
      - reloptions.c
    - gin
    - gist
    - hash
    - heap
    - index
      - indexam.c
    - nbtree
    - rmgrdesc
    - spgist
    - transam
  - bootstrap
    - bootstrap.c
  - catalog
    - aclchk.c
    - dependency.c
    - heap.c
    - index.c
    - namespace.c
    - objectaddress.c
    - partition.c
    - pg_aggregate.c
    - pg_collation.c
    - pg_constraint.c
    - pg_depend.c
    - pg_enum.c
    - pg_operator.c
    - pg_proc.c
    - pg_publication.c
    - pg_shdepend.c
    - pg_type.c
  - commands
    - aggregatecmds.c
    - alter.c
    - analyze.c
    - async.c
    - cluster.c
    - collationcmds.c
    - copy.c
    - createas.c
    - dbcommands.c
    - define.c
    - dropcmds.c
    - event_trigger.c
    - explain.c
    - extension.c
    - foreigncmds.c
    - functioncmds.c
    - indexcmds.c
    - matview.c
    - opclasscmds.c
    - operatorcmds.c
    - policy.c
    - prepare.c
    - proclang.c
    - publicationcmds.c
    - schemacmds.c
    - sequence.c
    - statscmds.c
    - subscriptioncmds.c
    - tablecmds.c
    - tablespace.c
    - trigger.c
    - tsearchcmds.c
    - typecmds.c
    - user.c
    - vacuum.c
    - vacuumlazy.c
    - variable.c
    - view.c
  - executor
    - execExpr.c
    - execExprInterp.c
    - execIndexing.c
    - execMain.c
    - execParallel.c
    - execProcnode.c
    - execReplication.c
    - execSRF.c
    - execTuples.c
    - functions.c
    - nodeAgg.c
    - nodeBitmapIndexscan.c
    - nodeFunctionscan.c
    - nodeGatherMerge.c
    - nodeHash.c
    - nodeHashjoin.c
    - nodeIndexonlyscan.c
    - nodeIndexscan.c
    - nodeLimit.c
    - nodeMergejoin.c
    - nodeModifyTable.c
    - nodeNestloop.c
    - nodeSamplescan.c
    - nodeSeqscan.c
    - nodeTableFuncscan.c
    - nodeTidscan.c
    - nodeWindowAgg.c
    - spi.c
    - tqueue.c
    - tstoreReceiver.c
  - lib
    - pairingheap.c
  - libpq
    - auth-scram.c
    - auth.c
    - be-fsstubs.c
    - be-secure-openssl.c
    - hba.c
    - pqcomm.c
  - main
    - main.c
  - nodes
    - nodeFuncs.c
    - params.c
    - tidbitmap.c
  - optimizer
    - path
    - plan
    - prep
      - prepjointree.c
      - prepunion.c
    - util
  - parser
    - analyze.c
    - parse_agg.c
    - parse_clause.c
    - parse_coerce.c
    - parse_collate.c
    - parse_cte.c
    - parse_expr.c
    - parse_func.c
    - parse_node.c
    - parse_oper.c
    - parse_param.c
    - parse_relation.c
    - parse_target.c
    - parse_type.c
    - parse_utilcmd.c
  - port
    - dynloader
      - hpux.c
    - sysv_sema.c
    - sysv_shmem.c
    - win32
  - postmaster
    - autovacuum.c
    - bgworker.c
    - checkpointer.c
    - pgarch.c
    - pgstat.c
    - postmaster.c
    - syslogger.c
  - replication
    - basebackup.c
    - libpqwalreceiver
      - libpqwalreceiver.c
    - logical
    - pgoutput
      - pgoutput.c
    - slot.c
    - syncrep.c
    - walreceiver.c
    - walsender.c
  - rewrite
    - rewriteDefine.c
    - rewriteHandler.c
    - rewriteManip.c
    - rowsecurity.c
  - statistics
    - dependencies.c
    - extended_stats.c
    - mvdistinct.c
  - storage
    - buffer
    - file
      - fd.c
    - ipc
    - large_object
      - inv_api.c
    - lmgr
    - page
      - bufpage.c
    - smgr
      - md.c
      - smgr.c
  - tcop
    - fastpath.c
    - postgres.c
    - pquery.c
    - utility.c
  - tsearch
    - dict.c
    - dict_ispell.c
    - dict_simple.c
    - dict_thesaurus.c
    - spell.c
    - to_tsany.c
    - ts_locale.c
    - ts_parse.c
    - ts_typanalyze.c
    - wparser.c
    - wparser_def.c
  - utils
    - adt
    - cache
    - error
      - elog.c
    - fmgr
    - hash
      - dynahash.c
    - init
      - miscinit.c
      - postinit.c
    - mb
      - conversion_procs
        utf8_and_euc2004
        utf8_and_euc2004.c
        utf8_and_sjis2004
        utf8_and_sjis2004.c
      - mbutils.c
      - wchar.c
    - misc
    - mmgr
    - sort
    - time
      - combocid.c
      - snapmgr.c
- bin
  - initdb
    - findtimezone.c
    - initdb.c
  - pg_basebackup
  - pg_ctl
    - pg_ctl.c
  - pg_dump
  - pg_resetwal
    - pg_resetwal.c
  - pg_rewind
  - pg_test_timing
    - pg_test_timing.c
  - pg_upgrade
  - pg_waldump
    - compat.c
    - pg_waldump.c
  - pgbench
    - pgbench.c
  - pgevent
    - pgevent.c
  - psql
  - scripts
- common
- fe_utils
  - mbprint.c
  - print.c
- include
  - access
  - catalog
    - pg_constraint_fn.h
  - commands
    - createas.h
    - explain.h
  - executor
    - executor.h
    - nodeIndexscan.h
  - foreign
    - fdwapi.h
  - lib
    - pairingheap.h
  - mb
    - pg_wchar.h
  - optimizer
    - cost.h
  - parser
    - parse_relation.h
  - pgtar.h
  - postgres.h
  - replication
    - logical.h
    - reorderbuffer.h
  - rewrite
    - rewriteManip.h
  - storage
    - procarray.h
    - sinval.h
  - tcop
    - utility.h
  - utils
- interfaces
  - ecpg
    - ecpglib
    - pgtypeslib
      - dt_common.c
    - preproc
  - libpq
- pl
  - plperl
    - plperl.c
  - plpgsql/src
  - plpython
  - tcl
    - pltcl.c
- port
- test
  - isolation
    - isolationtester.c
  - modules
    - test_shm_mq
    - worker_spi
      - worker_spi.c
  - regress
    - pg_regress.c
    - regress.c
- timezone
  - pgtz.c
- tools
  - findoidjoins
    - findoidjoins.c
  - pgindent
    - pgindent

Some content is hidden

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

568 files changed

+4747

-4745

lines changed

`‎contrib/adminpack/adminpack.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ convert_and_check_filename(text *arg, bool logAllowed)`
`74`	`74`	`if (path_contains_parent_reference(filename))`
`75`	`75`	`ereport(ERROR,`
`76`	`76`	`(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`77`		`-(errmsg("reference to parent directory (\"..\") not allowed"))));`
	`77`	`+(errmsg("reference to parent directory (\"..\") not allowed"))));`
`78`	`78`
`79`	`79`	`/*`
`80`	`80`	`* Allow absolute paths if within DataDir or Log_directory, even`
`@@ -105,7 +105,7 @@ requireSuperuser(void)`
`105`	`105`	`if (!superuser())`
`106`	`106`	`ereport(ERROR,`
`107`	`107`	`(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`108`		`- (errmsg("only superuser may access generic file functions"))));`
	`108`	`+ (errmsg("only superuser may access generic file functions"))));`
`109`	`109`	`}`
`110`	`110`
`111`	`111`

`‎contrib/amcheck/verify_nbtree.c`

Lines changed: 31 additions & 31 deletions

Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,8 @@ btree_index_checkable(Relation rel)`
`240`	`240`	`ereport(ERROR,`
`241`	`241`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`242`	`242`	`errmsg("cannot access temporary tables of other sessions"),`
`243`		`-errdetail("Index \"%s\" is associated with temporary relation.",`
`244`		`-RelationGetRelationName(rel))));`
	`243`	`+errdetail("Index \"%s\" is associated with temporary relation.",`
	`244`	`+RelationGetRelationName(rel))));`
`245`	`245`
`246`	`246`	`if (!IndexIsValid(rel->rd_index))`
`247`	`247`	`ereport(ERROR,`
`@@ -411,12 +411,12 @@ bt_check_level_from_leftmost(BtreeCheckState *state, BtreeLevel level)`
`411`	`411`	`ereport(ERROR,`
`412`	`412`	`(errcode(ERRCODE_INDEX_CORRUPTED),`
`413`	`413`	`errmsg("block %u fell off the end of index \"%s\"",`
`414`		`-current,RelationGetRelationName(state->rel))));`
	`414`	`+current,RelationGetRelationName(state->rel))));`
`415`	`415`	`else`
`416`	`416`	`ereport(DEBUG1,`
`417`	`417`	`(errcode(ERRCODE_NO_DATA),`
`418`	`418`	`errmsg("block %u of index \"%s\" ignored",`
`419`		`-current,RelationGetRelationName(state->rel))));`
	`419`	`+current,RelationGetRelationName(state->rel))));`
`420`	`420`	`gotonextpage;`
`421`	`421`	`}`
`422`	`422`	`elseif (nextleveldown.leftmost==InvalidBlockNumber)`
`@@ -433,14 +433,14 @@ bt_check_level_from_leftmost(BtreeCheckState *state, BtreeLevel level)`
`433`	`433`	`if (!P_LEFTMOST(opaque))`
`434`	`434`	`ereport(ERROR,`
`435`	`435`	`(errcode(ERRCODE_INDEX_CORRUPTED),`
`436`		`-errmsg("block %u is not leftmost in index \"%s\"",`
`437`		`-current,RelationGetRelationName(state->rel))));`
	`436`	`+errmsg("block %u is not leftmost in index \"%s\"",`
	`437`	`+current,RelationGetRelationName(state->rel))));`
`438`	`438`
`439`	`439`	`if (level.istruerootlevel&& !P_ISROOT(opaque))`
`440`	`440`	`ereport(ERROR,`
`441`	`441`	`(errcode(ERRCODE_INDEX_CORRUPTED),`
`442`		`-errmsg("block %u is not true root in index \"%s\"",`
`443`		`-current,RelationGetRelationName(state->rel))));`
	`442`	`+errmsg("block %u is not true root in index \"%s\"",`
	`443`	`+current,RelationGetRelationName(state->rel))));`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`/*`
`@@ -488,7 +488,7 @@ bt_check_level_from_leftmost(BtreeCheckState *state, BtreeLevel level)`
`488`	`488`	`errmsg("left link/right link pair in index \"%s\" not in agreement",`
`489`	`489`	`RelationGetRelationName(state->rel)),`
`490`	`490`	`errdetail_internal("Block=%u left block=%u left link from block=%u.",`
`491`		`-current,leftcurrent,opaque->btpo_prev)));`
	`491`	`+current,leftcurrent,opaque->btpo_prev)));`
`492`	`492`
`493`	`493`	`/* Check level, which must be valid for non-ignorable page */`
`494`	`494`	`if (level.level!=opaque->btpo.level)`
`@@ -497,7 +497,7 @@ bt_check_level_from_leftmost(BtreeCheckState *state, BtreeLevel level)`
`497`	`497`	`errmsg("leftmost down link for level points to block in index \"%s\" whose level is not one level down",`
`498`	`498`	`RelationGetRelationName(state->rel)),`
`499`	`499`	`errdetail_internal("Block pointed to=%u expected level=%u level in pointed to block=%u.",`
`500`		`-current,level.level,opaque->btpo.level)));`
	`500`	`+current,level.level,opaque->btpo.level)));`
`501`	`501`
`502`	`502`	`/* Verify invariants for page -- all important checks occur here */`
`503`	`503`	`bt_target_page_check(state);`
`@@ -508,8 +508,8 @@ bt_check_level_from_leftmost(BtreeCheckState *state, BtreeLevel level)`
`508`	`508`	`if (current==leftcurrent\|\|current==opaque->btpo_prev)`
`509`	`509`	`ereport(ERROR,`
`510`	`510`	`(errcode(ERRCODE_INDEX_CORRUPTED),`
`511`		`-errmsg("circular link chain found in block %u of index \"%s\"",`
`512`		`-current,RelationGetRelationName(state->rel))));`
	`511`	`+errmsg("circular link chain found in block %u of index \"%s\"",`
	`512`	`+current,RelationGetRelationName(state->rel))));`
`513`	`513`
`514`	`514`	`leftcurrent=current;`
`515`	`515`	`current=opaque->btpo_next;`
`@@ -665,17 +665,17 @@ bt_target_page_check(BtreeCheckState *state)`
`665`	`665`	`(errcode(ERRCODE_INDEX_CORRUPTED),`
`666`	`666`	`errmsg("item order invariant violated for index \"%s\"",`
`667`	`667`	`RelationGetRelationName(state->rel)),`
`668`		`-errdetail_internal("Lower index tid=%s (points to %s tid=%s) "`
`669`		`-"higher index tid=%s (points to %s tid=%s) "`
`670`		`-"page lsn=%X/%X.",`
`671`		`-itid,`
`672`		`-P_ISLEAF(topaque) ?"heap" :"index",`
`673`		`-htid,`
`674`		`-nitid,`
`675`		`-P_ISLEAF(topaque) ?"heap" :"index",`
`676`		`-nhtid,`
`677`		`-(uint32) (state->targetlsn >>32),`
`678`		`-(uint32)state->targetlsn)));`
	`668`	`+errdetail_internal("Lower index tid=%s (points to %s tid=%s) "`
	`669`	`+"higher index tid=%s (points to %s tid=%s) "`
	`670`	`+"page lsn=%X/%X.",`
	`671`	`+itid,`
	`672`	`+P_ISLEAF(topaque) ?"heap" :"index",`
	`673`	`+htid,`
	`674`	`+nitid,`
	`675`	`+P_ISLEAF(topaque) ?"heap" :"index",`
	`676`	`+nhtid,`
	`677`	`+(uint32) (state->targetlsn >>32),`
	`678`	`+(uint32)state->targetlsn)));`
`679`	`679`	`}`
`680`	`680`
`681`	`681`	`/*`
`@@ -824,7 +824,7 @@ bt_right_page_check_scankey(BtreeCheckState *state)`
`824`	`824`	`ereport(DEBUG1,`
`825`	`825`	`(errcode(ERRCODE_NO_DATA),`
`826`	`826`	`errmsg("level %u leftmost page of index \"%s\" was found deleted or half dead",`
`827`		`-opaque->btpo.level,RelationGetRelationName(state->rel)),`
	`827`	`+opaque->btpo.level,RelationGetRelationName(state->rel)),`
`828`	`828`	`errdetail_internal("Deleted page found when building scankey from right sibling.")));`
`829`	`829`
`830`	`830`	`/* Be slightly more pro-active in freeing this memory, just in case */`
`@@ -1053,7 +1053,7 @@ bt_downlink_check(BtreeCheckState *state, BlockNumber childblock,`
`1053`	`1053`	`errmsg("down-link lower bound invariant violated for index \"%s\"",`
`1054`	`1054`	`RelationGetRelationName(state->rel)),`
`1055`	`1055`	`errdetail_internal("Parent block=%u child index tid=(%u,%u) parent page lsn=%X/%X.",`
`1056`		`-state->targetblock,childblock,offset,`
	`1056`	`+state->targetblock,childblock,offset,`
`1057`	`1057`	`(uint32) (state->targetlsn >>32),`
`1058`	`1058`	`(uint32)state->targetlsn)));`
`1059`	`1059`	`}`
`@@ -1228,21 +1228,21 @@ palloc_btree_page(BtreeCheckState *state, BlockNumber blocknum)`
`1228`	`1228`	`if (P_ISLEAF(opaque)&& !P_ISDELETED(opaque)&&opaque->btpo.level!=0)`
`1229`	`1229`	`ereport(ERROR,`
`1230`	`1230`	`(errcode(ERRCODE_INDEX_CORRUPTED),`
`1231`		`-errmsg("invalid leaf page level %u for block %u in index \"%s\"",`
`1232`		`-opaque->btpo.level,blocknum,RelationGetRelationName(state->rel))));`
	`1231`	`+errmsg("invalid leaf page level %u for block %u in index \"%s\"",`
	`1232`	`+opaque->btpo.level,blocknum,RelationGetRelationName(state->rel))));`
`1233`	`1233`
`1234`	`1234`	`if (blocknum!=BTREE_METAPAGE&& !P_ISLEAF(opaque)&&`
`1235`	`1235`	`!P_ISDELETED(opaque)&&opaque->btpo.level==0)`
`1236`	`1236`	`ereport(ERROR,`
`1237`	`1237`	`(errcode(ERRCODE_INDEX_CORRUPTED),`
`1238`		`-errmsg("invalid internal page level 0 for block %u in index \"%s\"",`
`1239`		`-opaque->btpo.level,RelationGetRelationName(state->rel))));`
	`1238`	`+errmsg("invalid internal page level 0 for block %u in index \"%s\"",`
	`1239`	`+opaque->btpo.level,RelationGetRelationName(state->rel))));`
`1240`	`1240`
`1241`	`1241`	`if (!P_ISLEAF(opaque)&&P_HAS_GARBAGE(opaque))`
`1242`	`1242`	`ereport(ERROR,`
`1243`	`1243`	`(errcode(ERRCODE_INDEX_CORRUPTED),`
`1244`		`-errmsg("internal page block %u in index \"%s\" has garbage items",`
`1245`		`-blocknum,RelationGetRelationName(state->rel))));`
	`1244`	`+errmsg("internal page block %u in index \"%s\" has garbage items",`
	`1245`	`+blocknum,RelationGetRelationName(state->rel))));`
`1246`	`1246`
`1247`	`1247`	`returnpage;`
`1248`	`1248`	`}`

`‎contrib/auth_delay/auth_delay.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ _PG_init(void)`
`57`	`57`	`{`
`58`	`58`	`/* Define custom GUC variables */`
`59`	`59`	`DefineCustomIntVariable("auth_delay.milliseconds",`
`60`		`-"Milliseconds to delay before reporting authentication failure",`
	`60`	`+"Milliseconds to delay before reporting authentication failure",`
`61`	`61`	`NULL,`
`62`	`62`	`&auth_delay_milliseconds,`
`63`	`63`	`0,`

`‎contrib/auto_explain/auto_explain.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,8 @@ _PG_init(void)`
`74`	`74`	`{`
`75`	`75`	`/* Define custom GUC variables. */`
`76`	`76`	`DefineCustomIntVariable("auto_explain.log_min_duration",`
`77`		`-"Sets the minimum execution time above which plans will be logged.",`
`78`		`-"Zero prints all plans. -1 turns this feature off.",`
	`77`	`+"Sets the minimum execution time above which plans will be logged.",`
	`78`	`+"Zero prints all plans. -1 turns this feature off.",`
`79`	`79`	`&auto_explain_log_min_duration,`
`80`	`80`	`-1,`
`81`	`81`	`-1,INT_MAX /1000,`
`@@ -120,7 +120,7 @@ _PG_init(void)`
`120`	`120`
`121`	`121`	`DefineCustomBoolVariable("auto_explain.log_triggers",`
`122`	`122`	`"Include trigger statistics in plans.",`
`123`		`-"This has no effect unless log_analyze is also set.",`
	`123`	`+"This has no effect unless log_analyze is also set.",`
`124`	`124`	`&auto_explain_log_triggers,`
`125`	`125`	`false,`
`126`	`126`	`PGC_SUSET,`

`‎contrib/bloom/bloom.h`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,8 @@ typedef struct BloomOptions`
`111`	`111`	`*/`
`112`	`112`	`typedefBlockNumberFreeBlockNumberArray[`
`113`	`113`	`MAXALIGN_DOWN(`
`114`		`-BLCKSZ-SizeOfPageHeaderData-MAXALIGN(sizeof(BloomPageOpaqueData))`
`115`		`--MAXALIGN(sizeof(uint16)*2+sizeof(uint32)+sizeof(BloomOptions))`
	`114`	`+BLCKSZ-SizeOfPageHeaderData-MAXALIGN(sizeof(BloomPageOpaqueData))`
	`115`	`+-MAXALIGN(sizeof(uint16)*2+sizeof(uint32)+sizeof(BloomOptions))`
`116`	`116`	`) /sizeof(BlockNumber)`
`117`	`117`	`];`
`118`	`118`

`‎contrib/bloom/blvacuum.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ blbulkdelete(IndexVacuumInfo info, IndexBulkDeleteResult stats,`
`84`	`84`	`*/`
`85`	`85`	`itup=itupPtr=BloomPageGetTuple(&state,page,FirstOffsetNumber);`
`86`	`86`	`itupEnd=BloomPageGetTuple(&state,page,`
`87`		`-OffsetNumberNext(BloomPageGetMaxOffset(page)));`
	`87`	`+OffsetNumberNext(BloomPageGetMaxOffset(page)));`
`88`	`88`	`while (itup<itupEnd)`
`89`	`89`	`{`
`90`	`90`	`/* Do we have to delete this tuple? */`
`@@ -108,7 +108,7 @@ blbulkdelete(IndexVacuumInfo info, IndexBulkDeleteResult stats,`
`108`	`108`
`109`	`109`	`/* Assert that we counted correctly */`
`110`	`110`	`Assert(itupPtr==BloomPageGetTuple(&state,page,`
`111`		`-OffsetNumberNext(BloomPageGetMaxOffset(page))));`
	`111`	`+OffsetNumberNext(BloomPageGetMaxOffset(page))));`
`112`	`112`
`113`	`113`	`/*`
`114`	`114`	`* Add page to new notFullPage list if we will not mark page as`

`‎contrib/btree_gin/btree_gin.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,8 @@ gin_btree_compare_prefix(FunctionCallInfo fcinfo)`
`115`	`115`	`data->typecmp,`
`116`	`116`	`fcinfo->flinfo,`
`117`	`117`	`PG_GET_COLLATION(),`
`118`		`- (data->strategy==BTLessStrategyNumber\|\|`
`119`		`-data->strategy==BTLessEqualStrategyNumber)`
	`118`	`+ (data->strategy==BTLessStrategyNumber\|\|`
	`119`	`+data->strategy==BTLessEqualStrategyNumber)`
`120`	`120`	`?data->datum :a,`
`121`	`121`	`b));`
`122`	`122`

`‎contrib/btree_gist/btree_cash.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,8 @@ Datum`
`203`	`203`	`gbt_cash_picksplit(PG_FUNCTION_ARGS)`
`204`	`204`	`{`
`205`	`205`	`PG_RETURN_POINTER(gbt_num_picksplit(`
`206`		`-(GistEntryVector*)PG_GETARG_POINTER(0),`
`207`		`-(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
	`206`	`+(GistEntryVector*)PG_GETARG_POINTER(0),`
	`207`	`+(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
`208`	`208`	`&tinfo,fcinfo->flinfo`
`209`	`209`	`));`
`210`	`210`	`}`

`‎contrib/btree_gist/btree_date.c`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,8 @@ gdb_date_dist(const void a, const void b, FmgrInfo *flinfo)`
`87`	`87`	`{`
`88`	`88`	`/* we assume the difference can't overflow */`
`89`	`89`	`Datumdiff=DirectFunctionCall2(date_mi,`
`90`		`-DateADTGetDatum(((constDateADT)a)),`
`91`		`-DateADTGetDatum(((constDateADT)b)));`
	`90`	`+DateADTGetDatum(((constDateADT)a)),`
	`91`	`+DateADTGetDatum(((constDateADT)b)));`
`92`	`92`
`93`	`93`	`return (float8)Abs(DatumGetInt32(diff));`
`94`	`94`	`}`
`@@ -210,14 +210,14 @@ gbt_date_penalty(PG_FUNCTION_ARGS)`
`210`	`210`	`diff=DatumGetInt32(DirectFunctionCall2(`
`211`	`211`	`date_mi,`
`212`	`212`	`DateADTGetDatum(newentry->upper),`
`213`		`-DateADTGetDatum(origentry->upper)));`
	`213`	`+DateADTGetDatum(origentry->upper)));`
`214`	`214`
`215`	`215`	`res=Max(diff,0);`
`216`	`216`
`217`	`217`	`diff=DatumGetInt32(DirectFunctionCall2(`
`218`	`218`	`date_mi,`
`219`		`-DateADTGetDatum(origentry->lower),`
`220`		`-DateADTGetDatum(newentry->lower)));`
	`219`	`+DateADTGetDatum(origentry->lower),`
	`220`	`+DateADTGetDatum(newentry->lower)));`
`221`	`221`
`222`	`222`	`res+=Max(diff,0);`
`223`	`223`
`@@ -227,8 +227,8 @@ gbt_date_penalty(PG_FUNCTION_ARGS)`
`227`	`227`	`{`
`228`	`228`	`diff=DatumGetInt32(DirectFunctionCall2(`
`229`	`229`	`date_mi,`
`230`		`-DateADTGetDatum(origentry->upper),`
`231`		`-DateADTGetDatum(origentry->lower)));`
	`230`	`+DateADTGetDatum(origentry->upper),`
	`231`	`+DateADTGetDatum(origentry->lower)));`
`232`	`232`	`*result+=FLT_MIN;`
`233`	`233`	`*result+= (float) (res / ((double) (res+diff)));`
`234`	`234`	`result = (FLT_MAX / (((GISTENTRY*)PG_GETARG_POINTER(0))->rel->rd_att->natts+1));`
`@@ -242,8 +242,8 @@ Datum`
`242`	`242`	`gbt_date_picksplit(PG_FUNCTION_ARGS)`
`243`	`243`	`{`
`244`	`244`	`PG_RETURN_POINTER(gbt_num_picksplit(`
`245`		`-(GistEntryVector*)PG_GETARG_POINTER(0),`
`246`		`-(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
	`245`	`+(GistEntryVector*)PG_GETARG_POINTER(0),`
	`246`	`+(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
`247`	`247`	`&tinfo,fcinfo->flinfo`
`248`	`248`	`));`
`249`	`249`	`}`

`‎contrib/btree_gist/btree_enum.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,8 @@ Datum`
`169`	`169`	`gbt_enum_picksplit(PG_FUNCTION_ARGS)`
`170`	`170`	`{`
`171`	`171`	`PG_RETURN_POINTER(gbt_num_picksplit(`
`172`		`-(GistEntryVector*)PG_GETARG_POINTER(0),`
`173`		`-(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
	`172`	`+(GistEntryVector*)PG_GETARG_POINTER(0),`
	`173`	`+(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
`174`	`174`	`&tinfo,fcinfo->flinfo`
`175`	`175`	`));`
`176`	`176`	`}`

`‎contrib/btree_gist/btree_float4.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -196,8 +196,8 @@ Datum`
`196`	`196`	`gbt_float4_picksplit(PG_FUNCTION_ARGS)`
`197`	`197`	`{`
`198`	`198`	`PG_RETURN_POINTER(gbt_num_picksplit(`
`199`		`-(GistEntryVector*)PG_GETARG_POINTER(0),`
`200`		`-(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
	`199`	`+(GistEntryVector*)PG_GETARG_POINTER(0),`
	`200`	`+(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
`201`	`201`	`&tinfo,fcinfo->flinfo`
`202`	`202`	`));`
`203`	`203`	`}`

`‎contrib/btree_gist/btree_float8.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,8 @@ Datum`
`203`	`203`	`gbt_float8_picksplit(PG_FUNCTION_ARGS)`
`204`	`204`	`{`
`205`	`205`	`PG_RETURN_POINTER(gbt_num_picksplit(`
`206`		`-(GistEntryVector*)PG_GETARG_POINTER(0),`
`207`		`-(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
	`206`	`+(GistEntryVector*)PG_GETARG_POINTER(0),`
	`207`	`+(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
`208`	`208`	`&tinfo,fcinfo->flinfo`
`209`	`209`	`));`
`210`	`210`	`}`

`‎contrib/btree_gist/btree_inet.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ gbt_inet_consistent(PG_FUNCTION_ARGS)`
`133`	`133`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`134`	`134`
`135`	`135`	`PG_RETURN_BOOL(gbt_num_consistent(&key, (void*)&query,`
`136`		`-&strategy,GIST_LEAF(entry),&tinfo,fcinfo->flinfo));`
	`136`	`+&strategy,GIST_LEAF(entry),&tinfo,fcinfo->flinfo));`
`137`	`137`	`}`
`138`	`138`
`139`	`139`
`@@ -165,8 +165,8 @@ Datum`
`165`	`165`	`gbt_inet_picksplit(PG_FUNCTION_ARGS)`
`166`	`166`	`{`
`167`	`167`	`PG_RETURN_POINTER(gbt_num_picksplit(`
`168`		`-(GistEntryVector*)PG_GETARG_POINTER(0),`
`169`		`-(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
	`168`	`+(GistEntryVector*)PG_GETARG_POINTER(0),`
	`169`	`+(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
`170`	`170`	`&tinfo,fcinfo->flinfo`
`171`	`171`	`));`
`172`	`172`	`}`

`‎contrib/btree_gist/btree_int2.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -202,8 +202,8 @@ Datum`
`202`	`202`	`gbt_int2_picksplit(PG_FUNCTION_ARGS)`
`203`	`203`	`{`
`204`	`204`	`PG_RETURN_POINTER(gbt_num_picksplit(`
`205`		`-(GistEntryVector*)PG_GETARG_POINTER(0),`
`206`		`-(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
	`205`	`+(GistEntryVector*)PG_GETARG_POINTER(0),`
	`206`	`+(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
`207`	`207`	`&tinfo,fcinfo->flinfo`
`208`	`208`	`));`
`209`	`209`	`}`

`‎contrib/btree_gist/btree_int4.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,8 @@ Datum`
`203`	`203`	`gbt_int4_picksplit(PG_FUNCTION_ARGS)`
`204`	`204`	`{`
`205`	`205`	`PG_RETURN_POINTER(gbt_num_picksplit(`
`206`		`-(GistEntryVector*)PG_GETARG_POINTER(0),`
`207`		`-(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
	`206`	`+(GistEntryVector*)PG_GETARG_POINTER(0),`
	`207`	`+(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
`208`	`208`	`&tinfo,fcinfo->flinfo`
`209`	`209`	`));`
`210`	`210`	`}`

`‎contrib/btree_gist/btree_int8.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,8 @@ Datum`
`203`	`203`	`gbt_int8_picksplit(PG_FUNCTION_ARGS)`
`204`	`204`	`{`
`205`	`205`	`PG_RETURN_POINTER(gbt_num_picksplit(`
`206`		`-(GistEntryVector*)PG_GETARG_POINTER(0),`
`207`		`-(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
	`206`	`+(GistEntryVector*)PG_GETARG_POINTER(0),`
	`207`	`+(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
`208`	`208`	`&tinfo,fcinfo->flinfo`
`209`	`209`	`));`
`210`	`210`	`}`

`‎contrib/btree_gist/btree_interval.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -285,8 +285,8 @@ Datum`
`285`	`285`	`gbt_intv_picksplit(PG_FUNCTION_ARGS)`
`286`	`286`	`{`
`287`	`287`	`PG_RETURN_POINTER(gbt_num_picksplit(`
`288`		`-(GistEntryVector*)PG_GETARG_POINTER(0),`
`289`		`-(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
	`288`	`+(GistEntryVector*)PG_GETARG_POINTER(0),`
	`289`	`+(GIST_SPLITVEC*)PG_GETARG_POINTER(1),`
`290`	`290`	`&tinfo,fcinfo->flinfo`
`291`	`291`	`));`
`292`	`292`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit382ceff

File tree

568 files changed

Some content is hidden

568 files changed

`‎contrib/adminpack/adminpack.c`

`‎contrib/amcheck/verify_nbtree.c`

`‎contrib/auth_delay/auth_delay.c`

`‎contrib/auto_explain/auto_explain.c`

`‎contrib/bloom/bloom.h`

`‎contrib/bloom/blvacuum.c`

`‎contrib/btree_gin/btree_gin.c`

`‎contrib/btree_gist/btree_cash.c`

`‎contrib/btree_gist/btree_date.c`

`‎contrib/btree_gist/btree_enum.c`

`‎contrib/btree_gist/btree_float4.c`

`‎contrib/btree_gist/btree_float8.c`

`‎contrib/btree_gist/btree_inet.c`

`‎contrib/btree_gist/btree_int2.c`

`‎contrib/btree_gist/btree_int4.c`

`‎contrib/btree_gist/btree_int8.c`

`‎contrib/btree_gist/btree_interval.c`

0 commit comments