NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit1d8bbfd

committed

Make functions static where possible, enclose unused functions in #ifdef NOT_USED.

1 parentb992e20 commit1d8bbfdCopy full SHA for 1d8bbfd

File tree

186 files changed

+1114

-1048

lines changed

src
- backend
  - access
    - common
      - heaptuple.c
      - indextuple.c
    - gist
    - hash
      - hashstrat.c
    - heap
      - heapam.c
      - stats.c
    - index
    - nbtree
    - rtree
      - rtstrat.c
    - transam
  - bootstrap
    - bootstrap.c
  - catalog
    - heap.c
    - pg_type.c
  - commands
    - _deadcode
      - version.c
    - async.c
    - cluster.c
  - executor
  - lib
    - dllist.c
    - lispsort.c
  - libpq
    - auth.c
    - be-pqexec.c
  - nodes
  - optimizer
    - path
      - costsize.c
    - util
  - parser
  - postmaster
    - postmaster.c
  - storage
    - buffer
    - file
      - fd.c
    - ipc
    - large_object
      - inv_api.c
    - lmgr
    - page
      - bufpage.c
    - smgr
      - smgr.c
  - tcop
  - utils
    - adt
    - cache
    - error
      - exc.c
    - fmgr
      - fmgr.c
    - hash
      - hashfn.c
    - init
      - miscinit.c
      - postinit.c
    - mmgr
    - sort
      - psort.c
    - time
      - tqual.c
- bin
  - pg_dump
  - psql
- include
  - access
  - bootstrap
    - bootstrap.h
  - catalog
    - heap.h
    - pg_type.h
  - commands
  - executor
  - lib
    - dllist.h
    - lispsort.h
  - libpq
    - auth.h
    - libpq-be.h
  - miscadmin.h
  - nodes
  - optimizer
  - parser
  - storage
  - tcop
  - utils
- test/regress
  - regress.c

Some content is hidden

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

186 files changed

+1114

-1048

lines changed

`‎src/backend/access/common/heaptuple.c`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.18 1996/12/09 01:22:17 bryanh Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.19 1997/08/19 21:28:49 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* The old interface functions have been converted to macros`
`@@ -39,6 +39,8 @@`
`39`	`39`	`#defineregister`
`40`	`40`	`#endif/* !NO_ASSERT_CHECKING && sparc && sunos4 */`
`41`	`41`
	`42`	`+staticchar*heap_getsysattr(HeapTupletup,Bufferb,intattnum);`
	`43`	`+`
`42`	`44`	`/* ----------------------------------------------------------------`
`43`	`45`	`*misc support routines`
`44`	`46`	`* ----------------------------------------------------------------`
`@@ -335,7 +337,7 @@ heap_sysattrbyval(AttrNumber attno)`
`335`	`337`	`*heap_getsysattr`
`336`	`338`	`* ----------------`
`337`	`339`	`*/`
`338`		`-char*`
	`340`	`+staticchar*`
`339`	`341`	`heap_getsysattr(HeapTupletup,Bufferb,intattnum)`
`340`	`342`	`{`
`341`	`343`	`switch (attnum) {`
`@@ -740,6 +742,7 @@ heap_copytuple(HeapTuple tuple)`
`740`	`742`	`return(newTuple);`
`741`	`743`	`}`
`742`	`744`
	`745`	`+#ifdefNOT_USED`
`743`	`746`	`/* ----------------`
`744`	`747`	`*heap_deformtuple`
`745`	`748`	`*`
`@@ -772,6 +775,7 @@ heap_deformtuple(HeapTuple tuple,`
`772`	`775`	`nulls[i]=' ';`
`773`	`776`	`}`
`774`	`777`	`}`
	`778`	`+#endif`
`775`	`779`
`776`	`780`	`/* ----------------`
`777`	`781`	`*heap_formtuple`

`‎src/backend/access/common/indextuple.c`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.14 1997/06/12 15:41:52 vadim Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.15 1997/08/19 21:28:50 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -27,6 +27,8 @@`
`27`	`27`	`#endif`
`28`	`28`
`29`	`29`	`staticSizeIndexInfoFindDataOffset(unsigned shortt_info);`
	`30`	`+staticchar*fastgetiattr(IndexTupletup,intattnum,`
	`31`	`+TupleDescatt,bool*isnull);`
`30`	`32`
`31`	`33`	`/* ----------------------------------------------------------------`
`32`	`34`	`* index_ tuple interface routines`
`@@ -125,7 +127,7 @@ index_formtuple(TupleDesc tupleDescriptor,`
`125`	`127`	`*the same attribute descriptor will go much quicker. -cim 5/4/91`
`126`	`128`	`* ----------------`
`127`	`129`	`*/`
`128`		`-char*`
	`130`	`+staticchar*`
`129`	`131`	`fastgetiattr(IndexTupletup,`
`130`	`132`	`intattnum,`
`131`	`133`	`TupleDesctupleDesc,`

`‎src/backend/access/gist/gist.c`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,9 @@ static OffsetNumber gistchoose(Relation r, Page p, IndexTuple it,`
`57`	`57`	`staticintgistnospace(Pagep,IndexTupleit);`
`58`	`58`	`voidgistdelete(Relationr,ItemPointertid);`
`59`	`59`	`staticIndexTuplegist_tuple_replacekey(Relationr,GISTENTRYentry,IndexTuplet);`
`60`		`-`
	`60`	`+staticvoidgistcentryinit(GISTSTATEgiststate,GISTENTRYe,char*pr,`
	`61`	`+Relationr,Pagepg,OffsetNumbero,intb,booll) ;`
	`62`	`+staticcharint_range_out(INTRANGEr);`
`61`	`63`
`62`	`64`	`/*`
`63`	`65`	`** routine to build an index. Basically calls insert over and over`
`@@ -1172,7 +1174,7 @@ gistdentryinit(GISTSTATE giststate, GISTENTRY e, char *pr, Relation r,`
`1172`	`1174`	`/*`
`1173`	`1175`	`** initialize a GiST entry with a compressed version of pred`
`1174`	`1176`	`*/`
`1175`		`-void`
	`1177`	`+staticvoid`
`1176`	`1178`	`gistcentryinit(GISTSTATEgiststate,GISTENTRYe,char*pr,Relationr,`
`1177`	`1179`	`Pagepg,OffsetNumbero,intb,booll)`
`1178`	`1180`	`{`
`@@ -1244,7 +1246,8 @@ _gistdump(Relation r)`
`1244`	`1246`	`}`
`1245`	`1247`	`}`
`1246`	`1248`
`1247`		`-chartext_range_out(TXTRANGEr)`
	`1249`	`+#ifdefNOT_USED`
	`1250`	`+staticchartext_range_out(TXTRANGEr)`
`1248`	`1251`	`{`
`1249`	`1252`	`char*result;`
`1250`	`1253`	`charlower,upper;`
`@@ -1266,8 +1269,9 @@ char text_range_out(TXTRANGE r)`
`1266`	`1269`	`pfree(upper);`
`1267`	`1270`	`return(result);`
`1268`	`1271`	`}`
	`1272`	`+#endif`
`1269`	`1273`
`1270`		`-char*`
	`1274`	`+staticchar*`
`1271`	`1275`	`int_range_out(INTRANGE*r)`
`1272`	`1276`	`{`
`1273`	`1277`	`char*result;`

`‎src/backend/access/gist/gistget.c`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ static RetrieveIndexResult gistscancache(IndexScanDesc s, ScanDirection dir);`
`34`	`34`	`staticRetrieveIndexResultgistfirst(IndexScanDescs,ScanDirectiondir);`
`35`	`35`	`staticRetrieveIndexResultgistnext(IndexScanDescs,ScanDirectiondir);`
`36`	`36`	`staticItemPointergistheapptr(Relationr,ItemPointeritemp);`
	`37`	`+staticboolgistindex_keytest(IndexTupletuple,TupleDesctupdesc,`
	`38`	`+intscanKeySize,ScanKeykey,GISTSTATE*giststate,`
	`39`	`+Relationr,Pagep,OffsetNumberoffset);`
`37`	`40`
`38`	`41`
`39`	`42`	`RetrieveIndexResult`
`@@ -217,7 +220,7 @@ gistnext(IndexScanDesc s, ScanDirection dir)`
`217`	`220`	`}`
`218`	`221`
`219`	`222`	`/* Similar to index_keytest, but decompresses the key in the IndexTuple */`
`220`		`-bool`
	`223`	`+staticbool`
`221`	`224`	`gistindex_keytest(IndexTupletuple,`
`222`	`225`	`TupleDesctupdesc,`
`223`	`226`	`intscanKeySize,`

`‎src/backend/access/gist/giststrat.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ RelationGetGISTStrategy(Relation r,`
`102`	`102`	`return (RelationGetStrategy(r,attnum,&GISTEvaluationData,proc));`
`103`	`103`	`}`
`104`	`104`
	`105`	`+#ifdefNOT_USED`
`105`	`106`	`bool`
`106`	`107`	`RelationInvokeGISTStrategy(Relationr,`
`107`	`108`	`AttrNumberattnum,`
`@@ -112,4 +113,4 @@ RelationInvokeGISTStrategy(Relation r,`
`112`	`113`	`return (RelationInvokeStrategy(r,&GISTEvaluationData,attnum,s,`
`113`	`114`	`left,right));`
`114`	`115`	`}`
`115`		`-`
	`116`	`+#endif`

`‎src/backend/access/hash/hashstrat.c`

Lines changed: 9 additions & 28 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.7 1996/11/05 09:40:24 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.8 1997/08/19 21:29:07 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -33,6 +33,7 @@ static StrategyNumberHTNegateCommute[1] = {`
`33`	`33`	`InvalidStrategy`
`34`	`34`	`};`
`35`	`35`
	`36`	`+#ifdefNOT_USED`
`36`	`37`	`staticStrategyEvaluationDataHTEvaluationData= {`
`37`	`38`	`/* XXX static for simplicity */`
`38`	`39`
`@@ -42,13 +43,15 @@ static StrategyEvaluationDataHTEvaluationData = {`
`42`	`43`	`(StrategyTransformMap)HTNegateCommute,`
`43`	`44`	`{NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}`
`44`	`45`	`};`
	`46`	`+#endif`
`45`	`47`
`46`	`48`	`/* ----------------------------------------------------------------`
`47`	`49`	`*RelationGetHashStrategy`
`48`	`50`	`* ----------------------------------------------------------------`
`49`	`51`	`*/`
`50`	`52`
`51`		`-StrategyNumber`
	`53`	`+#ifdefNOT_USED`
	`54`	`+staticStrategyNumber`
`52`	`55`	`_hash_getstrat(Relationrel,`
`53`	`56`	`AttrNumberattno,`
`54`	`57`	`RegProcedureproc)`
`@@ -61,8 +64,10 @@ _hash_getstrat(Relation rel,`
`61`	`64`
`62`	`65`	`return (strat);`
`63`	`66`	`}`
	`67`	`+#endif`
`64`	`68`
`65`		`-bool`
	`69`	`+#ifdefNOT_USED`
	`70`	`+staticbool`
`66`	`71`	`_hash_invokestrat(Relationrel,`
`67`	`72`	`AttrNumberattno,`
`68`	`73`	`StrategyNumberstrat,`
`@@ -72,28 +77,4 @@ _hash_invokestrat(Relation rel,`
`72`	`77`	`return (RelationInvokeStrategy(rel,&HTEvaluationData,attno,strat,`
`73`	`78`	`left,right));`
`74`	`79`	`}`
`75`		`-`
`76`		`-`
`77`		`-`
`78`		`-`
`79`		`-`
`80`		`-`
`81`		`-`
`82`		`-`
`83`		`-`
`84`		`-`
`85`		`-`
`86`		`-`
`87`		`-`
`88`		`-`
`89`		`-`
`90`		`-`
`91`		`-`
`92`		`-`
`93`		`-`
`94`		`-`
`95`		`-`
`96`		`-`
`97`		`-`
`98`		`-`
`99`		`-`
	`80`	`+#endif`

`‎src/backend/access/heap/heapam.c`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.13 1997/08/12 22:51:40 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.14 1997/08/19 21:29:17 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* INTERFACE ROUTINES`
`@@ -461,6 +461,7 @@ doinsert(Relation relation, HeapTuple tup)`
`461`	`461`	`*HeapScanIsValid is now a macro in relscan.h -cim 4/27/91`
`462`	`462`	`*/`
`463`	`463`
	`464`	`+#ifdefNOT_USED`
`464`	`465`	`/* ----------------`
`465`	`466`	`*SetHeapAccessMethodImmediateInvalidation`
`466`	`467`	`* ----------------`
`@@ -470,6 +471,7 @@ SetHeapAccessMethodImmediateInvalidation(bool on)`
`470`	`471`	`{`
`471`	`472`	`ImmediateInvalidation=on;`
`472`	`473`	`}`
	`474`	`+#endif`
`473`	`475`
`474`	`476`	`/* ----------------------------------------------------------------`
`475`	`477`	`* heap access method interface`

`‎src/backend/access/heap/stats.c`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.10 1997/08/12 22:51:44 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.11 1997/08/19 21:29:21 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* initam should be moved someplace else.`
`@@ -28,13 +28,15 @@`
`28`	`28`	`# include<string.h>`
`29`	`29`	`#endif`
`30`	`30`
	`31`	`+staticvoidInitHeapAccessStatistics(void);`
	`32`	`+`
`31`	`33`	`/* ----------------`
`32`	`34`	`* InitHeapAccessStatistics`
`33`	`35`	`* ----------------`
`34`	`36`	`*/`
`35`	`37`	`HeapAccessStatisticsheap_access_stats= (HeapAccessStatistics)NULL;`
`36`	`38`
`37`		`-void`
	`39`	`+staticvoid`
`38`	`40`	`InitHeapAccessStatistics()`
`39`	`41`	`{`
`40`	`42`	`MemoryContextoldContext;`
`@@ -121,6 +123,7 @@ InitHeapAccessStatistics()`
`121`	`123`	`heap_access_stats=stats;`
`122`	`124`	`}`
`123`	`125`
	`126`	`+#ifdefNOT_USED`
`124`	`127`	`/* ----------------`
`125`	`128`	`* ResetHeapAccessStatistics`
`126`	`129`	`* ----------------`
`@@ -171,7 +174,9 @@ ResetHeapAccessStatistics()`
`171`	`174`	`time(&stats->local_reset_timestamp);`
`172`	`175`	`time(&stats->last_request_timestamp);`
`173`	`176`	`}`
	`177`	`+#endif`
`174`	`178`
	`179`	`+#ifdefNOT_USED`
`175`	`180`	`/* ----------------`
`176`	`181`	`* GetHeapAccessStatistics`
`177`	`182`	`* ----------------`
`@@ -206,7 +211,9 @@ HeapAccessStatistics GetHeapAccessStatistics()`
`206`	`211`
`207`	`212`	`returnstats;`
`208`	`213`	`}`
	`214`	`+#endif`
`209`	`215`
	`216`	`+#ifdefNOT_USED`
`210`	`217`	`/* ----------------`
`211`	`218`	`* PrintHeapAccessStatistics`
`212`	`219`	`* ----------------`
`@@ -302,7 +309,9 @@ PrintHeapAccessStatistics(HeapAccessStatistics stats)`
`302`	`309`
`303`	`310`	`printf("\n");`
`304`	`311`	`}`
	`312`	`+#endif`
`305`	`313`
	`314`	`+#ifdefNOT_USED`
`306`	`315`	`/* ----------------`
`307`	`316`	`* PrintAndFreeHeapAccessStatistics`
`308`	`317`	`* ----------------`
`@@ -314,6 +323,7 @@ PrintAndFreeHeapAccessStatistics(HeapAccessStatistics stats)`
`314`	`323`	`if (stats!=NULL)`
`315`	`324`	`pfree(stats);`
`316`	`325`	`}`
	`326`	`+#endif`
`317`	`327`
`318`	`328`	`/* ----------------------------------------------------------------`
`319`	`329`	`* access method initialization`

`‎src/backend/access/index/genam.c`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.6 1996/11/05 10:02:02 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.7 1997/08/19 21:29:26 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* many of the old access method routines have been turned into`
`@@ -127,6 +127,7 @@ RelationGetIndexScan(Relation relation,`
`127`	`127`	`return (scan);`
`128`	`128`	`}`
`129`	`129`
	`130`	`+#ifdefNOT_USED`
`130`	`131`	`/* ----------------`
`131`	`132`	`* IndexScanRestart -- Restart an index scan.`
`132`	`133`	`*`
`@@ -166,7 +167,9 @@ IndexScanRestart(IndexScanDesc scan,`
`166`	`167`	`key,`
`167`	`168`	`scan->numberOfKeys*sizeof(ScanKeyData));`
`168`	`169`	`}`
	`170`	`+#endif`
`169`	`171`
	`172`	`+#ifdefNOT_USED`
`170`	`173`	`/* ----------------`
`171`	`174`	`* IndexScanEnd -- End and index scan.`
`172`	`175`	`*`
`@@ -188,6 +191,7 @@ IndexScanEnd(IndexScanDesc scan)`
`188`	`191`
`189`	`192`	`pfree(scan);`
`190`	`193`	`}`
	`194`	`+#endif`
`191`	`195`
`192`	`196`	`/* ----------------`
`193`	`197`	`* IndexScanMarkPosition -- Mark current position in a scan.`

`‎src/backend/access/index/indexam.c`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.11 1997/08/12 22:51:48 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.12 1997/08/19 21:29:30 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* INTERFACE ROUTINES`
`13`	`13`	`*index_open - open an index relation by relationId`
`@@ -271,6 +271,7 @@ index_endscan(IndexScanDesc scan)`
`271`	`271`	`RelationUnsetRIntentLock(scan->relation);`
`272`	`272`	`}`
`273`	`273`
	`274`	`+#ifdefNOT_USED`
`274`	`275`	`/* ----------------`
`275`	`276`	`*index_markpos - mark a scan position`
`276`	`277`	`* ----------------`
`@@ -285,7 +286,9 @@ index_markpos(IndexScanDesc scan)`
`285`	`286`
`286`	`287`	`fmgr(procedure,scan);`
`287`	`288`	`}`
	`289`	`+#endif`
`288`	`290`
	`291`	`+#ifdefNOT_USED`
`289`	`292`	`/* ----------------`
`290`	`293`	`*index_restrpos - restore a scan position`
`291`	`294`	`* ----------------`
`@@ -300,6 +303,7 @@ index_restrpos(IndexScanDesc scan)`
`300`	`303`
`301`	`304`	`fmgr(procedure,scan);`
`302`	`305`	`}`
	`306`	`+#endif`
`303`	`307`
`304`	`308`	`/* ----------------`
`305`	`309`	`*index_getnext - get the next tuple from a scan`

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!

Commit1d8bbfd

File tree

186 files changed

Some content is hidden

186 files changed

`‎src/backend/access/common/heaptuple.c`

`‎src/backend/access/common/indextuple.c`

`‎src/backend/access/gist/gist.c`

`‎src/backend/access/gist/gistget.c`

`‎src/backend/access/gist/giststrat.c`

`‎src/backend/access/hash/hashstrat.c`

`‎src/backend/access/heap/heapam.c`

`‎src/backend/access/heap/stats.c`

`‎src/backend/access/index/genam.c`

`‎src/backend/access/index/indexam.c`

0 commit comments