Fix full-index scan for order by by addinfo from another column

Author: Artur Zakirov

expected/rum.out

@@ -184,6 +184,68 @@ SELECT a FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', 'bar') ORDER
  'bar':2,8 'foo':1,3,6 'qq':7
 (1 row)
 
+-- Check full-index scan with order by
+SELECT a <=> to_tsquery('pg_catalog.english', 'ever|wrote') FROM test_rum ORDER BY a <=> to_tsquery('pg_catalog.english', 'ever|wrote');
+ ?column? 
+----------
+  16.4493
+  16.4493
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+ Infinity
+(56 rows)
+
 CREATE TABLE tst (i int4, t tsvector);
 INSERT INTO tst SELECT i%10, to_tsvector('simple', substr(md5(i::text), 1, 1)) FROM generate_series(1,100000) i;
 CREATE INDEX tstidx ON tst USING rum (t rum_tsvector_ops);

rumget.c

@@ -2076,13 +2076,17 @@ scanGetItemFull(IndexScanDesc scan, RumKey *advancePast,
 				RumKey *item, bool *recheck)
 {
 	RumScanOpaque so = (RumScanOpaque) scan->opaque;
+	RumScanKey	key;
 	RumScanEntry entry;
 	bool		nextEntryList;
 	uint32		i;
 
-	Assert(so->totalentries > 0);
+	Assert(so->nkeys > 0 && so->totalentries > 0);
 	Assert(so->entries[0]->scanWithAddInfo);
 
+	/* Full-index scan key */
+	key = so->keys[0];
+	Assert(key->searchMode == GIN_SEARCH_MODE_EVERYTHING);
 	/*
 	 * This is first entry of the first key, which is used for full-index
 	 * scan.
@@ -2093,6 +2097,12 @@ scanGetItemFull(IndexScanDesc scan, RumKey *advancePast,
 	if (entry->isFinished == TRUE)
 		return false;
 
+	/* Fill outerAddInfo using callConstistentFn() */
+	key->entryRes[0] = TRUE;
+	key->addInfo[0] = entry->curRumKey.addInfo;
+	key->addInfoIsNull[0] = entry->curRumKey.addInfoIsNull;
+	callConsistentFn(&so->rumstate, key);
+
 	/* Move related order by entries */
 	if (nextEntryList)
 		for (i = 1; i < so->totalentries; i++)

sql/rum.sql

@@ -64,6 +64,9 @@ SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', 'rat')
 
 SELECT a FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', 'bar') ORDER BY a;
 
+-- Check full-index scan with order by
+SELECT a <=> to_tsquery('pg_catalog.english', 'ever|wrote') FROM test_rum ORDER BY a <=> to_tsquery('pg_catalog.english', 'ever|wrote');
+
 CREATE TABLE tst (i int4, t tsvector);
 INSERT INTO tst SELECT i%10, to_tsvector('simple', substr(md5(i::text), 1, 1)) FROM generate_series(1,100000) i;
 CREATE INDEX tstidx ON tst USING rum (t rum_tsvector_ops);