Commit910bc51

committed

When text search string is too long, in error message report actual and

maximum number of bytes allowed.

1 parent0e50b08 commit910bc51Copy full SHA for 910bc51

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.8 2008/01/01 19:45:52 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.9 2008/03/05 15:50:37 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -163,7 +163,7 @@ make_tsvector(ParsedText *prs)`
`163`	`163`	`if (lenstr>MAXSTRPOS)`
`164`	`164`	`ereport(ERROR,`
`165`	`165`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`166`		`-errmsg("string is too long for tsvector")));`
	`166`	`+errmsg("string is too long for tsvector (%d bytes, max %d bytes)",lenstr,MAXSTRPOS)));`
`167`	`167`
`168`	`168`	`totallen=CALCDATASIZE(prs->curwords,lenstr);`
`169`	`169`	`in= (TSVector)palloc0(totallen);`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector.c,v 1.11 2008/01/01 19:45:53 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector.c,v 1.12 2008/03/05 15:50:37 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -224,7 +224,7 @@ tsvectorin(PG_FUNCTION_ARGS)`
`224`	`224`	`if (cur-tmpbuf>MAXSTRPOS)`
`225`	`225`	`ereport(ERROR,`
`226`	`226`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`227`		`-errmsg("string is too long for tsvector")));`
	`227`	`+errmsg("string is too long for tsvector (%d bytes, max %d bytes)",cur-tmpbuf,MAXSTRPOS)));`
`228`	`228`
`229`	`229`	`/*`
`230`	`230`	`* Enlarge buffers if needed`
`@@ -273,7 +273,7 @@ tsvectorin(PG_FUNCTION_ARGS)`
`273`	`273`	`if (buflen>MAXSTRPOS)`
`274`	`274`	`ereport(ERROR,`
`275`	`275`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`276`		`-errmsg("string is too long for tsvector")));`
	`276`	`+errmsg("string is too long for tsvector (%d bytes, max %d bytes)",buflen,MAXSTRPOS)));`
`277`	`277`
`278`	`278`	`totallen=CALCDATASIZE(len,buflen);`
`279`	`279`	`in= (TSVector)palloc0(totallen);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.12 2008/01/01 19:45:53 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.13 2008/03/05 15:50:37 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -488,7 +488,7 @@ tsvector_concat(PG_FUNCTION_ARGS)`
`488`	`488`	`if (dataoff>MAXSTRPOS)`
`489`	`489`	`ereport(ERROR,`
`490`	`490`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`491`		`-errmsg("string is too long for tsvector")));`
	`491`	`+errmsg("string is too long for tsvector (%d bytes, max %d bytes)",dataoff,MAXSTRPOS)));`
`492`	`492`
`493`	`493`	`out->size=ptr-ARRPTR(out);`
`494`	`494`	`SET_VARSIZE(out,CALCDATASIZE(out->size,dataoff));`

Comments

(0)