/*
* in/out function for ltree and lquery
* Teodor Sigaev <teodor@stack.net>
+ * contrib/ltree/ltree_io.c
*/
+#include "postgres.h"
-#include "ltree.h"
#include <ctype.h>
+
+#include "ltree.h"
#include "crc32.h"
PG_FUNCTION_INFO_V1(ltree_in);
#define UNCHAR ereport(ERROR, \
(errcode(ERRCODE_SYNTAX_ERROR), \
- errmsg("syntax error at position %d near \"%c\"", \
- (int)(ptr-buf), *ptr)));
+ errmsg("syntax error at position %d", \
+ pos)));
typedef struct
{
char *start;
- int len;
+ int len; /* length in bytes */
int flag;
-} nodeitem;
+ int wlen; /* length in characters */
+} nodeitem;
#define LTPRS_WAITNAME 0
#define LTPRS_WAITDELIM 1
int state = LTPRS_WAITNAME;
ltree *result;
ltree_level *curlevel;
+ int charlen;
+ int pos = 0;
ptr = buf;
while (*ptr)
{
- if (*ptr == '.')
+ charlen = pg_mblen(ptr);
+ if (charlen == 1 && t_iseq(ptr, '.'))
num++;
- ptr++;
+ ptr += charlen;
}
list = lptr = (nodeitem *) palloc(sizeof(nodeitem) * (num + 1));
ptr = buf;
while (*ptr)
{
+ charlen = pg_mblen(ptr);
+
if (state == LTPRS_WAITNAME)
{
- if (ISALNUM(*ptr))
+ if (ISALNUM(ptr))
{
lptr->start = ptr;
+ lptr->wlen = 0;
state = LTPRS_WAITDELIM;
}
else
}
else if (state == LTPRS_WAITDELIM)
{
- if (*ptr == '.')
+ if (charlen == 1 && t_iseq(ptr, '.'))
{
lptr->len = ptr - lptr->start;
- if (lptr->len > 255)
+ if (lptr->wlen > 255)
ereport(ERROR,
(errcode(ERRCODE_NAME_TOO_LONG),
errmsg("name of level is too long"),
- errdetail("name length is %d, must " \
- "be < 256, in position %d",
- lptr->len, (int) (lptr->start - buf))));
+ errdetail("Name length is %d, must "
+ "be < 256, in position %d.",
+ lptr->wlen, pos)));
totallen += MAXALIGN(lptr->len + LEVEL_HDRSIZE);
lptr++;
state = LTPRS_WAITNAME;
}
- else if (!ISALNUM(*ptr))
+ else if (!ISALNUM(ptr))
UNCHAR;
}
else
/* internal error */
elog(ERROR, "internal error in parser");
- ptr++;
+
+ ptr += charlen;
+ lptr->wlen++;
+ pos++;
}
if (state == LTPRS_WAITDELIM)
{
lptr->len = ptr - lptr->start;
- if (lptr->len > 255)
+ if (lptr->wlen > 255)
ereport(ERROR,
(errcode(ERRCODE_NAME_TOO_LONG),
errmsg("name of level is too long"),
- errdetail("name length is %d, must " \
- "be < 256, in position %d",
- lptr->len, (int) (lptr->start - buf))));
+ errdetail("Name length is %d, must "
+ "be < 256, in position %d.",
+ lptr->wlen, pos)));
totallen += MAXALIGN(lptr->len + LEVEL_HDRSIZE);
lptr++;
errmsg("syntax error"),
errdetail("Unexpected end of line.")));
- result = (ltree *) palloc(LTREE_HDRSIZE + totallen);
- result->len = LTREE_HDRSIZE + totallen;
+ result = (ltree *) palloc0(LTREE_HDRSIZE + totallen);
+ SET_VARSIZE(result, LTREE_HDRSIZE + totallen);
result->numlevel = lptr - list;
curlevel = LTREE_FIRST(result);
lptr = list;
while (lptr - list < result->numlevel)
{
- curlevel->len = (uint8) lptr->len;
+ curlevel->len = (uint16) lptr->len;
memcpy(curlevel->name, lptr->start, lptr->len);
curlevel = LEVEL_NEXT(curlevel);
lptr++;
int i;
ltree_level *curlevel;
- ptr = buf = (char *) palloc(in->len);
+ ptr = buf = (char *) palloc(VARSIZE(in));
curlevel = LTREE_FIRST(in);
for (i = 0; i < in->numlevel; i++)
{
lquery_variant *lrptr = NULL;
bool hasnot = false;
bool wasbad = false;
+ int charlen;
+ int pos = 0;
ptr = buf;
while (*ptr)
{
- if (*ptr == '.')
- num++;
- else if (*ptr == '|')
- numOR++;
- ptr++;
+ charlen = pg_mblen(ptr);
+
+ if (charlen == 1)
+ {
+ if (t_iseq(ptr, '.'))
+ num++;
+ else if (t_iseq(ptr, '|'))
+ numOR++;
+ }
+
+ ptr += charlen;
}
num++;
- curqlevel = tmpql = (lquery_level *) palloc(ITEMSIZE * num);
- memset((void *) tmpql, 0, ITEMSIZE * num);
+ curqlevel = tmpql = (lquery_level *) palloc0(ITEMSIZE * num);
ptr = buf;
while (*ptr)
{
+ charlen = pg_mblen(ptr);
+
if (state == LQPRS_WAITLEVEL)
{
- if (ISALNUM(*ptr))
+ if (ISALNUM(ptr))
{
- GETVAR(curqlevel) = lptr = (nodeitem *) palloc(sizeof(nodeitem) * (numOR + 1));
- memset((void *) GETVAR(curqlevel), 0, sizeof(nodeitem) * (numOR + 1));
+ GETVAR(curqlevel) = lptr = (nodeitem *) palloc0(sizeof(nodeitem) * (numOR + 1));
lptr->start = ptr;
state = LQPRS_WAITDELIM;
curqlevel->numvar = 1;
}
- else if (*ptr == '!')
+ else if (charlen == 1 && t_iseq(ptr, '!'))
{
- GETVAR(curqlevel) = lptr = (nodeitem *) palloc(sizeof(nodeitem) * (numOR + 1));
- memset((void *) GETVAR(curqlevel), 0, sizeof(nodeitem) * (numOR + 1));
+ GETVAR(curqlevel) = lptr = (nodeitem *) palloc0(sizeof(nodeitem) * (numOR + 1));
lptr->start = ptr + 1;
state = LQPRS_WAITDELIM;
curqlevel->numvar = 1;
curqlevel->flag |= LQL_NOT;
hasnot = true;
}
- else if (*ptr == '*')
+ else if (charlen == 1 && t_iseq(ptr, '*'))
state = LQPRS_WAITOPEN;
else
UNCHAR;
}
else if (state == LQPRS_WAITVAR)
{
- if (ISALNUM(*ptr))
+ if (ISALNUM(ptr))
{
lptr++;
lptr->start = ptr;
}
else if (state == LQPRS_WAITDELIM)
{
- if (*ptr == '@')
+ if (charlen == 1 && t_iseq(ptr, '@'))
{
if (lptr->start == ptr)
UNCHAR;
lptr->flag |= LVAR_INCASE;
curqlevel->flag |= LVAR_INCASE;
}
- else if (*ptr == '*')
+ else if (charlen == 1 && t_iseq(ptr, '*'))
{
if (lptr->start == ptr)
UNCHAR;
lptr->flag |= LVAR_ANYEND;
curqlevel->flag |= LVAR_ANYEND;
}
- else if (*ptr == '%')
+ else if (charlen == 1 && t_iseq(ptr, '%'))
{
if (lptr->start == ptr)
UNCHAR;
- lptr->flag |= LVAR_SUBLEXEM;
- curqlevel->flag |= LVAR_SUBLEXEM;
+ lptr->flag |= LVAR_SUBLEXEME;
+ curqlevel->flag |= LVAR_SUBLEXEME;
}
- else if (*ptr == '|')
+ else if (charlen == 1 && t_iseq(ptr, '|'))
{
lptr->len = ptr - lptr->start -
- ((lptr->flag & LVAR_SUBLEXEM) ? 1 : 0) -
+ ((lptr->flag & LVAR_SUBLEXEME) ? 1 : 0) -
((lptr->flag & LVAR_INCASE) ? 1 : 0) -
((lptr->flag & LVAR_ANYEND) ? 1 : 0);
- if (lptr->len > 255)
+ if (lptr->wlen > 255)
ereport(ERROR,
(errcode(ERRCODE_NAME_TOO_LONG),
errmsg("name of level is too long"),
- errdetail("name length is %d, must " \
- "be < 256, in position %d",
- lptr->len, (int) (lptr->start - buf))));
+ errdetail("Name length is %d, must "
+ "be < 256, in position %d.",
+ lptr->wlen, pos)));
state = LQPRS_WAITVAR;
}
- else if (*ptr == '.')
+ else if (charlen == 1 && t_iseq(ptr, '.'))
{
lptr->len = ptr - lptr->start -
- ((lptr->flag & LVAR_SUBLEXEM) ? 1 : 0) -
+ ((lptr->flag & LVAR_SUBLEXEME) ? 1 : 0) -
((lptr->flag & LVAR_INCASE) ? 1 : 0) -
((lptr->flag & LVAR_ANYEND) ? 1 : 0);
- if (lptr->len > 255)
+ if (lptr->wlen > 255)
ereport(ERROR,
(errcode(ERRCODE_NAME_TOO_LONG),
errmsg("name of level is too long"),
- errdetail("name length is %d, must " \
- "be < 256, in position %d",
- lptr->len, (int) (lptr->start - buf))));
+ errdetail("Name length is %d, must "
+ "be < 256, in position %d.",
+ lptr->wlen, pos)));
state = LQPRS_WAITLEVEL;
curqlevel = NEXTLEV(curqlevel);
}
- else if (ISALNUM(*ptr))
+ else if (ISALNUM(ptr))
{
if (lptr->flag)
UNCHAR;
}
else if (state == LQPRS_WAITOPEN)
{
- if (*ptr == '{')
+ if (charlen == 1 && t_iseq(ptr, '{'))
state = LQPRS_WAITFNUM;
- else if (*ptr == '.')
+ else if (charlen == 1 && t_iseq(ptr, '.'))
{
curqlevel->low = 0;
curqlevel->high = 0xffff;
}
else if (state == LQPRS_WAITFNUM)
{
- if (*ptr == ',')
+ if (charlen == 1 && t_iseq(ptr, ','))
state = LQPRS_WAITSNUM;
- else if (isdigit((unsigned int) *ptr))
+ else if (t_isdigit(ptr))
{
curqlevel->low = atoi(ptr);
state = LQPRS_WAITND;
}
else if (state == LQPRS_WAITSNUM)
{
- if (isdigit((unsigned int) *ptr))
+ if (t_isdigit(ptr))
{
curqlevel->high = atoi(ptr);
state = LQPRS_WAITCLOSE;
}
- else if (*ptr == '}')
+ else if (charlen == 1 && t_iseq(ptr, '}'))
{
curqlevel->high = 0xffff;
state = LQPRS_WAITEND;
}
else if (state == LQPRS_WAITCLOSE)
{
- if (*ptr == '}')
+ if (charlen == 1 && t_iseq(ptr, '}'))
state = LQPRS_WAITEND;
- else if (!isdigit((unsigned int) *ptr))
+ else if (!t_isdigit(ptr))
UNCHAR;
}
else if (state == LQPRS_WAITND)
{
- if (*ptr == '}')
+ if (charlen == 1 && t_iseq(ptr, '}'))
{
curqlevel->high = curqlevel->low;
state = LQPRS_WAITEND;
}
- else if (*ptr == ',')
+ else if (charlen == 1 && t_iseq(ptr, ','))
state = LQPRS_WAITSNUM;
- else if (!isdigit((unsigned int) *ptr))
+ else if (!t_isdigit(ptr))
UNCHAR;
}
else if (state == LQPRS_WAITEND)
{
- if (*ptr == '.')
+ if (charlen == 1 && t_iseq(ptr, '.'))
{
state = LQPRS_WAITLEVEL;
curqlevel = NEXTLEV(curqlevel);
else
/* internal error */
elog(ERROR, "internal error in parser");
- ptr++;
+
+ ptr += charlen;
+ if (state == LQPRS_WAITDELIM)
+ lptr->wlen++;
+ pos++;
}
if (state == LQPRS_WAITDELIM)
errdetail("Unexpected end of line.")));
lptr->len = ptr - lptr->start -
- ((lptr->flag & LVAR_SUBLEXEM) ? 1 : 0) -
+ ((lptr->flag & LVAR_SUBLEXEME) ? 1 : 0) -
((lptr->flag & LVAR_INCASE) ? 1 : 0) -
((lptr->flag & LVAR_ANYEND) ? 1 : 0);
if (lptr->len == 0)
errmsg("syntax error"),
errdetail("Unexpected end of line.")));
- if (lptr->len > 255)
+ if (lptr->wlen > 255)
ereport(ERROR,
(errcode(ERRCODE_NAME_TOO_LONG),
errmsg("name of level is too long"),
- errdetail("name length is %d, must " \
- "be < 256, in position %d",
- lptr->len, (int) (lptr->start - buf))));
+ errdetail("Name length is %d, must "
+ "be < 256, in position %d.",
+ lptr->wlen, pos)));
}
else if (state == LQPRS_WAITOPEN)
curqlevel->high = 0xffff;
curqlevel = NEXTLEV(curqlevel);
}
- result = (lquery *) palloc(totallen);
- result->len = totallen;
+ result = (lquery *) palloc0(totallen);
+ SET_VARSIZE(result, totallen);
result->numlevel = num;
result->firstgood = 0;
result->flag = 0;
cur->totallen += MAXALIGN(LVAR_HDRSIZE + lptr->len);
lrptr->len = lptr->len;
lrptr->flag = lptr->flag;
- lrptr->val = ltree_crc32_sz((uint8 *) lptr->start, lptr->len);
+ lrptr->val = ltree_crc32_sz(lptr->start, lptr->len);
memcpy(lrptr->name, lptr->start, lptr->len);
lptr++;
lrptr = LVAR_NEXT(lrptr);
*ptr;
int i,
j,
- totallen = 0;
+ totallen = 1;
lquery_level *curqlevel;
lquery_variant *curtlevel;
curqlevel = LQUERY_FIRST(in);
for (i = 0; i < in->numlevel; i++)
{
+ totallen++;
if (curqlevel->numvar)
- totallen = (curqlevel->numvar * 4) + 1 + curqlevel->totallen;
+ totallen += 1 + (curqlevel->numvar * 4) + curqlevel->totallen;
else
- totallen = 2 * 11 + 4;
- totallen++;
+ totallen += 2 * 11 + 4;
curqlevel = LQL_NEXT(curqlevel);
}
-
ptr = buf = (char *) palloc(totallen);
curqlevel = LQUERY_FIRST(in);
for (i = 0; i < in->numlevel; i++)
}
memcpy(ptr, curtlevel->name, curtlevel->len);
ptr += curtlevel->len;
- if ((curtlevel->flag & LVAR_SUBLEXEM))
+ if ((curtlevel->flag & LVAR_SUBLEXEME))
{
*ptr = '%';
ptr++;
projects / postgresql / blobdiff