small opt issue fixed, test added

Author: feodor

expected/altorder.out

@@ -73,6 +73,18 @@ SELECT id, d, d |=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY
  457 | Fri May 20 20:21:22.326724 2016 | 367197.326724
 (5 rows)
 
+SELECT count(*) FROM atsts WHERE d < '2016-05-16 14:21:25';
+ count 
+-------
+   357
+(1 row)
+
+SELECT count(*) FROM atsts WHERE d > '2016-05-16 14:21:25';
+ count 
+-------
+   153
+(1 row)
+
 RESET enable_indexscan;
 RESET enable_indexonlyscan;
 RESET enable_bitmapscan;
@@ -124,6 +136,40 @@ SELECT count(*) FROM atsts WHERE t @@ '(eq|yt)&(wr|qh)';
     39
 (1 row)
 
+EXPLAIN (costs off)
+SELECT count(*) FROM atsts WHERE d < '2016-05-16 14:21:25';
+                                       QUERY PLAN                                        
+-----------------------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on atsts
+         Recheck Cond: (d < 'Mon May 16 14:21:25 2016'::timestamp without time zone)
+         ->  Bitmap Index Scan on atsts_idx
+               Index Cond: (d < 'Mon May 16 14:21:25 2016'::timestamp without time zone)
+(5 rows)
+
+SELECT count(*) FROM atsts WHERE d < '2016-05-16 14:21:25';
+ count 
+-------
+   357
+(1 row)
+
+EXPLAIN (costs off)
+SELECT count(*) FROM atsts WHERE d > '2016-05-16 14:21:25';
+                                       QUERY PLAN                                        
+-----------------------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on atsts
+         Recheck Cond: (d > 'Mon May 16 14:21:25 2016'::timestamp without time zone)
+         ->  Bitmap Index Scan on atsts_idx
+               Index Cond: (d > 'Mon May 16 14:21:25 2016'::timestamp without time zone)
+(5 rows)
+
+SELECT count(*) FROM atsts WHERE d > '2016-05-16 14:21:25';
+ count 
+-------
+   153
+(1 row)
+
 EXPLAIN (costs off)
 SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
                                     QUERY PLAN                                     

rumbulk.c

@@ -182,7 +182,8 @@ rumInsertBAEntry(BuildAccumulator *accum,
 		 * by setting shouldSort we prevent incorrect comparison in
 		 * rumCombineData()
 		 */
-		ea->shouldSort = accum->rumstate->useAlternativeOrder;
+		ea->shouldSort = (accum->rumstate->useAlternativeOrder &&
+						  attnum == accum->rumstate->attrnAddToColumn);
 		ea->list = (RumKey *) palloc(sizeof(RumKey) * DEF_NPTR);
 		ea->list[0].iptr = *heapptr;
 		ea->list[0].addInfo = addInfo;
@@ -300,7 +301,8 @@ rumGetBAEntry(BuildAccumulator *accum,
 
 	if (entry->count > 1)
 	{
-		if (accum->rumstate->useAlternativeOrder)
+		if (accum->rumstate->useAlternativeOrder &&
+			entry->attnum == accum->rumstate->attrnAddToColumn)
 			qsort_arg(list, entry->count, sizeof(RumKey),
 					  qsortCompareRumKey, accum->rumstate);
 		else if (entry->shouldSort)

sql/altorder.sql

@@ -24,6 +24,9 @@ SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY
 SELECT id, d, d <=| '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY d <=| '2016-05-16 14:21:25' LIMIT 5;
 SELECT id, d, d |=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY d |=> '2016-05-16 14:21:25' LIMIT 5;
 
+SELECT count(*) FROM atsts WHERE d < '2016-05-16 14:21:25';
+SELECT count(*) FROM atsts WHERE d > '2016-05-16 14:21:25';
+
 
 RESET enable_indexscan;
 RESET enable_indexonlyscan;
@@ -39,6 +42,14 @@ SELECT count(*) FROM atsts WHERE t @@ 'eq|yt';
 SELECT count(*) FROM atsts WHERE t @@ '(eq&yt)|(wr&qh)';
 SELECT count(*) FROM atsts WHERE t @@ '(eq|yt)&(wr|qh)';
 
+
+EXPLAIN (costs off)
+SELECT count(*) FROM atsts WHERE d < '2016-05-16 14:21:25';
+SELECT count(*) FROM atsts WHERE d < '2016-05-16 14:21:25';
+EXPLAIN (costs off)
+SELECT count(*) FROM atsts WHERE d > '2016-05-16 14:21:25';
+SELECT count(*) FROM atsts WHERE d > '2016-05-16 14:21:25';
+
 EXPLAIN (costs off)
 SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
 SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;