diff options
| author | Bruce Momjian <bruce@momjian.us> | 2008-03-05 15:50:37 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2008-03-05 15:50:37 +0000 |
| commit | 910bc51862ad1f0cf9726ab04f4ca71cb557f65b (patch) | |
| tree | 232098735a2796c3fa1b1a73db00ddc90f90c927 /src | |
| parent | 0e50b080fa9ad8a86f43ed01bacc2e4ce48601b9 (diff) | |
| download | postgresql-910bc51862ad1f0cf9726ab04f4ca71cb557f65b.tar.gz postgresql-910bc51862ad1f0cf9726ab04f4ca71cb557f65b.zip | |
When text search string is too long, in error message report actual and
maximum number of bytes allowed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/tsearch/to_tsany.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/tsvector.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/adt/tsvector_op.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c index 5c954fa4316..17b86ec03e2 100644 --- a/src/backend/tsearch/to_tsany.c +++ b/src/backend/tsearch/to_tsany.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.8 2008/01/01 19:45:52 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.9 2008/03/05 15:50:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -163,7 +163,7 @@ make_tsvector(ParsedText *prs) if (lenstr > MAXSTRPOS) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("string is too long for tsvector"))); + errmsg("string is too long for tsvector (%d bytes, max %d bytes)", lenstr, MAXSTRPOS))); totallen = CALCDATASIZE(prs->curwords, lenstr); in = (TSVector) palloc0(totallen); diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c index 486bb6b47b1..bef297a0a5c 100644 --- a/src/backend/utils/adt/tsvector.c +++ b/src/backend/utils/adt/tsvector.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector.c,v 1.11 2008/01/01 19:45:53 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector.c,v 1.12 2008/03/05 15:50:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -224,7 +224,7 @@ tsvectorin(PG_FUNCTION_ARGS) if (cur - tmpbuf > MAXSTRPOS) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("string is too long for tsvector"))); + errmsg("string is too long for tsvector (%d bytes, max %d bytes)", cur - tmpbuf, MAXSTRPOS))); /* * Enlarge buffers if needed @@ -273,7 +273,7 @@ tsvectorin(PG_FUNCTION_ARGS) if (buflen > MAXSTRPOS) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("string is too long for tsvector"))); + errmsg("string is too long for tsvector (%d bytes, max %d bytes)", buflen, MAXSTRPOS))); totallen = CALCDATASIZE(len, buflen); in = (TSVector) palloc0(totallen); diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c index 8f1337fcc02..eee15a673dd 100644 --- a/src/backend/utils/adt/tsvector_op.c +++ b/src/backend/utils/adt/tsvector_op.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.12 2008/01/01 19:45:53 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.13 2008/03/05 15:50:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -488,7 +488,7 @@ tsvector_concat(PG_FUNCTION_ARGS) if (dataoff > MAXSTRPOS) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("string is too long for tsvector"))); + errmsg("string is too long for tsvector (%d bytes, max %d bytes)", dataoff, MAXSTRPOS))); out->size = ptr - ARRPTR(out); SET_VARSIZE(out, CALCDATASIZE(out->size, dataoff)); |