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

Commit5cc1f26

Browse files
committed
amcheck: Normalize index tuples containing uncompressed varlena
It might happen that the varlena value wasn't compressed by index_form_tuple()due to current storage parameters. If compression is currently enabled, weneed to compress such values to match index tuple coming from the heap.Backpatch to all supported versions.Discussion:https://postgr.es/m/flat/7bdbe559-d61a-4ae4-a6e1-48abdf3024cc%40postgrespro.ruAuthor: Andrey BorodinReviewed-by: Alexander Lakhin, Michael Zhilin, Jian He, Alexander KorotkovBackpatch-through: 12
1 parente2c2414 commit5cc1f26

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

‎contrib/amcheck/expected/check_btree.out

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,16 @@ SELECT bt_index_check('varlena_bug_idx', true);
211211

212212
(1 row)
213213

214+
-- Also check that we compress varlena values, which were previously stored
215+
-- uncompressed in index.
216+
INSERT INTO varlena_bug VALUES (repeat('Test', 250));
217+
ALTER TABLE varlena_bug ALTER COLUMN v SET STORAGE extended;
218+
SELECT bt_index_check('varlena_bug_idx', true);
219+
bt_index_check
220+
----------------
221+
222+
(1 row)
223+
214224
-- cleanup
215225
DROP TABLE bttest_a;
216226
DROP TABLE bttest_b;

‎contrib/amcheck/sql/check_btree.sql

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,12 @@ x
145145
CREATEINDEXvarlena_bug_idxon varlena_bug(v);
146146
SELECT bt_index_check('varlena_bug_idx', true);
147147

148+
-- Also check that we compress varlena values, which were previously stored
149+
-- uncompressed in index.
150+
INSERT INTO varlena_bugVALUES (repeat('Test',250));
151+
ALTERTABLE varlena_bug ALTER COLUMN vSET STORAGE extended;
152+
SELECT bt_index_check('varlena_bug_idx', true);
153+
148154
-- cleanup
149155
DROPTABLE bttest_a;
150156
DROPTABLE bttest_b;

‎contrib/amcheck/verify_nbtree.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
*/
2424
#include"postgres.h"
2525

26+
#include"access/heaptoast.h"
2627
#include"access/htup_details.h"
2728
#include"access/nbtree.h"
2829
#include"access/table.h"
@@ -2561,6 +2562,18 @@ bt_normalize_tuple(BtreeCheckState *state, IndexTuple itup)
25612562
ItemPointerGetBlockNumber(&(itup->t_tid)),
25622563
ItemPointerGetOffsetNumber(&(itup->t_tid)),
25632564
RelationGetRelationName(state->rel))));
2565+
elseif (!VARATT_IS_COMPRESSED(DatumGetPointer(normalized[i]))&&
2566+
VARSIZE(DatumGetPointer(normalized[i]))>TOAST_INDEX_TARGET&&
2567+
(att->attstorage==TYPSTORAGE_EXTENDED||
2568+
att->attstorage==TYPSTORAGE_MAIN))
2569+
{
2570+
/*
2571+
* This value will be compressed by index_form_tuple() with the
2572+
* current storage settings. We may be here because this tuple
2573+
* was formed with different storage settings. So, force forming.
2574+
*/
2575+
formnewtup= true;
2576+
}
25642577
elseif (VARATT_IS_COMPRESSED(DatumGetPointer(normalized[i])))
25652578
{
25662579
formnewtup= true;

0 commit comments

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