Fix inconsistency result with index scan using negation query.

Artur Zakirov · Artur Zakirov · commit 8427ad07bbc1 · 2016-08-10T16:11:27.000+03:00
For example, the following queries have returned wrong results:

SELECT t FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', '!gave &amp; way');
SELECT t FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', '!gave &amp; wooded &amp; !look');

But the following query have returned right result:

SELECT t FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', 'gave &amp; !way');

Now all queries return right results.
diff --git a/expected/rum.out b/expected/rum.out
@@ -82,6 +82,24 @@ SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', '(gave
      2
 (1 row)
 
+SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', '(gave | !half) <-> way');
+ count 
+-------
+     3
+(1 row)
+
+SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', '!gave & way');
+ count 
+-------
+     3
+(1 row)
+
+SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', '!gave & wooded & !look');
+ count 
+-------
+     1
+(1 row)
+
 SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english',
 													'def <-> fgr');
  count 
diff --git a/rumget.c b/rumget.c
@@ -2020,7 +2020,8 @@ scanGetItemFast(IndexScanDesc scan, RumKey *advancePast,
 			if (!callConsistentFn(&so->rumstate, key))
 			{
 				consistentResult = false;
-				entryShift(k, so, false);
+				for (j = k; j < so->totalentries; j++)
+					entryShift(j, so, false);
 				continue;
 			}
 		}
diff --git a/sql/rum.sql b/sql/rum.sql
@@ -28,6 +28,9 @@ SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', 'among
 SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', 'structure&ancient');
 SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', '(complimentary|sight)&(sending|heart)');
 SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', '(gave | half) <-> way');
+SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', '(gave | !half) <-> way');
+SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', '!gave & way');
+SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english', '!gave & wooded & !look');
 SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english',
 													'def <-> fgr');
 SELECT count(*) FROM test_rum WHERE a @@ to_tsquery('pg_catalog.english',

Original file line number	Diff line number	Diff line change
`@@ -2020,7 +2020,8 @@ scanGetItemFast(IndexScanDesc scan, RumKey *advancePast,`
`2020`	`2020`	`if (!callConsistentFn(&so->rumstate, key))`
`2021`	`2021`	`{`
`2022`	`2022`	`consistentResult = false;`
`2023`		`- entryShift(k, so, false);`
	`2023`	`+ for (j = k; j < so->totalentries; j++)`
	`2024`	`+ entryShift(j, so, false);`
`2024`	`2025`	`continue;`
`2025`	`2026`	`}`
`2026`	`2027`	`}`