From d8f356e1bd3382308b32eed01394879e20eb5158 Mon Sep 17 00:00:00 2001
From: Robert Haas <rhaas@postgresql.org>
Date: Wed, 15 Mar 2017 07:25:36 -0400
Subject: [PATCH] Fix MB regression tests for WAL-logging of hash indexes.

Thomas Munro noted that these files still contained the now-removed
deprecation message in the expected output.

Patch by Amit Kapila

Discussion: http://postgr.es/m/CAEepm=16HW_C+MBA27aOV9t4tQBU-vf1BT_yhRUTWZVMd9bq8A@mail.gmail.com
---
 src/test/mb/expected/big5.out          | 1 -
 src/test/mb/expected/euc_jp.out        | 1 -
 src/test/mb/expected/euc_kr.out        | 1 -
 src/test/mb/expected/euc_tw.out        | 1 -
 src/test/mb/expected/gb18030.out       | 1 -
 src/test/mb/expected/mule_internal.out | 2 --
 src/test/mb/expected/sjis.out          | 1 -
 src/test/mb/expected/utf8.out          | 1 -
 8 files changed, 9 deletions(-)

diff --git a/src/test/mb/expected/big5.out b/src/test/mb/expected/big5.out
index d7a6097e61..97100cd0a2 100644
--- a/src/test/mb/expected/big5.out
+++ b/src/test/mb/expected/big5.out
@@ -2,7 +2,6 @@ drop table 
 create table �t�Ӹ�� (��~�O text, ���q���Y varchar, �a�} varchar(16));
 create index �t�Ӹ��index1 on �t�Ӹ�� using btree (��~�O);
 create index �t�Ӹ��index2 on �t�Ӹ�� using hash (���q���Y);
-WARNING:  hash indexes are not WAL-logged and their use is discouraged
 insert into �t�Ӹ�� values ('�q���~', '�F�F���', '�_A01��');
 insert into �t�Ӹ�� values ('�s�y�~', '�]���������q', '��B10��');
 insert into �t�Ӹ�� values ('�\���~', '�����ѥ��������q', '��Z01�E');
diff --git a/src/test/mb/expected/euc_jp.out b/src/test/mb/expected/euc_jp.out
index be248d9135..15f83e0231 100644
--- a/src/test/mb/expected/euc_jp.out
+++ b/src/test/mb/expected/euc_jp.out
@@ -3,7 +3,6 @@ ERROR:  table "
 create table �׻����Ѹ� (�Ѹ� text, ʬ�ॳ���� varchar, ����1A���� char(16));
 create index �׻����Ѹ�index1 on �׻����Ѹ� using btree (�Ѹ�);
 create index �׻����Ѹ�index2 on �׻����Ѹ� using hash (ʬ�ॳ����);
-WARNING:  hash indexes are not WAL-logged and their use is discouraged
 insert into �׻����Ѹ� values('����ԥ塼���ǥ����ץ쥤','��A01��');
 insert into �׻����Ѹ� values('����ԥ塼������ե��å���','ʬB10��');
 insert into �׻����Ѹ� values('����ԥ塼���ץ�����ޡ�','��Z01��');
diff --git a/src/test/mb/expected/euc_kr.out b/src/test/mb/expected/euc_kr.out
index 837f2e60d0..229ffd8f97 100644
--- a/src/test/mb/expected/euc_kr.out
+++ b/src/test/mb/expected/euc_kr.out
@@ -3,7 +3,6 @@ ERROR:  table "ͪߩѦ
 create table ͪߩѦ��� (��� text, ��׾�ڵ� varchar, ���1A�� char(16));
 create index ͪߩѦ���index1 on ͪߩѦ��� using btree (���);
 create index ͪߩѦ���index2 on ͪߩѦ��� using hash (��׾�ڵ�);
-WARNING:  hash indexes are not WAL-logged and their use is discouraged
 insert into ͪߩѦ��� values('��ǻ�͵��÷���', 'ѦA01߾');
 insert into ͪߩѦ��� values('��ǻ�ͱ׷��Ƚ�', '��B10��');
 insert into ͪߩѦ��� values('��ǻ�����α׷���', '��Z01��');
diff --git a/src/test/mb/expected/euc_tw.out b/src/test/mb/expected/euc_tw.out
index f224e7820d..99eb4884e1 100644
--- a/src/test/mb/expected/euc_tw.out
+++ b/src/test/mb/expected/euc_tw.out
@@ -3,7 +3,6 @@ ERROR:  table "
 create table ��ٸ���� (����ɱ text, ��Ƴ��� varchar, ���� varchar(16));
 create index ��ٸ����index1 on ��ٸ���� using btree (����ɱ);
 create index ��ٸ����index2 on ��ٸ���� using hash (��Ƴ���);
-WARNING:  hash indexes are not WAL-logged and their use is discouraged
 insert into ��ٸ���� values ('�����', '������', 'ơA01��');
 insert into ��ٸ���� values ('������', '����ȴ����Ƴ', '��B10��');
 insert into ��ٸ���� values ('����', 'ӡ��ϴǹȴ����Ƴ', '��Z01Ħ');
diff --git a/src/test/mb/expected/gb18030.out b/src/test/mb/expected/gb18030.out
index 562852b674..b14234dce4 100644
--- a/src/test/mb/expected/gb18030.out
+++ b/src/test/mb/expected/gb18030.out
@@ -2,7 +2,6 @@ drop table Ӌ
 create table Ӌ��C���Z (���Z text, ����`�� varchar, �俼1A���� char(16));
 create index Ӌ��C���Zindex1 on Ӌ��C���Z using btree (���Z);
 create index Ӌ��C���Zindex2 on Ӌ��C���Z using hash (����`��);
-WARNING:  hash indexes are not WAL-logged and their use is discouraged
 insert into Ӌ��C���Z values('����ԥ�`���ǥ����ץ쥤','�CA01��');
 insert into Ӌ��C���Z values('����ԥ�`������ե��å���','��B10��');
 insert into Ӌ��C���Z values('����ԥ�`���ץ�����ީ`','��Z01��');
diff --git a/src/test/mb/expected/mule_internal.out b/src/test/mb/expected/mule_internal.out
index 67f7775706..ac8b57dc42 100644
--- a/src/test/mb/expected/mule_internal.out
+++ b/src/test/mb/expected/mule_internal.out
@@ -3,7 +3,6 @@ ERROR:  table "
 create table ��ג�������ђ�� (��ђ�� text, �ʬ������������ varchar, ������1A������ char(16));
 create index ��ג�������ђ��index1 on ��ג�������ђ�� using btree (��ђ��);
 create index ��ג�������ђ��index2 on ��ג�������ђ�� using hash (�ʬ������������);
-WARNING:  hash indexes are not WAL-logged and their use is discouraged
 insert into ��ג�������ђ�� values('������Ԓ�咡������ǒ�������ג�쒥�','���A01���');
 insert into ��ג�������ђ�� values('������Ԓ�咡���������钥Ւ����Ò�����','�ʬB10���');
 insert into ��ג�������ђ�� values('������Ԓ�咡������ג�풥���钥ޒ��','���Z01���');
@@ -178,7 +177,6 @@ ERROR:  table "
 create table �ͪ�ߩ�Ѧ��듾� (��듾� text, ��“׾��ړ�� varchar, ����1A��󓱸 char(16));
 create index �ͪ�ߩ�Ѧ��듾�index1 on �ͪ�ߩ�Ѧ��듾� using btree (��듾�);
 create index �ͪ�ߩ�Ѧ��듾�index2 on �ͪ�ߩ�Ѧ��듾� using hash (��“׾��ړ��);
-WARNING:  hash indexes are not WAL-logged and their use is discouraged
 insert into �ͪ�ߩ�Ѧ��듾� values('��ēǻ��͓�𓽺��Ó�����', '�ѦA01�߾');
 insert into �ͪ�ߩ�Ѧ��듾� values('��ēǻ��͓�ד����ȓ��', '���B10���');
 insert into �ͪ�ߩ�Ѧ��듾� values('��ēǻ��͓����Γ�ד�����', '���Z01���');
diff --git a/src/test/mb/expected/sjis.out b/src/test/mb/expected/sjis.out
index 73dd29b984..db2bfd0d75 100644
--- a/src/test/mb/expected/sjis.out
+++ b/src/test/mb/expected/sjis.out
@@ -2,7 +2,6 @@ drop table 
 create table �v�Z�@�p�� (�p�� text, ���ރR�[�h varchar, ���l1A���� char(16));
 create index �v�Z�@�p��index1 on �v�Z�@�p�� using btree (�p��);
 create index �v�Z�@�p��index2 on �v�Z�@�p�� using hash (���ރR�[�h);
-WARNING:  hash indexes are not WAL-logged and their use is discouraged
 insert into �v�Z�@�p�� values('�R���s���[�^�f�B�X�v���C','�@A01��');
 insert into �v�Z�@�p�� values('�R���s���[�^�O���t�B�b�N�X','��B10��');
 insert into �v�Z�@�p�� values('�R���s���[�^�v���O���}�[','�lZ01��');
diff --git a/src/test/mb/expected/utf8.out b/src/test/mb/expected/utf8.out
index 715f346837..8f9f63c7e0 100644
--- a/src/test/mb/expected/utf8.out
+++ b/src/test/mb/expected/utf8.out
@@ -3,7 +3,6 @@ ERROR:  table "計算機用語" does not exist
 create table 計算機用語 (用語 text, 分類コード varchar, 備考1Aだよ char(16));
 create index 計算機用語index1 on 計算機用語 using btree (用語);
 create index 計算機用語index2 on 計算機用語 using hash (分類コード);
-WARNING:  hash indexes are not WAL-logged and their use is discouraged
 insert into 計算機用語 values('コンピュータディスプレイ','機A01上');
 insert into 計算機用語 values('コンピュータグラフィックス','分B10中');
 insert into 計算機用語 values('コンピュータプログラマー','人Z01下');