rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add an "absval" parameter to allow contrib/dict_int to ignore signs. 

Jeff Janes

Discussion: https://postgr.es/m/CAMkU=1xRcs_BUPzR0+V3WndaCAv0E_m3h6aUEJ8NF-sY1nnHsw@mail.gmail.com
This commit is contained in:
Tom Lane 2020-03-08 18:35:06 -04:00
parent 38ce06c37e
commit 806eb92c01
4 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/dict_int/dict_int.c
View File

@ -21,6 +21,7 @@ typedef struct
{
int maxlen;
bool rejectlong;
bool absval;
} DictInt;
@ -37,6 +38,7 @@ dintdict_init(PG_FUNCTION_ARGS)
d = (DictInt *) palloc0(sizeof(DictInt));
d->maxlen = 6;
d->rejectlong = false;
d->absval = false;
foreach(l, dictoptions)
{
@ -55,6 +57,10 @@ dintdict_init(PG_FUNCTION_ARGS)
{
d->rejectlong = defGetBoolean(defel);
}
else if (strcmp(defel->defname, "absval") == 0)
{
d->absval = defGetBoolean(defel);
}
else
{
ereport(ERROR,
@ -72,11 +78,21 @@ dintdict_lexize(PG_FUNCTION_ARGS)
{
DictInt *d = (DictInt *) PG_GETARG_POINTER(0);
char *in = (char *) PG_GETARG_POINTER(1);
char *txt = pnstrdup(in, PG_GETARG_INT32(2));
int len = PG_GETARG_INT32(2);
char *txt;
TSLexeme *res = palloc0(sizeof(TSLexeme) * 2);
res[1].lexeme = NULL;
if (PG_GETARG_INT32(2) > d->maxlen)
if (d->absval && (in[0] == '+' || in[0] == '-'))
{
len--;
txt = pnstrdup(in + 1, len);
}
else
txt = pnstrdup(in, len);
if (len > d->maxlen)
{
if (d->rejectlong)
{

25
contrib/dict_int/expected/dict_int.out
View File

@ -302,3 +302,28 @@ select ts_lexize('intdict', '314532610153');
ALTER TEXT SEARCH DICTIONARY intdict (MAXLEN = -214783648);
ERROR: maxlen value has to be >= 1
select ts_lexize('intdict', '-40865854');
ts_lexize
-----------
{-40865}
(1 row)
select ts_lexize('intdict', '+40865854');
ts_lexize
-----------
{+40865}
(1 row)
ALTER TEXT SEARCH DICTIONARY intdict (ABSVAL = true);
select ts_lexize('intdict', '-40865854');
ts_lexize
-----------
{408658}
(1 row)
select ts_lexize('intdict', '+40865854');
ts_lexize
-----------
{408658}
(1 row)

6
contrib/dict_int/sql/dict_int.sql
View File

@ -53,3 +53,9 @@ select ts_lexize('intdict', '641439323669');
select ts_lexize('intdict', '314532610153');
ALTER TEXT SEARCH DICTIONARY intdict (MAXLEN = -214783648);
select ts_lexize('intdict', '-40865854');
select ts_lexize('intdict', '+40865854');
ALTER TEXT SEARCH DICTIONARY intdict (ABSVAL = true);
select ts_lexize('intdict', '-40865854');
select ts_lexize('intdict', '+40865854');

11
doc/src/sgml/dict-int.sgml
View File

@ -25,7 +25,7 @@
<title>Configuration</title>
<para>
The dictionary accepts two options:
The dictionary accepts three options:
</para>
<itemizedlist>
@ -46,6 +46,15 @@
such an integer cannot be searched for.
</para>
</listitem>
<listitem>
<para>
The <literal>absval</literal> parameter specifies whether leading
<quote><literal>+</literal></quote> or <quote><literal>-</literal></quote>
signs should be removed from integer words. The default
is <literal>false</literal>. When <literal>true</literal>, the sign is
removed before <literal>maxlen</literal> is applied.
</para>
</listitem>
</itemizedlist>
</sect2>