improve hash creation warning message

This improves the wording of commit 84aa8ba128a08e6fdebb2497c7a79ebf18093e12.

Report by Kevin Grittner

diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 1afe02bd85ad445f99129b0c1d9c96b2425b7e0e..8a1cb4b818225db2bdd95e8480e9d61e8b0b7763 100644 (file)
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -491,7 +491,7 @@ DefineIndex(Oid relationId,
 
        if (strcmp(accessMethodName, "hash") == 0)
                ereport(WARNING,
-                               (errmsg("hash indexes are not WAL-logged so they are not crash-safe and cannot be used on streaming standbys")));
+                               (errmsg("hash indexes are not WAL-logged and thus are not crash-safe and cannot be used on standby servers")));
 
        if (stmt->unique && !accessMethodForm->amcanunique)
                ereport(ERROR,

diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out
index e68f9c288d134618a1398fbbb6e06c5f2952eb0a..a2bef7acb9a8a96c0a9e96aedee09116f17f8647 100644 (file)
--- a/src/test/regress/expected/create_index.out
+++ b/src/test/regress/expected/create_index.out
@@ -2238,13 +2238,13 @@ DROP TABLE array_gin_test;
 -- HASH
 --
 CREATE INDEX hash_i4_index ON hash_i4_heap USING hash (random int4_ops);
-WARNING:  hash indexes are not WAL-logged so they are not crash-safe and cannot be used on streaming standbys
+WARNING:  hash indexes are not WAL-logged and thus are not crash-safe and cannot be used on standby servers
 CREATE INDEX hash_name_index ON hash_name_heap USING hash (random name_ops);
-WARNING:  hash indexes are not WAL-logged so they are not crash-safe and cannot be used on streaming standbys
+WARNING:  hash indexes are not WAL-logged and thus are not crash-safe and cannot be used on standby servers
 CREATE INDEX hash_txt_index ON hash_txt_heap USING hash (random text_ops);
-WARNING:  hash indexes are not WAL-logged so they are not crash-safe and cannot be used on streaming standbys
+WARNING:  hash indexes are not WAL-logged and thus are not crash-safe and cannot be used on standby servers
 CREATE INDEX hash_f8_index ON hash_f8_heap USING hash (random float8_ops);
-WARNING:  hash indexes are not WAL-logged so they are not crash-safe and cannot be used on streaming standbys
+WARNING:  hash indexes are not WAL-logged and thus are not crash-safe and cannot be used on standby servers
 -- CREATE INDEX hash_ovfl_index ON hash_ovfl_heap USING hash (x int4_ops);
 --
 -- Test functional index

diff --git a/src/test/regress/expected/enum.out b/src/test/regress/expected/enum.out
index 44f1c798488318cd677fd6b0d9aea8a4800df599..fa23b52e5527be765437c4dddb0e936164c9e540 100644 (file)
--- a/src/test/regress/expected/enum.out
+++ b/src/test/regress/expected/enum.out
@@ -383,7 +383,7 @@ DROP INDEX enumtest_btree;
 -- Hash index / opclass with the = operator
 --
 CREATE INDEX enumtest_hash ON enumtest USING hash (col);
-WARNING:  hash indexes are not WAL-logged so they are not crash-safe and cannot be used on streaming standbys
+WARNING:  hash indexes are not WAL-logged and thus are not crash-safe and cannot be used on standby servers
 SELECT * FROM enumtest WHERE col = 'orange';
   col   
 --------

diff --git a/src/test/regress/expected/macaddr.out b/src/test/regress/expected/macaddr.out
index 4c8dec05633145554eb66d1ac7ca1bae382b81ea..91edc5ab7aee45a737dac54785b11ab3d2c06e6c 100644 (file)
--- a/src/test/regress/expected/macaddr.out
+++ b/src/test/regress/expected/macaddr.out
@@ -39,7 +39,7 @@ SELECT * FROM macaddr_data;
 
 CREATE INDEX macaddr_data_btree ON macaddr_data USING btree (b);
 CREATE INDEX macaddr_data_hash ON macaddr_data USING hash (b);
-WARNING:  hash indexes are not WAL-logged so they are not crash-safe and cannot be used on streaming standbys
+WARNING:  hash indexes are not WAL-logged and thus are not crash-safe and cannot be used on standby servers
 SELECT a, b, trunc(b) FROM macaddr_data ORDER BY 2, 1;
  a  |         b         |       trunc       
 ----+-------------------+-------------------

diff --git a/src/test/regress/expected/replica_identity.out b/src/test/regress/expected/replica_identity.out
index 48426e8d92b37d1519fd9c355752aeda55275a85..45df81ae485f9e965c9841d145d287498efcb4fd 100644 (file)
--- a/src/test/regress/expected/replica_identity.out
+++ b/src/test/regress/expected/replica_identity.out
@@ -11,7 +11,7 @@ CREATE INDEX test_replica_identity_keyab ON test_replica_identity (keya, keyb);
 CREATE UNIQUE INDEX test_replica_identity_keyab_key ON test_replica_identity (keya, keyb);
 CREATE UNIQUE INDEX test_replica_identity_nonkey ON test_replica_identity (keya, nonkey);
 CREATE INDEX test_replica_identity_hash ON test_replica_identity USING hash (nonkey);
-WARNING:  hash indexes are not WAL-logged so they are not crash-safe and cannot be used on streaming standbys
+WARNING:  hash indexes are not WAL-logged and thus are not crash-safe and cannot be used on standby servers
 CREATE UNIQUE INDEX test_replica_identity_expr ON test_replica_identity (keya, keyb, (3));
 CREATE UNIQUE INDEX test_replica_identity_partial ON test_replica_identity (keya, keyb) WHERE keyb != '3';
 -- default is 'd'/DEFAULT for user created tables

diff --git a/src/test/regress/expected/uuid.out b/src/test/regress/expected/uuid.out
index 4c4c092b3584b191382cbc5a52d90c4be73d5d96..97c0ce30de34dc06bb7338a574676a97342c9f16 100644 (file)
--- a/src/test/regress/expected/uuid.out
+++ b/src/test/regress/expected/uuid.out
@@ -114,7 +114,7 @@ SELECT COUNT(*) FROM guid1 WHERE guid_field >= '22222222-2222-2222-2222-22222222
 -- btree and hash index creation test
 CREATE INDEX guid1_btree ON guid1 USING BTREE (guid_field);
 CREATE INDEX guid1_hash  ON guid1 USING HASH  (guid_field);
-WARNING:  hash indexes are not WAL-logged so they are not crash-safe and cannot be used on streaming standbys
+WARNING:  hash indexes are not WAL-logged and thus are not crash-safe and cannot be used on standby servers
 -- unique index test
 CREATE UNIQUE INDEX guid1_unique_BTREE ON guid1 USING BTREE (guid_field);
 -- should fail