summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2014-09-11 17:40:06 +0000
committerBruce Momjian2014-09-11 17:40:06 +0000
commit849462a9fafbb30856e47f7862543b1aefa95796 (patch)
treef6b10bea585de6fcf094d0474b1658e8ed36f70f
parent68e66923ff629c324e219090860dc9e0e0a6f5d6 (diff)
improve hash creation warning message
This improves the wording of commit 84aa8ba128a08e6fdebb2497c7a79ebf18093e12. Report by Kevin Grittner
-rw-r--r--src/backend/commands/indexcmds.c2
-rw-r--r--src/test/regress/expected/create_index.out8
-rw-r--r--src/test/regress/expected/enum.out2
-rw-r--r--src/test/regress/expected/macaddr.out2
-rw-r--r--src/test/regress/expected/replica_identity.out2
-rw-r--r--src/test/regress/expected/uuid.out2
6 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 1afe02bd85..8a1cb4b818 100644
--- 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 e68f9c288d..a2bef7acb9 100644
--- 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 44f1c79848..fa23b52e55 100644
--- 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 4c8dec0563..91edc5ab7a 100644
--- 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 48426e8d92..45df81ae48 100644
--- 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 4c4c092b35..97c0ce30de 100644
--- 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