NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commitcdd5178

committed

Extend the MinimalTuple concept to tuplesort.c, thereby reducing the

per-tuple space overhead for sorts in memory. I chose to replace theprevious patch that tried to write out the bare minimum amount of datawhen sorting on disk; instead, just dump the MinimalTuples as-is. Thiswastes 3 to 10 bytes per tuple depending on architecture and null-bitmaplength, but the simplification in the writetup/readtup routines seemsworth it.

1 parente99507e commitcdd5178Copy full SHA for cdd5178

File tree

4 files changed

+139

-152

lines changed

src
- backend
  - access/nbtree
    - nbtsort.c
  - executor
    - nodeSort.c
  - utils/sort
    - tuplesort.c
- include/utils
  - tuplesort.h

4 files changed

+139

-152

lines changed

`‎src/backend/access/nbtree/nbtsort.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`* Portions Copyright (c) 1994, Regents of the University of California`
`57`	`57`	`*`
`58`	`58`	`* IDENTIFICATION`
`59`		`- * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsort.c,v 1.101 2006/05/08 00:00:10 tgl Exp $`
	`59`	`+ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsort.c,v 1.102 2006/06/27 16:53:02 tgl Exp $`
`60`	`60`	`*`
`61`	`61`	`*-------------------------------------------------------------------------`
`62`	`62`	`*/`
`@@ -179,7 +179,7 @@ _bt_spooldestroy(BTSpool *btspool)`
`179`	`179`	`void`
`180`	`180`	`_bt_spool(IndexTupleitup,BTSpool*btspool)`
`181`	`181`	`{`
`182`		`-tuplesort_puttuple(btspool->sortstate, (void*)itup);`
	`182`	`+tuplesort_putindextuple(btspool->sortstate,itup);`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`/*`

`‎src/backend/executor/nodeSort.c‎`

Lines changed: 6 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/executor/nodeSort.c,v 1.56 2006/03/05 15:58:26 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/nodeSort.c,v 1.57 2006/06/27 16:53:02 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -41,9 +41,7 @@ ExecSort(SortState *node)`
`41`	`41`	`EState*estate;`
`42`	`42`	`ScanDirectiondir;`
`43`	`43`	`Tuplesortstate*tuplesortstate;`
`44`		`-HeapTupleheapTuple;`
`45`	`44`	`TupleTableSlot*slot;`
`46`		`-boolshould_free;`
`47`	`45`
`48`	`46`	`/*`
`49`	`47`	`* get state info from node`
`@@ -103,8 +101,7 @@ ExecSort(SortState *node)`
`103`	`101`	`if (TupIsNull(slot))`
`104`	`102`	`break;`
`105`	`103`
`106`		`-tuplesort_puttuple(tuplesortstate,`
`107`		`- (void*)ExecFetchSlotTuple(slot));`
	`104`	`+tuplesort_puttupleslot(tuplesortstate,slot);`
`108`	`105`	`}`
`109`	`106`
`110`	`107`	`/*`
`@@ -131,15 +128,11 @@ ExecSort(SortState *node)`
`131`	`128`	`* Get the first or next tuple from tuplesort. Returns NULL if no more`
`132`	`129`	`* tuples.`
`133`	`130`	`*/`
`134`		`-heapTuple=tuplesort_getheaptuple(tuplesortstate,`
`135`		`-ScanDirectionIsForward(dir),`
`136`		`-&should_free);`
`137`		`-`
`138`	`131`	`slot=node->ss.ps.ps_ResultTupleSlot;`
`139`		`-if (heapTuple)`
`140`		`-returnExecStoreTuple(heapTuple,slot,InvalidBuffer,should_free);`
`141`		`-else`
`142`		`-returnExecClearTuple(slot);`
	`132`	`+(void)tuplesort_gettupleslot(tuplesortstate,`
	`133`	`+ScanDirectionIsForward(dir),`
	`134`	`+slot);`
	`135`	`+returnslot;`
`143`	`136`	`}`
`144`	`137`
`145`	`138`	`/* ----------------------------------------------------------------`

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!

Commitcdd5178

File tree

4 files changed

4 files changed

`‎src/backend/access/nbtree/nbtsort.c‎`

`‎src/backend/executor/nodeSort.c‎`

0 commit comments