Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit39cfe86

Browse files
committed
Fix incorrect computations of length of null bitmap in pageinspect.
Instead of using our standard macro for this calculation, this codedid it itself ... and got it wrong, leading to incorrect display ofthe null bitmap in some cases. Noted and fixed by Maksim Milyutin.In passing, remove a uselessly duplicative error check.Errors were introduced in commitd6061f8; back-patch to 9.6where that came in.Maksim Milyutin, reviewed by Andrey BorodinDiscussion:https://postgr.es/m/ec295792-a69f-350f-6287-25a20e8f31d5@gmail.com
1 parentf3049a6 commit39cfe86

File tree

3 files changed

+30
-10
lines changed

3 files changed

+30
-10
lines changed

‎contrib/pageinspect/expected/page.out

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,20 @@ create table test_part1 partition of test_partitioned for values from ( 1 ) to (
9292
select get_raw_page('test_part1', 0); -- get farther and error about empty table
9393
ERROR: block number 0 is out of range for relation "test_part1"
9494
drop table test_partitioned;
95+
-- check null bitmap alignment for table whose number of attributes is multiple of 8
96+
create table test8 (f1 int, f2 int, f3 int, f4 int, f5 int, f6 int, f7 int, f8 int);
97+
insert into test8(f1, f8) values (x'f1'::int, 0);
98+
select t_bits, t_data from heap_page_items(get_raw_page('test8', 0));
99+
t_bits | t_data
100+
----------+--------------------
101+
10000001 | \xf100000000000000
102+
(1 row)
103+
104+
select tuple_data_split('test8'::regclass, t_data, t_infomask, t_infomask2, t_bits)
105+
from heap_page_items(get_raw_page('test8', 0));
106+
tuple_data_split
107+
-------------------------------------------------------------
108+
{"\\xf1000000",NULL,NULL,NULL,NULL,NULL,NULL,"\\x00000000"}
109+
(1 row)
110+
111+
drop table test8;

‎contrib/pageinspect/heapfuncs.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ heap_page_items(PG_FUNCTION_ARGS)
234234
intbits_len;
235235

236236
bits_len=
237-
((tuphdr->t_infomask2&HEAP_NATTS_MASK) /8+1)*8;
237+
BITMAPLEN(HeapTupleHeaderGetNatts(tuphdr))*BITS_PER_BYTE;
238238
values[11]=CStringGetTextDatum(
239239
bits_to_text(tuphdr->t_bits,bits_len));
240240
}
@@ -436,24 +436,19 @@ tuple_data_split(PG_FUNCTION_ARGS)
436436
intbits_str_len;
437437
intbits_len;
438438

439-
bits_len= (t_infomask2&HEAP_NATTS_MASK)/8+1;
439+
bits_len=BITMAPLEN(t_infomask2&HEAP_NATTS_MASK)*BITS_PER_BYTE;
440440
if (!t_bits_str)
441441
ereport(ERROR,
442442
(errcode(ERRCODE_DATA_CORRUPTED),
443443
errmsg("argument of t_bits is null, but it is expected to be null and %d character long",
444-
bits_len*8)));
444+
bits_len)));
445445

446446
bits_str_len=strlen(t_bits_str);
447-
if ((bits_str_len %8)!=0)
448-
ereport(ERROR,
449-
(errcode(ERRCODE_DATA_CORRUPTED),
450-
errmsg("length of t_bits is not a multiple of eight")));
451-
452-
if (bits_len*8!=bits_str_len)
447+
if (bits_len!=bits_str_len)
453448
ereport(ERROR,
454449
(errcode(ERRCODE_DATA_CORRUPTED),
455450
errmsg("unexpected length of t_bits %u, expected %d",
456-
bits_str_len,bits_len*8)));
451+
bits_str_len,bits_len)));
457452

458453
/* do the conversion */
459454
t_bits=text_to_bits(t_bits_str,bits_str_len);

‎contrib/pageinspect/sql/page.sql

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,11 @@ select get_raw_page('test_partitioned', 0); -- error about partitioned table
4141
createtabletest_part1 partition of test_partitioned forvaluesfrom (1 ) to (100);
4242
select get_raw_page('test_part1',0);-- get farther and error about empty table
4343
droptable test_partitioned;
44+
45+
-- check null bitmap alignment for table whose number of attributes is multiple of 8
46+
createtabletest8 (f1int, f2int, f3int, f4int, f5int, f6int, f7int, f8int);
47+
insert into test8(f1, f8)values (x'f1'::int,0);
48+
select t_bits, t_datafrom heap_page_items(get_raw_page('test8',0));
49+
select tuple_data_split('test8'::regclass, t_data, t_infomask, t_infomask2, t_bits)
50+
from heap_page_items(get_raw_page('test8',0));
51+
droptable test8;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp