From b40c0a4bb006c2c133e92e9510feb75ca0001575 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 13 Nov 2007 23:36:26 +0000 Subject: [PATCH] Clean up some stray references to tsearch2. --- doc/src/sgml/gin.sgml | 19 ++++++++++++------- doc/src/sgml/gist.sgml | 21 +++++++++++---------- doc/src/sgml/indices.sgml | 11 ++++------- doc/src/sgml/trgm.sgml | 26 +++++++++++++------------- src/backend/access/gin/README | 2 +- 5 files changed, 41 insertions(+), 38 deletions(-) diff --git a/doc/src/sgml/gin.sgml b/doc/src/sgml/gin.sgml index 842ce0167d..61a3f0f4ec 100644 --- a/doc/src/sgml/gin.sgml +++ b/doc/src/sgml/gin.sgml @@ -1,4 +1,4 @@ - + GIN Indexes @@ -232,13 +232,20 @@ The PostgreSQL source distribution includes - GIN classes for one-dimensional arrays of all internal - types. The following + GIN operator classes for tsvector and + for one-dimensional arrays of all internal types. The following contrib modules also contain GIN operator classes: + + hstore + + Module for storing (key, value) pairs + + + intarray @@ -247,11 +254,9 @@ - tsearch2 + pg_trgm - Support for inverted text indexing. This is much faster for very - large, mostly-static sets of documents. - + Text similarity using trigram matching diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml index a02da6a9f6..587517da1d 100644 --- a/doc/src/sgml/gist.sgml +++ b/doc/src/sgml/gist.sgml @@ -1,4 +1,4 @@ - + GiST Indexes @@ -181,8 +181,9 @@ The PostgreSQL source distribution includes several examples of index methods implemented using - GiST. The core system currently provides R-Tree - equivalent functionality for some of the built-in geometric data types + GiST. The core system currently provides text search + support (indexing for tsvector and tsquery) as well as + R-Tree equivalent functionality for some of the built-in geometric data types (see src/backend/access/gist/gistproc.c). The following contrib modules also contain GiST operator classes: @@ -203,6 +204,13 @@ + + hstore + + Module for storing (key, value) pairs + + + intarray @@ -230,13 +238,6 @@ Indexing for float ranges - - - tsearch2 - - Full text indexing - - diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml index 2c238d3429..6fcb6968ff 100644 --- a/doc/src/sgml/indices.sgml +++ b/doc/src/sgml/indices.sgml @@ -1,4 +1,4 @@ - + Indexes @@ -235,8 +235,6 @@ CREATE INDEX name ON table (See for the meaning of these operators.) - Also, an IS NULL condition on - an index column can be used with a GiST index. Many other GiST operator classes are available in the contrib collection or as separate projects. For more information see . @@ -269,10 +267,9 @@ CREATE INDEX name ON table (See for the meaning of these operators.) - GIN indexes cannot use IS NULL as a search condition. - Other GIN operator classes are available in the contrib - tsearch2 and intarray modules. - For more information see . + Many other GIN operator + classes are available in the contrib collection or as separate + projects. For more information see . diff --git a/doc/src/sgml/trgm.sgml b/doc/src/sgml/trgm.sgml index 6d61404a4a..63f677a647 100644 --- a/doc/src/sgml/trgm.sgml +++ b/doc/src/sgml/trgm.sgml @@ -131,24 +131,24 @@ ORDER BY - Tsearch2 Integration + Text Search Integration Trigram matching is a very useful tool when used in conjunction - with a text index created by the Tsearch2 contrib module. (See - contrib/tsearch2) + with a full text index. The first step is to generate an auxiliary table containing all - the unique words in the Tsearch2 index: + the unique words in the documents: CREATE TABLE words AS SELECT word FROM stat('SELECT to_tsvector(''simple'', bodytext) FROM documents'); - Where 'documents' is a table that has a text field 'bodytext' - that TSearch2 is used to search. The use of the 'simple' dictionary - with the to_tsvector function, instead of just using the already + where documents is a table that has a text field + bodytext that we wish to search. The use of the + simple configuration with the to_tsvector + function, instead of just using the already existing vector is to avoid creating a list of already stemmed words. This way, only the original, unstemmed words are added to the word list. @@ -174,9 +174,9 @@ CREATE INDEX words_idx ON words USING gin(word gist_trgm_ops); - Since the 'words' table has been generated as a separate, + Since the words table has been generated as a separate, static table, it will need to be periodically regenerated so that - it remains up to date with the word list in the Tsearch2 index. + it remains up to date with the document collection. @@ -184,14 +184,14 @@ CREATE INDEX words_idx ON words USING gin(word gist_trgm_ops); References - - Tsearch2 Development Site - - GiST Development Site + + Tsearch2 Development Site + + diff --git a/src/backend/access/gin/README b/src/backend/access/gin/README index aa9ae3db3b..c914759aa8 100644 --- a/src/backend/access/gin/README +++ b/src/backend/access/gin/README @@ -48,7 +48,7 @@ Features * User-defined opclasses. (The scheme is similar to GiST.) * Optimized index creation (Makes use of maintenance_work_mem to accumulate postings in memory.) - * Tsearch2 support via an opclass + * Text search support via an opclass * Soft upper limit on the returned results set using a GUC variable: gin_fuzzy_search_limit