NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commit3f7fbf8

committed

Initial MVCC code.

New code for locking buffer' context.

1 parentc5a2716 commit3f7fbf8Copy full SHA for 3f7fbf8

File tree

65 files changed

+1382

-1273

lines changed

src
- backend
  - access
    - gist
      - gist.c
      - gistscan.c
    - hash
      - hashpage.c
    - heap
    - index
      - indexam.c
    - nbtree
      - nbtinsert.c
      - nbtpage.c
    - rtree
      - rtree.c
      - rtscan.c
    - transam
  - catalog
  - commands
  - executor
  - parser
    - gram.c
    - parse_func.c
  - rewrite
    - rewriteRemove.c
    - rewriteSupport.c
  - storage
    - buffer
    - ipc
      - ipci.c
      - shmem.c
    - large_object
      - inv_api.c
    - lmgr
  - utils
    - adt
      - sets.c
    - cache
      - relcache.c
    - time
      - tqual.c
- include
  - access
  - catalog
    - pg_am.h
    - pg_class.h
  - commands
    - trigger.h
  - storage
  - utils
    - tqual.h

Some content is hidden

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

65 files changed

+1382

-1273

lines changed

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

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,7 @@ gistbuild(Relation heap,`
`104`	`104`	`Bufferbuffer=InvalidBuffer;`
`105`	`105`	`bool*compvec;`
`106`	`106`
`107`		`-/* GiSTs only know how to do stupid locking now */`
`108`		`-RelationSetLockForWrite(index);`
	`107`	`+/* no locking is needed */`
`109`	`108`
`110`	`109`	`setheapoverride(true);/* so we can see the new pg_index tuple */`
`111`	`110`	`initGISTstate(&giststate,index);`
`@@ -269,7 +268,6 @@ gistbuild(Relation heap,`
`269`	`268`
`270`	`269`	`/* okay, all heap tuples are indexed */`
`271`	`270`	`heap_endscan(scan);`
`272`		`-RelationUnsetLockForWrite(index);`
`273`	`271`
`274`	`272`	`if (pred!=NULL\|\|oldPred!=NULL)`
`275`	`273`	`{`
`@@ -343,15 +341,19 @@ gistinsert(Relation r, Datum datum, char nulls, ItemPointer ht_ctid, Relation`
`343`	`341`	`itup=index_formtuple(RelationGetDescr(r),datum,nulls);`
`344`	`342`	`itup->t_tid=*ht_ctid;`
`345`	`343`
	`344`	`+/*`
	`345`	`+ * Notes in ExecUtils:ExecOpenIndices()`
	`346`	`+ *`
`346`	`347`	`RelationSetLockForWrite(r);`
	`348`	`+ */`
	`349`	`+`
`347`	`350`	`res=gistdoinsert(r,itup,&giststate);`
`348`	`351`	`for (i=0;i<r->rd_att->natts;i++)`
`349`	`352`	`if (compvec[i]== TRUE)`
`350`	`353`	`pfree((char*)datum[i]);`
`351`	`354`	`pfree(itup);`
`352`	`355`	`pfree(compvec);`
`353`	`356`
`354`		`-/* XXX two-phase locking -- don't unlock the relation until EOT */`
`355`	`357`	`returnres;`
`356`	`358`	`}`
`357`	`359`
`@@ -1103,8 +1105,12 @@ gistdelete(Relation r, ItemPointer tid)`
`1103`	`1105`	`Bufferbuf;`
`1104`	`1106`	`Pagepage;`
`1105`	`1107`
`1106`		`-/* must write-lock on delete */`
	`1108`	`+/*`
	`1109`	`+ * Notes in ExecUtils:ExecOpenIndices()`
	`1110`	`+ * Also note that only vacuum deletes index tuples now...`
	`1111`	`+ *`
`1107`	`1112`	`RelationSetLockForWrite(r);`
	`1113`	`+ */`
`1108`	`1114`
`1109`	`1115`	`blkno=ItemPointerGetBlockNumber(tid);`
`1110`	`1116`	`offnum=ItemPointerGetOffsetNumber(tid);`
`@@ -1120,7 +1126,6 @@ gistdelete(Relation r, ItemPointer tid)`
`1120`	`1126`
`1121`	`1127`	`WriteBuffer(buf);`
`1122`	`1128`
`1123`		`-/* XXX -- two-phase locking, don't release the write lock */`
`1124`	`1129`	`}`
`1125`	`1130`
`1126`	`1131`	`void`

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

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,12 @@ gistbeginscan(Relation r,`
`65`	`65`	`{`
`66`	`66`	`IndexScanDescs;`
`67`	`67`
	`68`	`+/*`
	`69`	`+ * Let index_beginscan does its work...`
	`70`	`+ *`
`68`	`71`	`RelationSetLockForRead(r);`
	`72`	`+ */`
	`73`	`+`
`69`	`74`	`s=RelationGetIndexScan(r,fromEnd,nkeys,key);`
`70`	`75`	`gistregscan(s);`
`71`	`76`

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

Lines changed: 7 additions & 13 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/hashpage.c,v 1.17 1998/09/01 03:20:58 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.18 1998/12/15 12:45:10 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* Postgres hash pages look like ordinary relation pages. The opaque`
`@@ -81,7 +81,7 @@ _hash_metapinit(Relation rel)`
`81`	`81`
`82`	`82`	`/* can't be sharing this with anyone, now... */`
`83`	`83`	`if (USELOCKING)`
`84`		`-RelationSetLockForWrite(rel);`
	`84`	`+LockRelation(rel,AccessExclusiveLock);`
`85`	`85`
`86`	`86`	`if ((nblocks=RelationGetNumberOfBlocks(rel))!=0)`
`87`	`87`	`{`
`@@ -169,7 +169,7 @@ _hash_metapinit(Relation rel)`
`169`	`169`	`_hash_relbuf(rel,metabuf,HASH_WRITE);`
`170`	`170`
`171`	`171`	`if (USELOCKING)`
`172`		`-RelationUnsetLockForWrite(rel);`
	`172`	`+UnlockRelation(rel,AccessExclusiveLock);`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`/*`
`@@ -316,19 +316,16 @@ _hash_setpagelock(Relation rel,`
`316`	`316`	`BlockNumberblkno,`
`317`	`317`	`intaccess)`
`318`	`318`	`{`
`319`		`-ItemPointerDataiptr;`
`320`	`319`
`321`	`320`	`if (USELOCKING)`
`322`	`321`	`{`
`323`		`-ItemPointerSet(&iptr,blkno,1);`
`324`		`-`
`325`	`322`	`switch (access)`
`326`	`323`	`{`
`327`	`324`	`caseHASH_WRITE:`
`328`		`-RelationSetSingleWLockPage(rel,&iptr);`
	`325`	`+LockPage(rel,blkno,ExclusiveLock);`
`329`	`326`	`break;`
`330`	`327`	`caseHASH_READ:`
`331`		`-RelationSetSingleRLockPage(rel,&iptr);`
	`328`	`+LockPage(rel,blkno,ShareLock);`
`332`	`329`	`break;`
`333`	`330`	`default:`
`334`	`331`	`elog(ERROR,"_hash_setpagelock: invalid access (%d) on blk %x: %s",`
`@@ -343,19 +340,16 @@ _hash_unsetpagelock(Relation rel,`
`343`	`340`	`BlockNumberblkno,`
`344`	`341`	`intaccess)`
`345`	`342`	`{`
`346`		`-ItemPointerDataiptr;`
`347`	`343`
`348`	`344`	`if (USELOCKING)`
`349`	`345`	`{`
`350`		`-ItemPointerSet(&iptr,blkno,1);`
`351`		`-`
`352`	`346`	`switch (access)`
`353`	`347`	`{`
`354`	`348`	`caseHASH_WRITE:`
`355`		`-RelationUnsetSingleWLockPage(rel,&iptr);`
	`349`	`+UnlockPage(rel,blkno,ExclusiveLock);`
`356`	`350`	`break;`
`357`	`351`	`caseHASH_READ:`
`358`		`-RelationUnsetSingleRLockPage(rel,&iptr);`
	`352`	`+UnlockPage(rel,blkno,ShareLock);`
`359`	`353`	`break;`
`360`	`354`	`default:`
`361`	`355`	`elog(ERROR,"_hash_unsetpagelock: invalid access (%d) on blk %x: %s",`

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!

Commit3f7fbf8

File tree

65 files changed

Some content is hidden

65 files changed

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

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

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

0 commit comments