liuyu/pgvector
1
0
Fork 0
mirror of https://github.com/pgvector/pgvector.git synced 2026-07-11 23:26:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Improved vector_in"

Browse Source 
This reverts commit 4894dc5da1.
This commit is contained in:
Andrew Kane
2024-01-17 17:14:42 -08:00
parent 4894dc5da1
commit 1ff9ab5133
1 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/vector.c
View File

@@ -181,24 +181,26 @@ vector_in(PG_FUNCTION_ARGS)
int32 typmod = PG_GETARG_INT32(2); int32 typmod = PG_GETARG_INT32(2);
float x[VECTOR_MAX_DIM]; float x[VECTOR_MAX_DIM];
int dim = 0; int dim = 0;
char *pt = lit; char *pt;
char *stringEnd; char *stringEnd;
Vector *result; Vector *result;
bool malformed = false; char *litcopy = pstrdup(lit);
char *str = litcopy;
while (vector_isspace(*pt)) while (vector_isspace(*str))
pt++; str++;
if (*pt != '[') if (*str != '[')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed vector literal: \"%s\"", lit), errmsg("malformed vector literal: \"%s\"", lit),
errdetail("Vector contents must start with \"[\"."))); errdetail("Vector contents must start with \"[\".")));
pt++; str++;
pt = strtok(str, ",");
stringEnd = pt; stringEnd = pt;
while (*pt != '\0' && *pt != ',' && *stringEnd != ']') while (pt != NULL && *stringEnd != ']')
{ {
if (dim == VECTOR_MAX_DIM) if (dim == VECTOR_MAX_DIM)
ereport(ERROR, ereport(ERROR,
@@ -227,22 +229,12 @@ vector_in(PG_FUNCTION_ARGS)
while (vector_isspace(*stringEnd)) while (vector_isspace(*stringEnd))
stringEnd++; stringEnd++;
if (*stringEnd == '\0') if (*stringEnd != '\0' && *stringEnd != ']')
break;
if (*stringEnd != ',' && *stringEnd != ']')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("invalid input syntax for type vector: \"%s\"", lit))); errmsg("invalid input syntax for type vector: \"%s\"", lit)));
pt = stringEnd + 1; pt = strtok(NULL, ",");
/* TODO Remove in 0.6.0 */
while (*pt == ',')
{
malformed = true;
pt++;
}
} }
if (stringEnd == NULL || *stringEnd != ']') if (stringEnd == NULL || *stringEnd != ']')
@@ -263,17 +255,22 @@ vector_in(PG_FUNCTION_ARGS)
errmsg("malformed vector literal: \"%s\"", lit), errmsg("malformed vector literal: \"%s\"", lit),
errdetail("Junk after closing right brace."))); errdetail("Junk after closing right brace.")));
/* TODO Remove in 0.6.0 */ /* Ensure no consecutive delimiters since strtok skips */
if (malformed) for (pt = lit + 1; *pt != '\0'; pt++)
ereport(ERROR, {
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), if (pt[-1] == ',' && *pt == ',')
errmsg("malformed vector literal: \"%s\"", lit))); ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed vector literal: \"%s\"", lit)));
}
if (dim < 1) if (dim < 1)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATA_EXCEPTION), (errcode(ERRCODE_DATA_EXCEPTION),
errmsg("vector must have at least 1 dimension"))); errmsg("vector must have at least 1 dimension")));
pfree(litcopy);
CheckExpectedDim(typmod, dim); CheckExpectedDim(typmod, dim);
result = InitVector(dim); result = InitVector(dim);