aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/isn/expected/isn.out32
-rw-r--r--src/backend/access/brin/brin_validate.c36
-rw-r--r--src/backend/access/gin/ginvalidate.c32
-rw-r--r--src/backend/access/gist/gistvalidate.c32
-rw-r--r--src/backend/access/hash/hashvalidate.c40
-rw-r--r--src/backend/access/nbtree/nbtvalidate.c36
-rw-r--r--src/backend/access/spgist/spgvalidate.c36
7 files changed, 122 insertions, 122 deletions
diff --git a/contrib/isn/expected/isn.out b/contrib/isn/expected/isn.out
index ef9d3a61e72..18fe37a82c3 100644
--- a/contrib/isn/expected/isn.out
+++ b/contrib/isn/expected/isn.out
@@ -10,22 +10,22 @@ FROM (SELECT amname, opcname, opc.oid
WHERE opc.oid >= 16384
ORDER BY 1, 2 OFFSET 0) ss
WHERE NOT amvalidate(oid);
-INFO: btree operator family "isn_ops" is missing cross-type operator(s)
-INFO: btree operator family "isn_ops" is missing cross-type operator(s)
-INFO: btree operator family "isn_ops" is missing cross-type operator(s)
-INFO: btree operator family "isn_ops" is missing cross-type operator(s)
-INFO: btree operator family "isn_ops" is missing cross-type operator(s)
-INFO: btree operator family "isn_ops" is missing cross-type operator(s)
-INFO: btree operator family "isn_ops" is missing cross-type operator(s)
-INFO: btree operator family "isn_ops" is missing cross-type operator(s)
-INFO: hash operator family "isn_ops" is missing cross-type operator(s)
-INFO: hash operator family "isn_ops" is missing cross-type operator(s)
-INFO: hash operator family "isn_ops" is missing cross-type operator(s)
-INFO: hash operator family "isn_ops" is missing cross-type operator(s)
-INFO: hash operator family "isn_ops" is missing cross-type operator(s)
-INFO: hash operator family "isn_ops" is missing cross-type operator(s)
-INFO: hash operator family "isn_ops" is missing cross-type operator(s)
-INFO: hash operator family "isn_ops" is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method btree is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
+INFO: operator family "isn_ops" of access method hash is missing cross-type operator(s)
amname | opcname
--------+------------
btree | ean13_ops
diff --git a/src/backend/access/brin/brin_validate.c b/src/backend/access/brin/brin_validate.c
index dc23e00e895..97044e61bb1 100644
--- a/src/backend/access/brin/brin_validate.c
+++ b/src/backend/access/brin/brin_validate.c
@@ -113,8 +113,8 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("brin operator family \"%s\" contains function %s with invalid support number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains function %s with invalid support number %d",
+ opfamilyname, "brin",
format_procedure(procform->amproc),
procform->amprocnum)));
result = false;
@@ -129,8 +129,8 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("brin operator family \"%s\" contains function %s with wrong signature for support number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d",
+ opfamilyname, "brin",
format_procedure(procform->amproc),
procform->amprocnum)));
result = false;
@@ -151,8 +151,8 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("brin operator family \"%s\" contains operator %s with invalid strategy number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d",
+ opfamilyname, "brin",
format_operator(oprform->amopopr),
oprform->amopstrategy)));
result = false;
@@ -180,8 +180,8 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("brin operator family \"%s\" contains invalid ORDER BY specification for operator %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s",
+ opfamilyname, "brin",
format_operator(oprform->amopopr))));
result = false;
}
@@ -193,8 +193,8 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("brin operator family \"%s\" contains operator %s with wrong signature",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains operator %s with wrong signature",
+ opfamilyname, "brin",
format_operator(oprform->amopopr))));
result = false;
}
@@ -231,8 +231,8 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("brin operator family \"%s\" is missing operator(s) for types %s and %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s is missing operator(s) for types %s and %s",
+ opfamilyname, "brin",
format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype))));
result = false;
@@ -241,8 +241,8 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("brin operator family \"%s\" is missing support function(s) for types %s and %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s is missing support function(s) for types %s and %s",
+ opfamilyname, "brin",
format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype))));
result = false;
@@ -254,8 +254,8 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("brin operator class \"%s\" is missing operator(s)",
- opclassname)));
+ errmsg("operator class \"%s\" of access method %s is missing operator(s)",
+ opclassname, "brin")));
result = false;
}
for (i = 1; i <= BRIN_MANDATORY_NPROCS; i++)
@@ -265,8 +265,8 @@ brinvalidate(Oid opclassoid)
continue; /* got it */
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("brin operator class \"%s\" is missing support function %d",
- opclassname, i)));
+ errmsg("operator class \"%s\" of access method %s is missing support function %d",
+ opclassname, "brin", i)));
result = false;
}
diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c
index 0d2847456ea..9b147857dcb 100644
--- a/src/backend/access/gin/ginvalidate.c
+++ b/src/backend/access/gin/ginvalidate.c
@@ -90,8 +90,8 @@ ginvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gin operator family \"%s\" contains support procedure %s with cross-type registration",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains support procedure %s with different left and right input types",
+ opfamilyname, "gin",
format_procedure(procform->amproc))));
result = false;
}
@@ -146,8 +146,8 @@ ginvalidate(Oid opclassoid)
default:
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gin operator family \"%s\" contains function %s with invalid support number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains function %s with invalid support number %d",
+ opfamilyname, "gin",
format_procedure(procform->amproc),
procform->amprocnum)));
result = false;
@@ -158,8 +158,8 @@ ginvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gin operator family \"%s\" contains function %s with wrong signature for support number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d",
+ opfamilyname, "gin",
format_procedure(procform->amproc),
procform->amprocnum)));
result = false;
@@ -177,8 +177,8 @@ ginvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gin operator family \"%s\" contains operator %s with invalid strategy number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d",
+ opfamilyname, "gin",
format_operator(oprform->amopopr),
oprform->amopstrategy)));
result = false;
@@ -190,8 +190,8 @@ ginvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gin operator family \"%s\" contains invalid ORDER BY specification for operator %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s",
+ opfamilyname, "gin",
format_operator(oprform->amopopr))));
result = false;
}
@@ -203,8 +203,8 @@ ginvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gin operator family \"%s\" contains operator %s with wrong signature",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains operator %s with wrong signature",
+ opfamilyname, "gin",
format_operator(oprform->amopopr))));
result = false;
}
@@ -244,8 +244,8 @@ ginvalidate(Oid opclassoid)
continue; /* don't need both, see check below loop */
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gin operator class \"%s\" is missing support function %d",
- opclassname, i)));
+ errmsg("operator class \"%s\" of access method %s is missing support function %d",
+ opclassname, "gin", i)));
result = false;
}
if (!opclassgroup ||
@@ -254,8 +254,8 @@ ginvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gin operator class \"%s\" is missing support function %d or %d",
- opclassname,
+ errmsg("operator class \"%s\" of access method %s is missing support function %d or %d",
+ opclassname, "gin",
GIN_CONSISTENT_PROC, GIN_TRICONSISTENT_PROC)));
result = false;
}
diff --git a/src/backend/access/gist/gistvalidate.c b/src/backend/access/gist/gistvalidate.c
index 585c92be269..d7911ed3a19 100644
--- a/src/backend/access/gist/gistvalidate.c
+++ b/src/backend/access/gist/gistvalidate.c
@@ -90,8 +90,8 @@ gistvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gist operator family \"%s\" contains support procedure %s with cross-type registration",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains support procedure %s with different left and right input types",
+ opfamilyname, "gist",
format_procedure(procform->amproc))));
result = false;
}
@@ -143,8 +143,8 @@ gistvalidate(Oid opclassoid)
default:
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gist operator family \"%s\" contains function %s with invalid support number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains function %s with invalid support number %d",
+ opfamilyname, "gist",
format_procedure(procform->amproc),
procform->amprocnum)));
result = false;
@@ -155,8 +155,8 @@ gistvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gist operator family \"%s\" contains function %s with wrong signature for support number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d",
+ opfamilyname, "gist",
format_procedure(procform->amproc),
procform->amprocnum)));
result = false;
@@ -175,8 +175,8 @@ gistvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gist operator family \"%s\" contains operator %s with invalid strategy number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d",
+ opfamilyname, "gist",
format_operator(oprform->amopopr),
oprform->amopstrategy)));
result = false;
@@ -193,8 +193,8 @@ gistvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gist operator family \"%s\" contains unsupported ORDER BY specification for operator %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains unsupported ORDER BY specification for operator %s",
+ opfamilyname, "gist",
format_operator(oprform->amopopr))));
result = false;
}
@@ -204,8 +204,8 @@ gistvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gist operator family \"%s\" contains incorrect ORDER BY opfamily specification for operator %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains incorrect ORDER BY opfamily specification for operator %s",
+ opfamilyname, "gist",
format_operator(oprform->amopopr))));
result = false;
}
@@ -223,8 +223,8 @@ gistvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gist operator family \"%s\" contains operator %s with wrong signature",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains operator %s with wrong signature",
+ opfamilyname, "gist",
format_operator(oprform->amopopr))));
result = false;
}
@@ -262,8 +262,8 @@ gistvalidate(Oid opclassoid)
continue; /* optional methods */
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("gist operator class \"%s\" is missing support function %d",
- opclassname, i)));
+ errmsg("operator class \"%s\" of access method %s is missing support function %d",
+ opclassname, "gist", i)));
result = false;
}
diff --git a/src/backend/access/hash/hashvalidate.c b/src/backend/access/hash/hashvalidate.c
index f914c015bd1..30b29cb100c 100644
--- a/src/backend/access/hash/hashvalidate.c
+++ b/src/backend/access/hash/hashvalidate.c
@@ -96,8 +96,8 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("hash operator family \"%s\" contains support procedure %s with cross-type registration",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains support procedure %s with different left and right input types",
+ opfamilyname, "hash",
format_procedure(procform->amproc))));
result = false;
}
@@ -111,8 +111,8 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("hash operator family \"%s\" contains function %s with wrong signature for support number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d",
+ opfamilyname, "hash",
format_procedure(procform->amproc),
procform->amprocnum)));
result = false;
@@ -128,8 +128,8 @@ hashvalidate(Oid opclassoid)
default:
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("hash operator family \"%s\" contains function %s with invalid support number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains function %s with invalid support number %d",
+ opfamilyname, "hash",
format_procedure(procform->amproc),
procform->amprocnum)));
result = false;
@@ -149,8 +149,8 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("hash operator family \"%s\" contains operator %s with invalid strategy number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d",
+ opfamilyname, "hash",
format_operator(oprform->amopopr),
oprform->amopstrategy)));
result = false;
@@ -162,8 +162,8 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("hash operator family \"%s\" contains invalid ORDER BY specification for operator %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s",
+ opfamilyname, "hash",
format_operator(oprform->amopopr))));
result = false;
}
@@ -175,8 +175,8 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("hash operator family \"%s\" contains operator %s with wrong signature",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains operator %s with wrong signature",
+ opfamilyname, "hash",
format_operator(oprform->amopopr))));
result = false;
}
@@ -187,8 +187,8 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("hash operator family \"%s\" lacks support function for operator %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s lacks support function for operator %s",
+ opfamilyname, "hash",
format_operator(oprform->amopopr))));
result = false;
}
@@ -215,8 +215,8 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("hash operator family \"%s\" is missing operator(s) for types %s and %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s is missing operator(s) for types %s and %s",
+ opfamilyname, "hash",
format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype))));
result = false;
@@ -229,8 +229,8 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("hash operator class \"%s\" is missing operator(s)",
- opclassname)));
+ errmsg("operator class \"%s\" of access method %s is missing operator(s)",
+ opclassname, "hash")));
result = false;
}
@@ -245,8 +245,8 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("hash operator family \"%s\" is missing cross-type operator(s)",
- opfamilyname)));
+ errmsg("operator family \"%s\" of access method %s is missing cross-type operator(s)",
+ opfamilyname, "hash")));
result = false;
}
diff --git a/src/backend/access/nbtree/nbtvalidate.c b/src/backend/access/nbtree/nbtvalidate.c
index 88e33f54cda..5aae53ac680 100644
--- a/src/backend/access/nbtree/nbtvalidate.c
+++ b/src/backend/access/nbtree/nbtvalidate.c
@@ -98,8 +98,8 @@ btvalidate(Oid opclassoid)
default:
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("btree operator family \"%s\" contains function %s with invalid support number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains function %s with invalid support number %d",
+ opfamilyname, "btree",
format_procedure(procform->amproc),
procform->amprocnum)));
result = false;
@@ -110,8 +110,8 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("btree operator family \"%s\" contains function %s with wrong signature for support number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d",
+ opfamilyname, "btree",
format_procedure(procform->amproc),
procform->amprocnum)));
result = false;
@@ -130,8 +130,8 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("btree operator family \"%s\" contains operator %s with invalid strategy number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d",
+ opfamilyname, "btree",
format_operator(oprform->amopopr),
oprform->amopstrategy)));
result = false;
@@ -143,8 +143,8 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("btree operator family \"%s\" contains invalid ORDER BY specification for operator %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s",
+ opfamilyname, "btree",
format_operator(oprform->amopopr))));
result = false;
}
@@ -156,8 +156,8 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("btree operator family \"%s\" contains operator %s with wrong signature",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains operator %s with wrong signature",
+ opfamilyname, "btree",
format_operator(oprform->amopopr))));
result = false;
}
@@ -198,8 +198,8 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("btree operator family \"%s\" is missing operator(s) for types %s and %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s is missing operator(s) for types %s and %s",
+ opfamilyname, "btree",
format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype))));
result = false;
@@ -208,8 +208,8 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("btree operator family \"%s\" is missing support function for types %s and %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s is missing support function for types %s and %s",
+ opfamilyname, "btree",
format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype))));
result = false;
@@ -222,8 +222,8 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("btree operator class \"%s\" is missing operator(s)",
- opclassname)));
+ errmsg("operator class \"%s\" of access method %s is missing operator(s)",
+ opclassname, "btree")));
result = false;
}
@@ -239,8 +239,8 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("btree operator family \"%s\" is missing cross-type operator(s)",
- opfamilyname)));
+ errmsg("operator family \"%s\" of access method %s is missing cross-type operator(s)",
+ opfamilyname, "btree")));
result = false;
}
diff --git a/src/backend/access/spgist/spgvalidate.c b/src/backend/access/spgist/spgvalidate.c
index 1bc5bce72ec..157cf2a0283 100644
--- a/src/backend/access/spgist/spgvalidate.c
+++ b/src/backend/access/spgist/spgvalidate.c
@@ -90,8 +90,8 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("spgist operator family \"%s\" contains support procedure %s with cross-type registration",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains support procedure %s with different left and right input types",
+ opfamilyname, "spgist",
format_procedure(procform->amproc))));
result = false;
}
@@ -113,8 +113,8 @@ spgvalidate(Oid opclassoid)
default:
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("spgist operator family \"%s\" contains function %s with invalid support number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains function %s with invalid support number %d",
+ opfamilyname, "spgist",
format_procedure(procform->amproc),
procform->amprocnum)));
result = false;
@@ -125,8 +125,8 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("spgist operator family \"%s\" contains function %s with wrong signature for support number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains function %s with wrong signature for support number %d",
+ opfamilyname, "spgist",
format_procedure(procform->amproc),
procform->amprocnum)));
result = false;
@@ -144,8 +144,8 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("spgist operator family \"%s\" contains operator %s with invalid strategy number %d",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains operator %s with invalid strategy number %d",
+ opfamilyname, "spgist",
format_operator(oprform->amopopr),
oprform->amopstrategy)));
result = false;
@@ -157,8 +157,8 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("spgist operator family \"%s\" contains invalid ORDER BY specification for operator %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains invalid ORDER BY specification for operator %s",
+ opfamilyname, "spgist",
format_operator(oprform->amopopr))));
result = false;
}
@@ -170,8 +170,8 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("spgist operator family \"%s\" contains operator %s with wrong signature",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s contains operator %s with wrong signature",
+ opfamilyname, "spgist",
format_operator(oprform->amopopr))));
result = false;
}
@@ -198,8 +198,8 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("spgist operator family \"%s\" is missing operator(s) for types %s and %s",
- opfamilyname,
+ errmsg("operator family \"%s\" of access method %s is missing operator(s) for types %s and %s",
+ opfamilyname, "spgist",
format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype))));
result = false;
@@ -218,8 +218,8 @@ spgvalidate(Oid opclassoid)
continue; /* got it */
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("spgist operator family \"%s\" is missing support function %d for type %s",
- opfamilyname, i,
+ errmsg("operator family \"%s\" of access method %s is missing support function %d for type %s",
+ opfamilyname, "spgist", i,
format_type_be(thisgroup->lefttype))));
result = false;
}
@@ -231,8 +231,8 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
- errmsg("spgist operator class \"%s\" is missing operator(s)",
- opclassname)));
+ errmsg("operator class \"%s\" of access method %s is missing operator(s)",
+ opclassname, "spgist")));
result = false;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-20 14:21:54 +0000