amcheck: Fix posting tree checks in gin_index_check()

Fix two issues in parent_key validation in posting trees:

* It's not enough to check stack->parentblk is valid to determine if the
  parentkey is valid. It's possible parentblk is set to a valid block
  number, but parentkey is invalid. So check parentkey directly.

* We don't need to invalidate parentkey for all child pages of the
  rightmost page. It's enough to invalidate it for the rightmost child
  only, which means we can check more cases (less false negatives).

Issues reported by Arseniy Mukhin, along with a proposed patch. Review
by Andrey M. Borodin, cleanup and improvements by me.

Author: Arseniy Mukhin 
Reviewed-by: Andrey M. Borodin 
Discussion: https://postgr.es/m/CAE7r3MJ611B9TE=YqBBncewp7-k64VWs+sjk7XF6fJUX77uFBA@mail.gmail.com

diff --git a/contrib/amcheck/t/006_verify_gin.pl b/contrib/amcheck/t/006_verify_gin.pl
index 308e53b2f75d0c6629ad940643018061818748f5..e540cd6606adf709ad6aebf196da582275ba1555 100644 (file)
--- a/contrib/amcheck/t/006_verify_gin.pl
+++ b/contrib/amcheck/t/006_verify_gin.pl
@@ -36,6 +36,7 @@ invalid_entry_order_inner_page_test();
 invalid_entry_columns_order_test();
 inconsistent_with_parent_key__parent_key_corrupted_test();
 inconsistent_with_parent_key__child_key_corrupted_test();
+inconsistent_with_parent_key__parent_key_corrupted_posting_tree_test();
 
 sub invalid_entry_order_leaf_page_test
 {
@@ -237,6 +238,44 @@ sub inconsistent_with_parent_key__child_key_corrupted_test
    like($stderr, qr/$expected/);
 }
 
+sub inconsistent_with_parent_key__parent_key_corrupted_posting_tree_test
+{
+   my $relname = "test";
+   my $indexname = "test_gin_idx";
+
+   $node->safe_psql(
+       'postgres', qq(
+       DROP TABLE IF EXISTS $relname;
+       CREATE TABLE $relname (a text[]);
+       INSERT INTO $relname (a) select ('{aaaaa}') from generate_series(1,10000);
+       CREATE INDEX $indexname ON $relname USING gin (a);
+   ));
+   my $relpath = relation_filepath($indexname);
+
+   $node->stop;
+
+   my $blkno = 2;  # posting tree root
+
+   # we have a posting tree for 'aaaaa' key with the root at 2nd block
+   # and two leaf pages 3 and 4. replace 4th page's high key with (1,1)
+   # so that there are tid's in leaf page that are larger then the new high key.
+   my $find = pack('S*', 0, 4, 0) . '....';
+   my $replace = pack('S*', 0, 4, 0, 1, 1);
+   string_replace_block(
+       $relpath,
+       $find,
+       $replace,
+       $blkno
+   );
+
+   $node->start;
+
+   my ($result, $stdout, $stderr) = $node->psql('postgres', qq(SELECT gin_index_check('$indexname')));
+   my $expected = "index \"$indexname\": tid exceeds parent's high key in postingTree leaf on block 4";
+   like($stderr, qr/$expected/);
+}
+
+
 # Returns the filesystem path for the named relation.
 sub relation_filepath
 {

diff --git a/contrib/amcheck/verify_gin.c b/contrib/amcheck/verify_gin.c
index fb17e4613c6eb2f7b531bd4a6fc5c2cbb60fbe0d..c615d950736f6e26e63bb708a2c3c69edef0c272 100644 (file)
--- a/contrib/amcheck/verify_gin.c
+++ b/contrib/amcheck/verify_gin.c
@@ -345,7 +345,7 @@ gin_check_posting_tree_parent_keys_consistency(Relation rel, BlockNumber posting
                 * Check if this tuple is consistent with the downlink in the
                 * parent.
                 */
-               if (stack->parentblk != InvalidBlockNumber && i == maxoff &&
+               if (i == maxoff && ItemPointerIsValid(&stack->parentkey) &&
                    ItemPointerCompare(&stack->parentkey, &posting_item->key) < 0)
                    ereport(ERROR,
                            (errcode(ERRCODE_INDEX_CORRUPTED),
@@ -358,14 +358,10 @@ gin_check_posting_tree_parent_keys_consistency(Relation rel, BlockNumber posting
                ptr->depth = stack->depth + 1;
 
                /*
-                * Set rightmost parent key to invalid item pointer. Its value
-                * is 'Infinity' and not explicitly stored.
+                * The rightmost parent key is always invalid item pointer.
+                * Its value is 'Infinity' and not explicitly stored.
                 */
-               if (rightlink == InvalidBlockNumber)
-                   ItemPointerSetInvalid(&ptr->parentkey);
-               else
-                   ptr->parentkey = posting_item->key;
-
+               ptr->parentkey = posting_item->key;
                ptr->parentblk = stack->blkno;
                ptr->blkno = BlockIdGetBlockNumber(&posting_item->child_blkno);
                ptr->next = stack->next;