Commitbf4ae68

committed

Fix tqueue.c's range-remapping code.

It's depressingly clear that nobody ever tested this.

1 parent80b346c commitbf4ae68Copy full SHA for bf4ae68

File tree

+33

-2

lines changed

+33

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ tqueueWalkRange(TQueueDestReceiver *tqueue, Datum value)`
`371`	`371`	`* called in the first place: GetRemapClass should have returned NULL when`
`372`	`372`	`* asked about this range type.`
`373`	`373`	`*/`
`374`		`-remapclass=GetRemapClass(typeid);`
	`374`	`+remapclass=GetRemapClass(typcache->rngelemtype->type_id);`
`375`	`375`	`Assert(remapclass!=TQUEUE_REMAP_NONE);`
`376`	`376`
`377`	`377`	`/* Walk each bound, if present. */`
`@@ -749,7 +749,7 @@ TupleQueueRemapRange(TupleQueueReader *reader, Datum value)`
`749`	`749`	`* called in the first place: GetRemapClass should have returned NULL when`
`750`	`750`	`* asked about this range type.`
`751`	`751`	`*/`
`752`		`-remapclass=GetRemapClass(typeid);`
	`752`	`+remapclass=GetRemapClass(typcache->rngelemtype->type_id);`
`753`	`753`	`Assert(remapclass!=TQUEUE_REMAP_NONE);`
`754`	`754`
`755`	`755`	`/* Remap each bound, if present. */`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1336,6 +1336,23 @@ select array[1,3] <@ arrayrange(array[1,2], array[2,1]);`
`1336`	`1336`	`t`
`1337`	`1337`	`(1 row)`
`1338`	`1338`
	`1339`	`+--`
	`1340`	`+-- Ranges of composites`
	`1341`	`+--`
	`1342`	`+create type two_ints as (a int, b int);`
	`1343`	`+create type two_ints_range as range (subtype = two_ints);`
	`1344`	`+-- with force_parallel_mode on, this exercises tqueue.c's range remapping`
	`1345`	`+select *, row_to_json(upper(t)) as u from`
	`1346`	`+ (values (two_ints_range(row(1,2), row(3,4))),`
	`1347`	`+ (two_ints_range(row(5,6), row(7,8)))) v(t);`
	`1348`	`+ t \| u`
	`1349`	`+-------------------+---------------`
	`1350`	`+ ["(1,2)","(3,4)") \| {"a":3,"b":4}`
	`1351`	`+ ["(5,6)","(7,8)") \| {"a":7,"b":8}`
	`1352`	`+(2 rows)`
	`1353`	`+`
	`1354`	`+drop type two_ints cascade;`
	`1355`	`+NOTICE: drop cascades to type two_ints_range`
`1339`	`1356`	`--`
`1340`	`1357`	`-- OUT/INOUT/TABLE functions`
`1341`	`1358`	`--`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -447,6 +447,20 @@ select arrayrange(ARRAY[2,1], ARRAY[1,2]); -- fail`
`447`	`447`	`select array[1,1]<@ arrayrange(array[1,2], array[2,1]);`
`448`	`448`	`select array[1,3]<@ arrayrange(array[1,2], array[2,1]);`
`449`	`449`
	`450`	`+--`
	`451`	`+-- Ranges of composites`
	`452`	`+--`
	`453`	`+`
	`454`	`+createtypetwo_intsas (aint, bint);`
	`455`	`+createtypetwo_ints_rangeas range (subtype= two_ints);`
	`456`	`+`
	`457`	`+-- with force_parallel_mode on, this exercises tqueue.c's range remapping`
	`458`	`+select*, row_to_json(upper(t))as ufrom`
	`459`	`+ (values (two_ints_range(row(1,2), row(3,4))),`
	`460`	`+ (two_ints_range(row(5,6), row(7,8)))) v(t);`
	`461`	`+`
	`462`	`+droptype two_ints cascade;`
	`463`	`+`
`450`	`464`	`--`
`451`	`465`	`-- OUT/INOUT/TABLE functions`
`452`	`466`	`--`

Comments

(0)