database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-11 20:28:21 +03:00
Code Activity

Clean up parsing of ltree and lquery some more.

Browse Source 
Fix lquery parsing to handle repeated flag characters correctly,
and to enforce the max label length correctly in some cases where
it did not before, and to detect empty labels in some cases where
it did not before.

In a more cosmetic vein, use a switch rather than if-then chains to
handle the different states, and avoid unnecessary checks on charlen
when looking for ASCII characters, and factor out multiple copies of
the label length checking code.

Tom Lane and Dmitry Belyavsky

Discussion: https://postgr.es/m/CADqLbzLVkBuPX0812o+z=c3i6honszsZZ6VQOSKR3VPbB56P3w@mail.gmail.com
This commit is contained in:
Tom Lane
2020-04-01 19:44:17 -04:00
parent 949a9f043e
commit 17ca067995
3 changed files with 360 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
contrib/ltree/expected/ltree.out
View File

@ -31,6 +31,29 @@ SELECT '1.2._3'::ltree;
1.2._3 1.2._3
(1 row) (1 row)
-- empty labels not allowed
SELECT '.2.3'::ltree;
ERROR: ltree syntax error at character 1
LINE 1: SELECT '.2.3'::ltree;
^
SELECT '1..3'::ltree;
ERROR: ltree syntax error at character 3
LINE 1: SELECT '1..3'::ltree;
^
SELECT '1.2.'::ltree;
ERROR: ltree syntax error
LINE 1: SELECT '1.2.'::ltree;
^
DETAIL: Unexpected end of input.
SELECT repeat('x', 255)::ltree;
repeat
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
(1 row)
SELECT repeat('x', 256)::ltree;
ERROR: label string is too long
DETAIL: Label length is 256, must be at most 255, at character 257.
SELECT ltree2text('1.2.3.34.sdf'); SELECT ltree2text('1.2.3.34.sdf');
ltree2text ltree2text
-------------- --------------
@ -451,12 +474,81 @@ SELECT 'foo.bar{,}.!a*|b{1,}.c{,44}.d{3,4}'::lquery;
foo.bar{,}.!a*|b{1,}.c{,44}.d{3,4} foo.bar{,}.!a*|b{1,}.c{,44}.d{3,4}
(1 row) (1 row)
SELECT 'foo*@@*'::lquery;
lquery
--------
foo@*
(1 row)
SELECT 'qwerty%@*.tu'::lquery; SELECT 'qwerty%@*.tu'::lquery;
lquery lquery
-------------- --------------
qwerty%@*.tu qwerty%@*.tu
(1 row) (1 row)
-- empty labels not allowed
SELECT '.2.3'::lquery;
ERROR: lquery syntax error at character 1
LINE 1: SELECT '.2.3'::lquery;
^
SELECT '1..3'::lquery;
ERROR: lquery syntax error at character 3
LINE 1: SELECT '1..3'::lquery;
^
SELECT '1.2.'::lquery;
ERROR: lquery syntax error
LINE 1: SELECT '1.2.'::lquery;
^
DETAIL: Unexpected end of input.
SELECT '@.2.3'::lquery;
ERROR: lquery syntax error at character 1
LINE 1: SELECT '@.2.3'::lquery;
^
SELECT '1.@.3'::lquery;
ERROR: lquery syntax error at character 3
LINE 1: SELECT '1.@.3'::lquery;
^
SELECT '1.2.@'::lquery;
ERROR: lquery syntax error at character 5
LINE 1: SELECT '1.2.@'::lquery;
^
SELECT '!.2.3'::lquery;
ERROR: lquery syntax error at character 2
LINE 1: SELECT '!.2.3'::lquery;
^
DETAIL: Empty labels are not allowed.
SELECT '1.!.3'::lquery;
ERROR: lquery syntax error at character 4
LINE 1: SELECT '1.!.3'::lquery;
^
DETAIL: Empty labels are not allowed.
SELECT '1.2.!'::lquery;
ERROR: lquery syntax error at character 6
LINE 1: SELECT '1.2.!'::lquery;
^
DETAIL: Empty labels are not allowed.
SELECT '1.2.3|@.4'::lquery;
ERROR: lquery syntax error at character 7
LINE 1: SELECT '1.2.3|@.4'::lquery;
^
SELECT (repeat('x', 255) || '*@@*')::lquery;
lquery
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx@*
(1 row)
SELECT (repeat('x', 256) || '*@@*')::lquery;
ERROR: label string is too long
DETAIL: Label length is 256, must be at most 255, at character 257.
SELECT ('!' || repeat('x', 255))::lquery;
lquery
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
!xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
(1 row)
SELECT ('!' || repeat('x', 256))::lquery;
ERROR: label string is too long
DETAIL: Label length is 256, must be at most 255, at character 258.
SELECT nlevel('1.2.3.4'); SELECT nlevel('1.2.3.4');
nlevel nlevel
-------- --------
@ -1072,6 +1164,12 @@ SELECT 'QWER_TY'::ltree ~ 'q%@*';
t t
(1 row) (1 row)
SELECT 'QWER_TY'::ltree ~ 'q%@*%@*';
?column?
----------
t
(1 row)
SELECT 'QWER_TY'::ltree ~ 'Q_t%@*'; SELECT 'QWER_TY'::ltree ~ 'Q_t%@*';
?column? ?column?
---------- ----------

511
contrib/ltree/ltree_io.c
View File

@ -24,6 +24,10 @@ typedef struct
#define LTPRS_WAITNAME 0 #define LTPRS_WAITNAME 0
#define LTPRS_WAITDELIM 1 #define LTPRS_WAITDELIM 1
static void finish_nodeitem(nodeitem *lptr, const char *ptr,
bool is_lquery, int pos);
/* /*
* expects a null terminated string * expects a null terminated string
* returns an ltree * returns an ltree
@ -51,7 +55,7 @@ parse_ltree(const char *buf)
while (*ptr) while (*ptr)
{ {
charlen = pg_mblen(ptr); charlen = pg_mblen(ptr);
if (charlen == 1 && t_iseq(ptr, '.')) if (t_iseq(ptr, '.'))
num++; num++;
ptr += charlen; ptr += charlen;
} }
@ -67,40 +71,32 @@ parse_ltree(const char *buf)
{ {
charlen = pg_mblen(ptr); charlen = pg_mblen(ptr);
if (state == LTPRS_WAITNAME) switch (state)
{ {
if (ISALNUM(ptr)) case LTPRS_WAITNAME:
{ if (ISALNUM(ptr))
lptr->start = ptr; {
lptr->wlen = 0; lptr->start = ptr;
state = LTPRS_WAITDELIM; lptr->wlen = 0;
} state = LTPRS_WAITDELIM;
else }
UNCHAR; else
UNCHAR;
break;
case LTPRS_WAITDELIM:
if (t_iseq(ptr, '.'))
{
finish_nodeitem(lptr, ptr, false, pos);
totallen += MAXALIGN(lptr->len + LEVEL_HDRSIZE);
lptr++;
state = LTPRS_WAITNAME;
}
else if (!ISALNUM(ptr))
UNCHAR;
break;
default:
elog(ERROR, "internal error in ltree parser");
} }
else if (state == LTPRS_WAITDELIM)
{
if (charlen == 1 && t_iseq(ptr, '.'))
{
lptr->len = ptr - lptr->start;
if (lptr->wlen > LTREE_LABEL_MAX_CHARS)
ereport(ERROR,
(errcode(ERRCODE_NAME_TOO_LONG),
errmsg("label string is too long"),
errdetail("Label length is %d, must be at most %d, at character %d.",
lptr->wlen, LTREE_LABEL_MAX_CHARS,
pos)));
totallen += MAXALIGN(lptr->len + LEVEL_HDRSIZE);
lptr++;
state = LTPRS_WAITNAME;
}
else if (!ISALNUM(ptr))
UNCHAR;
}
else
/* internal error */
elog(ERROR, "internal error in parser");
ptr += charlen; ptr += charlen;
lptr->wlen++; lptr->wlen++;
@ -109,14 +105,7 @@ parse_ltree(const char *buf)
if (state == LTPRS_WAITDELIM) if (state == LTPRS_WAITDELIM)
{ {
lptr->len = ptr - lptr->start; finish_nodeitem(lptr, ptr, false, pos);
if (lptr->wlen > LTREE_LABEL_MAX_CHARS)
ereport(ERROR,
(errcode(ERRCODE_NAME_TOO_LONG),
errmsg("label string is too long"),
errdetail("Label length is %d, must be at most %d, at character %d.",
lptr->wlen, LTREE_LABEL_MAX_CHARS, pos)));
totallen += MAXALIGN(lptr->len + LEVEL_HDRSIZE); totallen += MAXALIGN(lptr->len + LEVEL_HDRSIZE);
lptr++; lptr++;
} }
@ -298,13 +287,10 @@ parse_lquery(const char *buf)
{ {
charlen = pg_mblen(ptr); charlen = pg_mblen(ptr);
if (charlen == 1) if (t_iseq(ptr, '.'))
{ num++;
if (t_iseq(ptr, '.')) else if (t_iseq(ptr, '|'))
num++; numOR++;
else if (t_iseq(ptr, '|'))
numOR++;
}
ptr += charlen; ptr += charlen;
} }
@ -321,220 +307,176 @@ parse_lquery(const char *buf)
{ {
charlen = pg_mblen(ptr); charlen = pg_mblen(ptr);
if (state == LQPRS_WAITLEVEL) switch (state)
{ {
if (ISALNUM(ptr)) case LQPRS_WAITLEVEL:
{ if (ISALNUM(ptr))
GETVAR(curqlevel) = lptr = (nodeitem *) palloc0(sizeof(nodeitem) * (numOR + 1)); {
lptr->start = ptr; GETVAR(curqlevel) = lptr = (nodeitem *) palloc0(sizeof(nodeitem) * (numOR + 1));
state = LQPRS_WAITDELIM; lptr->start = ptr;
curqlevel->numvar = 1; state = LQPRS_WAITDELIM;
} curqlevel->numvar = 1;
else if (charlen == 1 && t_iseq(ptr, '!')) }
{ else if (t_iseq(ptr, '!'))
GETVAR(curqlevel) = lptr = (nodeitem *) palloc0(sizeof(nodeitem) * (numOR + 1)); {
lptr->start = ptr + 1; GETVAR(curqlevel) = lptr = (nodeitem *) palloc0(sizeof(nodeitem) * (numOR + 1));
state = LQPRS_WAITDELIM; lptr->start = ptr + 1;
curqlevel->numvar = 1; lptr->wlen = -1; /* compensate for counting ! below */
curqlevel->flag |= LQL_NOT; state = LQPRS_WAITDELIM;
hasnot = true; curqlevel->numvar = 1;
} curqlevel->flag |= LQL_NOT;
else if (charlen == 1 && t_iseq(ptr, '*')) hasnot = true;
state = LQPRS_WAITOPEN; }
else else if (t_iseq(ptr, '*'))
UNCHAR; state = LQPRS_WAITOPEN;
} else
else if (state == LQPRS_WAITVAR)
{
if (ISALNUM(ptr))
{
lptr++;
lptr->start = ptr;
state = LQPRS_WAITDELIM;
curqlevel->numvar++;
}
else
UNCHAR;
}
else if (state == LQPRS_WAITDELIM)
{
if (charlen == 1 && t_iseq(ptr, '@'))
{
if (lptr->start == ptr)
UNCHAR; UNCHAR;
lptr->flag |= LVAR_INCASE; break;
curqlevel->flag |= LVAR_INCASE; case LQPRS_WAITVAR:
} if (ISALNUM(ptr))
else if (charlen == 1 && t_iseq(ptr, '*')) {
{ lptr++;
if (lptr->start == ptr) lptr->start = ptr;
state = LQPRS_WAITDELIM;
curqlevel->numvar++;
}
else
UNCHAR; UNCHAR;
lptr->flag |= LVAR_ANYEND; break;
curqlevel->flag |= LVAR_ANYEND; case LQPRS_WAITDELIM:
} if (t_iseq(ptr, '@'))
else if (charlen == 1 && t_iseq(ptr, '%')) {
{ lptr->flag |= LVAR_INCASE;
if (lptr->start == ptr) curqlevel->flag |= LVAR_INCASE;
}
else if (t_iseq(ptr, '*'))
{
lptr->flag |= LVAR_ANYEND;
curqlevel->flag |= LVAR_ANYEND;
}
else if (t_iseq(ptr, '%'))
{
lptr->flag |= LVAR_SUBLEXEME;
curqlevel->flag |= LVAR_SUBLEXEME;
}
else if (t_iseq(ptr, '|'))
{
finish_nodeitem(lptr, ptr, true, pos);
state = LQPRS_WAITVAR;
}
else if (t_iseq(ptr, '{'))
{
finish_nodeitem(lptr, ptr, true, pos);
curqlevel->flag |= LQL_COUNT;
state = LQPRS_WAITFNUM;
}
else if (t_iseq(ptr, '.'))
{
finish_nodeitem(lptr, ptr, true, pos);
state = LQPRS_WAITLEVEL;
curqlevel = NEXTLEV(curqlevel);
}
else if (ISALNUM(ptr))
{
/* disallow more chars after a flag */
if (lptr->flag)
UNCHAR;
}
else
UNCHAR; UNCHAR;
lptr->flag |= LVAR_SUBLEXEME; break;
curqlevel->flag |= LVAR_SUBLEXEME; case LQPRS_WAITOPEN:
} if (t_iseq(ptr, '{'))
else if (charlen == 1 && t_iseq(ptr, '|')) state = LQPRS_WAITFNUM;
{ else if (t_iseq(ptr, '.'))
lptr->len = ptr - lptr->start - {
((lptr->flag & LVAR_SUBLEXEME) ? 1 : 0) - /* We only get here for '*', so these are correct defaults */
((lptr->flag & LVAR_INCASE) ? 1 : 0) - curqlevel->low = 0;
((lptr->flag & LVAR_ANYEND) ? 1 : 0); curqlevel->high = LTREE_MAX_LEVELS;
if (lptr->wlen > LTREE_LABEL_MAX_CHARS) curqlevel = NEXTLEV(curqlevel);
ereport(ERROR, state = LQPRS_WAITLEVEL;
(errcode(ERRCODE_NAME_TOO_LONG), }
errmsg("label string is too long"), else
errdetail("Label length is %d, must be at most %d, at character %d.",
lptr->wlen, LTREE_LABEL_MAX_CHARS,
pos)));
state = LQPRS_WAITVAR;
}
else if (charlen == 1 && t_iseq(ptr, '{'))
{
lptr->len = ptr - lptr->start -
((lptr->flag & LVAR_SUBLEXEME) ? 1 : 0) -
((lptr->flag & LVAR_INCASE) ? 1 : 0) -
((lptr->flag & LVAR_ANYEND) ? 1 : 0);
if (lptr->wlen > LTREE_LABEL_MAX_CHARS)
ereport(ERROR,
(errcode(ERRCODE_NAME_TOO_LONG),
errmsg("label string is too long"),
errdetail("Label length is %d, must be at most %d, at character %d.",
lptr->wlen, LTREE_LABEL_MAX_CHARS,
pos)));
curqlevel->flag |= LQL_COUNT;
state = LQPRS_WAITFNUM;
}
else if (charlen == 1 && t_iseq(ptr, '.'))
{
lptr->len = ptr - lptr->start -
((lptr->flag & LVAR_SUBLEXEME) ? 1 : 0) -
((lptr->flag & LVAR_INCASE) ? 1 : 0) -
((lptr->flag & LVAR_ANYEND) ? 1 : 0);
if (lptr->wlen > LTREE_LABEL_MAX_CHARS)
ereport(ERROR,
(errcode(ERRCODE_NAME_TOO_LONG),
errmsg("label string is too long"),
errdetail("Label length is %d, must be at most %d, at character %d.",
lptr->wlen, LTREE_LABEL_MAX_CHARS,
pos)));
state = LQPRS_WAITLEVEL;
curqlevel = NEXTLEV(curqlevel);
}
else if (ISALNUM(ptr))
{
if (lptr->flag)
UNCHAR; UNCHAR;
} break;
else case LQPRS_WAITFNUM:
UNCHAR; if (t_iseq(ptr, ','))
} state = LQPRS_WAITSNUM;
else if (state == LQPRS_WAITOPEN) else if (t_isdigit(ptr))
{ {
if (charlen == 1 && t_iseq(ptr, '{')) int low = atoi(ptr);
state = LQPRS_WAITFNUM;
else if (charlen == 1 && t_iseq(ptr, '.'))
{
/* We only get here for '*', so these are correct defaults */
curqlevel->low = 0;
curqlevel->high = LTREE_MAX_LEVELS;
curqlevel = NEXTLEV(curqlevel);
state = LQPRS_WAITLEVEL;
}
else
UNCHAR;
}
else if (state == LQPRS_WAITFNUM)
{
if (charlen == 1 && t_iseq(ptr, ','))
state = LQPRS_WAITSNUM;
else if (t_isdigit(ptr))
{
int low = atoi(ptr);
if (low < 0 || low > LTREE_MAX_LEVELS) if (low < 0 || low > LTREE_MAX_LEVELS)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
errmsg("lquery syntax error"), errmsg("lquery syntax error"),
errdetail("Low limit (%d) exceeds the maximum allowed (%d), at character %d.", errdetail("Low limit (%d) exceeds the maximum allowed (%d), at character %d.",
low, LTREE_MAX_LEVELS, pos))); low, LTREE_MAX_LEVELS, pos)));
curqlevel->low = (uint16) low; curqlevel->low = (uint16) low;
state = LQPRS_WAITND; state = LQPRS_WAITND;
} }
else else
UNCHAR; UNCHAR;
} break;
else if (state == LQPRS_WAITSNUM) case LQPRS_WAITSNUM:
{ if (t_isdigit(ptr))
if (t_isdigit(ptr)) {
{ int high = atoi(ptr);
int high = atoi(ptr);
if (high < 0 || high > LTREE_MAX_LEVELS) if (high < 0 || high > LTREE_MAX_LEVELS)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
errmsg("lquery syntax error"), errmsg("lquery syntax error"),
errdetail("High limit (%d) exceeds the maximum allowed (%d), at character %d.", errdetail("High limit (%d) exceeds the maximum allowed (%d), at character %d.",
high, LTREE_MAX_LEVELS, pos))); high, LTREE_MAX_LEVELS, pos)));
else if (curqlevel->low > high) else if (curqlevel->low > high)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("lquery syntax error"), errmsg("lquery syntax error"),
errdetail("Low limit (%d) is greater than high limit (%d), at character %d.", errdetail("Low limit (%d) is greater than high limit (%d), at character %d.",
curqlevel->low, high, pos))); curqlevel->low, high, pos)));
curqlevel->high = (uint16) high; curqlevel->high = (uint16) high;
state = LQPRS_WAITCLOSE; state = LQPRS_WAITCLOSE;
} }
else if (charlen == 1 && t_iseq(ptr, '}')) else if (t_iseq(ptr, '}'))
{ {
curqlevel->high = LTREE_MAX_LEVELS; curqlevel->high = LTREE_MAX_LEVELS;
state = LQPRS_WAITEND; state = LQPRS_WAITEND;
} }
else else
UNCHAR; UNCHAR;
break;
case LQPRS_WAITCLOSE:
if (t_iseq(ptr, '}'))
state = LQPRS_WAITEND;
else if (!t_isdigit(ptr))
UNCHAR;
break;
case LQPRS_WAITND:
if (t_iseq(ptr, '}'))
{
curqlevel->high = curqlevel->low;
state = LQPRS_WAITEND;
}
else if (t_iseq(ptr, ','))
state = LQPRS_WAITSNUM;
else if (!t_isdigit(ptr))
UNCHAR;
break;
case LQPRS_WAITEND:
if (t_iseq(ptr, '.'))
{
state = LQPRS_WAITLEVEL;
curqlevel = NEXTLEV(curqlevel);
}
else
UNCHAR;
break;
default:
elog(ERROR, "internal error in lquery parser");
} }
else if (state == LQPRS_WAITCLOSE)
{
if (charlen == 1 && t_iseq(ptr, '}'))
state = LQPRS_WAITEND;
else if (!t_isdigit(ptr))
UNCHAR;
}
else if (state == LQPRS_WAITND)
{
if (charlen == 1 && t_iseq(ptr, '}'))
{
curqlevel->high = curqlevel->low;
state = LQPRS_WAITEND;
}
else if (charlen == 1 && t_iseq(ptr, ','))
state = LQPRS_WAITSNUM;
else if (!t_isdigit(ptr))
UNCHAR;
}
else if (state == LQPRS_WAITEND)
{
if (charlen == 1 && t_iseq(ptr, '.'))
{
state = LQPRS_WAITLEVEL;
curqlevel = NEXTLEV(curqlevel);
}
else
UNCHAR;
}
else
/* internal error */
elog(ERROR, "internal error in parser");
ptr += charlen; ptr += charlen;
if (state == LQPRS_WAITDELIM) if (state == LQPRS_WAITDELIM)
@ -543,30 +485,7 @@ parse_lquery(const char *buf)
} }
if (state == LQPRS_WAITDELIM) if (state == LQPRS_WAITDELIM)
{ finish_nodeitem(lptr, ptr, true, pos);
if (lptr->start == ptr)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("lquery syntax error"),
errdetail("Unexpected end of input.")));
lptr->len = ptr - lptr->start -
((lptr->flag & LVAR_SUBLEXEME) ? 1 : 0) -
((lptr->flag & LVAR_INCASE) ? 1 : 0) -
((lptr->flag & LVAR_ANYEND) ? 1 : 0);
if (lptr->len == 0)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("lquery syntax error"),
errdetail("Unexpected end of input.")));
if (lptr->wlen > LTREE_LABEL_MAX_CHARS)
ereport(ERROR,
(errcode(ERRCODE_NAME_TOO_LONG),
errmsg("label string is too long"),
errdetail("Label length is %d, must be at most %d, at character %d.",
lptr->wlen, LTREE_LABEL_MAX_CHARS, pos)));
}
else if (state == LQPRS_WAITOPEN) else if (state == LQPRS_WAITOPEN)
curqlevel->high = LTREE_MAX_LEVELS; curqlevel->high = LTREE_MAX_LEVELS;
else if (state != LQPRS_WAITEND) else if (state != LQPRS_WAITEND)
@ -646,6 +565,46 @@ parse_lquery(const char *buf)
#undef UNCHAR #undef UNCHAR
} }
/*
* Close out parsing an ltree or lquery nodeitem:
* compute the correct length, and complain if it's not OK
*/
static void
finish_nodeitem(nodeitem *lptr, const char *ptr, bool is_lquery, int pos)
{
if (is_lquery)
{
/*
* Back up over any flag characters, and discount them from length and
* position.
*/
while (ptr > lptr->start && strchr("@*%", ptr[-1]) != NULL)
{
ptr--;
lptr->wlen--;
pos--;
}
}
/* Now compute the byte length, which we weren't tracking before. */
lptr->len = ptr - lptr->start;
/* Complain if it's empty or too long */
if (lptr->len == 0)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
is_lquery ?
errmsg("lquery syntax error at character %d", pos) :
errmsg("ltree syntax error at character %d", pos),
errdetail("Empty labels are not allowed.")));
if (lptr->wlen > LTREE_LABEL_MAX_CHARS)
ereport(ERROR,
(errcode(ERRCODE_NAME_TOO_LONG),
errmsg("label string is too long"),
errdetail("Label length is %d, must be at most %d, at character %d.",
lptr->wlen, LTREE_LABEL_MAX_CHARS, pos)));
}
/* /*
* expects an lquery * expects an lquery
* returns a null terminated string * returns a null terminated string

27
contrib/ltree/sql/ltree.sql
View File

@ -10,6 +10,14 @@ SELECT '1'::ltree;
SELECT '1.2'::ltree; SELECT '1.2'::ltree;
SELECT '1.2._3'::ltree; SELECT '1.2._3'::ltree;
-- empty labels not allowed
SELECT '.2.3'::ltree;
SELECT '1..3'::ltree;
SELECT '1.2.'::ltree;
SELECT repeat('x', 255)::ltree;
SELECT repeat('x', 256)::ltree;
SELECT ltree2text('1.2.3.34.sdf'); SELECT ltree2text('1.2.3.34.sdf');
SELECT text2ltree('1.2.3.34.sdf'); SELECT text2ltree('1.2.3.34.sdf');
@ -88,8 +96,26 @@ SELECT '1.*.4|3|2.*{,4}'::lquery;
SELECT '1.*.4|3|2.*{1,}'::lquery; SELECT '1.*.4|3|2.*{1,}'::lquery;
SELECT '1.*.4|3|2.*{1}'::lquery; SELECT '1.*.4|3|2.*{1}'::lquery;
SELECT 'foo.bar{,}.!a*|b{1,}.c{,44}.d{3,4}'::lquery; SELECT 'foo.bar{,}.!a*|b{1,}.c{,44}.d{3,4}'::lquery;
SELECT 'foo*@@*'::lquery;
SELECT 'qwerty%@*.tu'::lquery; SELECT 'qwerty%@*.tu'::lquery;
-- empty labels not allowed
SELECT '.2.3'::lquery;
SELECT '1..3'::lquery;
SELECT '1.2.'::lquery;
SELECT '@.2.3'::lquery;
SELECT '1.@.3'::lquery;
SELECT '1.2.@'::lquery;
SELECT '!.2.3'::lquery;
SELECT '1.!.3'::lquery;
SELECT '1.2.!'::lquery;
SELECT '1.2.3|@.4'::lquery;
SELECT (repeat('x', 255) || '*@@*')::lquery;
SELECT (repeat('x', 256) || '*@@*')::lquery;
SELECT ('!' || repeat('x', 255))::lquery;
SELECT ('!' || repeat('x', 256))::lquery;
SELECT nlevel('1.2.3.4'); SELECT nlevel('1.2.3.4');
SELECT nlevel(('1' || repeat('.1', 65534))::ltree); SELECT nlevel(('1' || repeat('.1', 65534))::ltree);
SELECT nlevel(('1' || repeat('.1', 65535))::ltree); SELECT nlevel(('1' || repeat('.1', 65535))::ltree);
@ -200,6 +226,7 @@ SELECT 'a.b.c.d.e'::ltree ~ '!c{0,3}.!a{2,}';
SELECT 'a.b.c.d.e'::ltree ~ '!c{0,3}.!d{2,}.*'; SELECT 'a.b.c.d.e'::ltree ~ '!c{0,3}.!d{2,}.*';
SELECT 'QWER_TY'::ltree ~ 'q%@*'; SELECT 'QWER_TY'::ltree ~ 'q%@*';
SELECT 'QWER_TY'::ltree ~ 'q%@*%@*';
SELECT 'QWER_TY'::ltree ~ 'Q_t%@*'; SELECT 'QWER_TY'::ltree ~ 'Q_t%@*';
SELECT 'QWER_GY'::ltree ~ 'q_t%@*'; SELECT 'QWER_GY'::ltree ~ 'q_t%@*';