Commit237be3c

committed

Add hints to cases where indexes fail because of values that are too long.

1 parent8bbf227 commit237be3cCopy full SHA for 237be3c

File tree

+16

-8

lines changed

+16

-8

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/hash/hashinsert.c,v 1.36 2005/03/21 01:23:57 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/hash/hashinsert.c,v 1.37 2005/08/10 21:36:45 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -88,7 +88,8 @@ _hash_doinsert(Relation rel, HashItem hitem)`
`88`	`88`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`89`	`89`	`errmsg("index row size %lu exceeds hash maximum %lu",`
`90`	`90`	`(unsigned long)itemsz,`
`91`		`-(unsigned long)HashMaxItemSize((Page)metap))));`
	`91`	`+(unsigned long)HashMaxItemSize((Page)metap)),`
	`92`	`+errhint("Values larger than a buffer page cannot be indexed.")));`
`92`	`93`
`93`	`94`	`/*`
`94`	`95`	`* Compute the target bucket number, and convert to block number.`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.121 2005/06/06 20:22:57 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.122 2005/08/10 21:36:45 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -392,7 +392,10 @@ _bt_insertonpg(Relation rel,`
`392`	`392`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`393`	`393`	`errmsg("index row size %lu exceeds btree maximum, %lu",`
`394`	`394`	`(unsigned long)itemsz,`
`395`		`-(unsigned long)BTMaxItemSize(page))));`
	`395`	`+(unsigned long)BTMaxItemSize(page)),`
	`396`	`+errhint("Values larger than 1/3 of a buffer page cannot be indexed\n"`
	`397`	`+"Consider a separate column containing an MD5 hash of the value\n"`
	`398`	`+"or use full text indexing.")));`
`396`	`399`
`397`	`400`	`/*`
`398`	`401`	`* Determine exactly where new item will go.`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`* Portions Copyright (c) 1994, Regents of the University of California`
`57`	`57`	`*`
`58`	`58`	`* IDENTIFICATION`
`59`		`- * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsort.c,v 1.91 2005/06/06 20:22:57 tgl Exp $`
	`59`	`+ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsort.c,v 1.92 2005/08/10 21:36:45 momjian Exp $`
`60`	`60`	`*`
`61`	`61`	`*-------------------------------------------------------------------------`
`62`	`62`	`*/`
`@@ -498,7 +498,10 @@ _bt_buildadd(BTWriteState wstate, BTPageState state, BTItem bti)`
`498`	`498`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`499`	`499`	`errmsg("index row size %lu exceeds btree maximum, %lu",`
`500`	`500`	`(unsigned long)btisz,`
`501`		`-(unsigned long)BTMaxItemSize(npage))));`
	`501`	`+(unsigned long)BTMaxItemSize(npage)),`
	`502`	`+errhint("Values larger than 1/3 of a buffer page cannot be indexed\n"`
	`503`	`+"Consider a separate column containing an MD5 hash of the value\n"`
	`504`	`+"or use full text indexing.")));`
`502`	`505`
`503`	`506`	`if (pgspc<btisz\|\|pgspc<state->btps_full)`
`504`	`507`	`{`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/rtree/rtree.c,v 1.90 2005/06/06 17:01:22 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/rtree/rtree.c,v 1.91 2005/08/10 21:36:46 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -733,7 +733,8 @@ rtpicksplit(Relation r,`
`733`	`733`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`734`	`734`	`errmsg("index row size %lu exceeds rtree maximum, %lu",`
`735`	`735`	`(unsigned long)newitemsz,`
`736`		`-(unsigned long)RTPageAvailSpace)));`
	`736`	`+(unsigned long)RTPageAvailSpace),`
	`737`	`+errhint("Values larger than a buffer page cannot be indexed.")));`
`737`	`738`
`738`	`739`	`maxoff=PageGetMaxOffsetNumber(page);`
`739`	`740`	`newitemoff=OffsetNumberNext(maxoff);/* phony index for new`

Comments

(0)