From 6ecaaf810b8b9e3132f00549e630400f38a7ca37 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 13 Jan 2021 12:32:54 +0200 Subject: [PATCH] Fix portability issues in the new gist pageinspect test. 1. The raw bytea representation of the point-type keys used in the test depends on endianess. Remove the raw key_data column from the test. 2. The items stored on non-leftmost gist page depends on how many items git on the other pages. This showed up as a failure on 32-bit i386 systems. To fix, only test the gist_page_items() function on the leftmost leaf page. Per Andrey Borodin and the buildfarm. Discussion: https://www.postgresql.org/message-id/9FCEC1DC-86FB-4A57-88EF-DD13663B36AF%40yandex-team.ru --- contrib/pageinspect/expected/gist.out | 52 +++++++-------------------- contrib/pageinspect/sql/gist.sql | 7 ++-- 2 files changed, 15 insertions(+), 44 deletions(-) diff --git a/contrib/pageinspect/expected/gist.out b/contrib/pageinspect/expected/gist.out index 89294b5a17..508f5adb55 100644 --- a/contrib/pageinspect/expected/gist.out +++ b/contrib/pageinspect/expected/gist.out @@ -42,46 +42,18 @@ SELECT * FROM gist_page_items(get_raw_page('test_gist_idx', 1), 'test_gist_idx') 5 | (0,5) | 40 | (p)=((5,5)) (5 rows) -SELECT * FROM gist_page_items(get_raw_page('test_gist_idx', 2), 'test_gist_idx') LIMIT 5; - itemoffset | ctid | itemlen | keys -------------+--------+---------+----------------- - 1 | (1,10) | 40 | (p)=((167,167)) - 2 | (1,11) | 40 | (p)=((168,168)) - 3 | (1,12) | 40 | (p)=((169,169)) - 4 | (1,13) | 40 | (p)=((170,170)) - 5 | (1,14) | 40 | (p)=((171,171)) -(5 rows) - -SELECT * FROM gist_page_items_bytea(get_raw_page('test_gist_idx', 0)); - itemoffset | ctid | itemlen | key_data -------------+-----------+---------+------------------------------------------------------------------------------------ - 1 | (1,65535) | 40 | \x00000100ffff28000000000000c064400000000000c06440000000000000f03f000000000000f03f - 2 | (2,65535) | 40 | \x00000200ffff28000000000000c074400000000000c074400000000000e064400000000000e06440 - 3 | (3,65535) | 40 | \x00000300ffff28000000000000207f400000000000207f400000000000d074400000000000d07440 - 4 | (4,65535) | 40 | \x00000400ffff28000000000000c084400000000000c084400000000000307f400000000000307f40 - 5 | (5,65535) | 40 | \x00000500ffff28000000000000f089400000000000f089400000000000c884400000000000c88440 - 6 | (6,65535) | 40 | \x00000600ffff28000000000000208f400000000000208f400000000000f889400000000000f88940 - 7 | (7,65535) | 40 | \x00000700ffff28000000000000408f400000000000408f400000000000288f400000000000288f40 +-- gist_page_items_bytea prints the raw key data as a bytea. The output of that is +-- platform-dependent (endianess), so omit the actual key data from the output. +SELECT itemoffset, ctid, itemlen FROM gist_page_items_bytea(get_raw_page('test_gist_idx', 0)); + itemoffset | ctid | itemlen +------------+-----------+--------- + 1 | (1,65535) | 40 + 2 | (2,65535) | 40 + 3 | (3,65535) | 40 + 4 | (4,65535) | 40 + 5 | (5,65535) | 40 + 6 | (6,65535) | 40 + 7 | (7,65535) | 40 (7 rows) -SELECT * FROM gist_page_items_bytea(get_raw_page('test_gist_idx', 1)) LIMIT 5; - itemoffset | ctid | itemlen | key_data -------------+-------+---------+------------------------------------------------------------------------------------ - 1 | (0,1) | 40 | \x0000000001002800000000000000f03f000000000000f03f000000000000f03f000000000000f03f - 2 | (0,2) | 40 | \x00000000020028000000000000000040000000000000004000000000000000400000000000000040 - 3 | (0,3) | 40 | \x00000000030028000000000000000840000000000000084000000000000008400000000000000840 - 4 | (0,4) | 40 | \x00000000040028000000000000001040000000000000104000000000000010400000000000001040 - 5 | (0,5) | 40 | \x00000000050028000000000000001440000000000000144000000000000014400000000000001440 -(5 rows) - -SELECT * FROM gist_page_items_bytea(get_raw_page('test_gist_idx', 2)) LIMIT 5; - itemoffset | ctid | itemlen | key_data -------------+--------+---------+------------------------------------------------------------------------------------ - 1 | (1,10) | 40 | \x000001000a0028000000000000e064400000000000e064400000000000e064400000000000e06440 - 2 | (1,11) | 40 | \x000001000b0028000000000000006540000000000000654000000000000065400000000000006540 - 3 | (1,12) | 40 | \x000001000c0028000000000000206540000000000020654000000000002065400000000000206540 - 4 | (1,13) | 40 | \x000001000d0028000000000000406540000000000040654000000000004065400000000000406540 - 5 | (1,14) | 40 | \x000001000e0028000000000000606540000000000060654000000000006065400000000000606540 -(5 rows) - DROP TABLE test_gist; diff --git a/contrib/pageinspect/sql/gist.sql b/contrib/pageinspect/sql/gist.sql index b38da4cb03..e6f6e42a5e 100644 --- a/contrib/pageinspect/sql/gist.sql +++ b/contrib/pageinspect/sql/gist.sql @@ -9,10 +9,9 @@ SELECT * FROM gist_page_opaque_info(get_raw_page('test_gist_idx', 2)); SELECT * FROM gist_page_items(get_raw_page('test_gist_idx', 0), 'test_gist_idx'); SELECT * FROM gist_page_items(get_raw_page('test_gist_idx', 1), 'test_gist_idx') LIMIT 5; -SELECT * FROM gist_page_items(get_raw_page('test_gist_idx', 2), 'test_gist_idx') LIMIT 5; -SELECT * FROM gist_page_items_bytea(get_raw_page('test_gist_idx', 0)); -SELECT * FROM gist_page_items_bytea(get_raw_page('test_gist_idx', 1)) LIMIT 5; -SELECT * FROM gist_page_items_bytea(get_raw_page('test_gist_idx', 2)) LIMIT 5; +-- gist_page_items_bytea prints the raw key data as a bytea. The output of that is +-- platform-dependent (endianess), so omit the actual key data from the output. +SELECT itemoffset, ctid, itemlen FROM gist_page_items_bytea(get_raw_page('test_gist_idx', 0)); DROP TABLE test_gist;