From: Robert Haas <rhaas@postgresql.org>
Date: Wed, 15 Mar 2017 11:25:36 +0000 (-0400)
Subject: Fix MB regression tests for WAL-logging of hash indexes.
X-Git-Tag: REL_10_BETA1~635
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8f356e1bd3382308b32eed01394879e20eb5158;p=thirdparty%2Fpostgresql.git

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
---

diff --git a/src/test/mb/expected/big5.out b/src/test/mb/expected/big5.out
index d7a6097e612..97100cd0a2d 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 be248d91359..15f83e0231c 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 837f2e60d07..229ffd8f971 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 f224e7820d5..99eb4884e12 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 562852b6741..b14234dce40 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 67f7775706e..ac8b57dc421 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 73dd29b9843..db2bfd0d755 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 715f3468374..8f9f63c7e0e 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下');