Commitd2d0320

committed

Merge branch 'CORE-241-rum' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into CORE-241-rum

2 parentsee27a4f +5827078 commitd2d0320Copy full SHA for d2d0320

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2534,7 +2534,10 @@ rumgettuple(IndexScanDesc scan, ScanDirection direction)`
`2534`	`2534`	`so->tbm=NULL;`
`2535`	`2535`	`so->entriesIncrIndex=-1;`
`2536`	`2536`	`so->firstCall= false;`
`2537`		`-so->sortstate=rum_tuplesort_begin_rum(work_mem,so->norderbys, false);`
	`2537`	`+so->sortstate=rum_tuplesort_begin_rum(work_mem,so->norderbys, false,`
	`2538`	`+so->totalentries>0&&`
	`2539`	`+so->entries[0]->queryCategory==RUM_CAT_EMPTY_QUERY&&`
	`2540`	`+so->entries[0]->scanWithAddInfo);`
`2538`	`2541`
`2539`	`2542`	`scanPendingInsert(scan);`
`2540`	`2543`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -405,6 +405,9 @@ struct Tuplesortstate`
`405`	`405`
`406`	`406`	`boolreverse;`
`407`	`407`
	`408`	`+/* Do we need ItemPointer comparison in comparetup_rum()? */`
	`409`	`+boolcompareItemPointer;`
	`410`	`+`
`408`	`411`	`/*`
`409`	`412`	`* Resource snapshot for time of sort start.`
`410`	`413`	`*/`
`@@ -1124,7 +1127,8 @@ rum_tuplesort_begin_index_hash(Relation heapRel,`
`1124`	`1127`	`}`
`1125`	`1128`
`1126`	`1129`	`Tuplesortstate*`
`1127`		`-rum_tuplesort_begin_rum(intworkMem,intnKeys,boolrandomAccess)`
	`1130`	`+rum_tuplesort_begin_rum(intworkMem,intnKeys,boolrandomAccess,`
	`1131`	`+boolcompareItemPointer)`
`1128`	`1132`	`{`
`1129`	`1133`	`Tuplesortstate*state=rum_tuplesort_begin_common(workMem,randomAccess);`
`1130`	`1134`	`MemoryContextoldcontext;`
`@@ -1152,6 +1156,7 @@ rum_tuplesort_begin_rum(int workMem, int nKeys, bool randomAccess)`
`1152`	`1156`	`state->readtup=readtup_rum;`
`1153`	`1157`	`state->reversedirection=reversedirection_rum;`
`1154`	`1158`	`state->reverse= false;`
	`1159`	`+state->compareItemPointer=compareItemPointer;`
`1155`	`1160`
`1156`	`1161`	`MemoryContextSwitchTo(oldcontext);`
`1157`	`1162`
`@@ -3865,6 +3870,9 @@ comparetup_rum(const SortTuple a, const SortTuple b, Tuplesortstate *state)`
`3865`	`3870`	`return1;`
`3866`	`3871`	`}`
`3867`	`3872`
	`3873`	`+if (!state->compareItemPointer)`
	`3874`	`+return0;`
	`3875`	`+`
`3868`	`3876`	`/*`
`3869`	`3877`	`* If key values are equal, we sort on ItemPointer.`
`3870`	`3878`	`*/`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ extern Tuplesortstate *rum_tuplesort_begin_datum(Oid datumType,`
`89`	`89`	`boolnullsFirstFlag,`
`90`	`90`	`intworkMem,boolrandomAccess);`
`91`	`91`	`externTuplesortstate*rum_tuplesort_begin_rum(intworkMem,`
`92`		`-intnKeys,boolrandomAccess);`
	`92`	`+intnKeys,boolrandomAccess,boolcompareItemPointer);`
`93`	`93`
`94`	`94`	`externvoidrum_tuplesort_set_bound(Tuplesortstate*state,int64bound);`
`95`	`95`

Comments

(0)