Skip to content

P
Postgres FD Implementation
Commit 4ca765f9 authored by Teodor Sigaev's avatar Teodor Sigaev
Browse files
Options

Ignore too long lexeme

parent cf87eb47
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 2 deletions
contrib/tsearch2/ts_cfg.c
View file @ 4ca765f9
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#include "common.h" #include "common.h"
#include "tsvector.h" #include "tsvector.h"
#define IGNORE_LONGLEXEME 1
/*********top interface**********/ /*********top interface**********/
static void *plan_getcfg_bylocale = NULL; static void *plan_getcfg_bylocale = NULL;
...@@ -288,10 +290,18 @@ parsetext_v2(TSCfgInfo * cfg, PRSTEXT * prs, char *buf, int4 buflen) ...@@ -288,10 +290,18 @@ parsetext_v2(TSCfgInfo * cfg, PRSTEXT * prs, char *buf, int4 buflen)
PointerGetDatum(&lenlemm)))) != 0) PointerGetDatum(&lenlemm)))) != 0)
{ {
if (lenlemm >= MAXSTRLEN) if (lenlemm >= MAXSTRLEN) {
#ifdef IGNORE_LONGLEXEME
ereport(NOTICE,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("word is too long")));
continue;
#else
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("word is too long"))); errmsg("word is too long")));
#endif
}
if (type >= cfg->len) /* skip this type of lexem */ if (type >= cfg->len) /* skip this type of lexem */
continue; continue;
...@@ -414,10 +424,18 @@ hlparsetext(TSCfgInfo * cfg, HLPRSTEXT * prs, QUERYTYPE * query, char *buf, int4 ...@@ -414,10 +424,18 @@ hlparsetext(TSCfgInfo * cfg, HLPRSTEXT * prs, QUERYTYPE * query, char *buf, int4
PointerGetDatum(&lenlemm)))) != 0) PointerGetDatum(&lenlemm)))) != 0)
{ {
if (lenlemm >= MAXSTRLEN) if (lenlemm >= MAXSTRLEN) {
#ifdef IGNORE_LONGLEXEME
ereport(NOTICE,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("word is too long")));
continue;
#else
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("word is too long"))); errmsg("word is too long")));
#endif
}
hladdword(prs, lemm, lenlemm, type); hladdword(prs, lemm, lenlemm, type);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment