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

Switched to strtoint for sparsevec input

Browse Source
This commit is contained in:
Andrew Kane
2024-04-24 09:56:09 -07:00
parent c198fd58ee
commit b2a5259607
3 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/sparsevec.c
View File

@@ -3,6 +3,7 @@
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
#include "common/string.h"
#include "fmgr.h" #include "fmgr.h"
#include "halfutils.h" #include "halfutils.h"
#include "halfvec.h" #include "halfvec.h"
@@ -243,7 +244,7 @@ sparsevec_in(PG_FUNCTION_ARGS)
{ {
for (;;) for (;;)
{ {
long index; int index;
float value; float value;
/* TODO Better error */ /* TODO Better error */
@@ -263,17 +264,17 @@ sparsevec_in(PG_FUNCTION_ARGS)
/* Use similar logic as int2vectorin */ /* Use similar logic as int2vectorin */
errno = 0; errno = 0;
index = strtol(pt, &stringEnd, 10); index = strtoint(pt, &stringEnd, 10);
if (stringEnd == pt) if (stringEnd == pt)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("invalid input syntax for type sparsevec: \"%s\"", lit))); errmsg("invalid input syntax for type sparsevec: \"%s\"", lit)));
if (errno == ERANGE || index < 1 || index > INT_MAX) if (errno == ERANGE)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
errmsg("index \"%ld\" is out of range for type sparsevec", index))); errmsg("index \"%s\" is out of range for type sparsevec", pnstrdup(pt, stringEnd - pt))));
pt = stringEnd; pt = stringEnd;
@@ -352,13 +353,18 @@ sparsevec_in(PG_FUNCTION_ARGS)
/* Use similar logic as int2vectorin */ /* Use similar logic as int2vectorin */
errno = 0; errno = 0;
dim = strtol(pt, &stringEnd, 10); dim = strtoint(pt, &stringEnd, 10);
if (stringEnd == pt) if (stringEnd == pt)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("invalid input syntax for type sparsevec: \"%s\"", lit))); errmsg("invalid input syntax for type sparsevec: \"%s\"", lit)));
if (errno == ERANGE)
ereport(ERROR,
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
errmsg("dimensions \"%s\" is out of range for type sparsevec", pnstrdup(pt, stringEnd - pt))));
pt = stringEnd; pt = stringEnd;
/* Only whitespace is allowed after the closing brace */ /* Only whitespace is allowed after the closing brace */

18
test/expected/sparsevec_input.out
View File

@@ -191,8 +191,24 @@ SELECT '{}/1000001'::sparsevec;
ERROR: sparsevec cannot have more than 1000000 dimensions ERROR: sparsevec cannot have more than 1000000 dimensions
LINE 1: SELECT '{}/1000001'::sparsevec; LINE 1: SELECT '{}/1000001'::sparsevec;
^ ^
SELECT '{}/2147483648'::sparsevec;
ERROR: dimensions "2147483648" is out of range for type sparsevec
LINE 1: SELECT '{}/2147483648'::sparsevec;
^
SELECT '{}/-2147483649'::sparsevec;
ERROR: dimensions "-2147483649" is out of range for type sparsevec
LINE 1: SELECT '{}/-2147483649'::sparsevec;
^
SELECT '{}/9223372036854775808'::sparsevec;
ERROR: dimensions "9223372036854775808" is out of range for type sparsevec
LINE 1: SELECT '{}/9223372036854775808'::sparsevec;
^
SELECT '{}/-9223372036854775809'::sparsevec;
ERROR: dimensions "-9223372036854775809" is out of range for type sparsevec
LINE 1: SELECT '{}/-9223372036854775809'::sparsevec;
^
SELECT '{0:1}/1'::sparsevec; SELECT '{0:1}/1'::sparsevec;
ERROR: index "0" is out of range for type sparsevec ERROR: index must be greater than zero
LINE 1: SELECT '{0:1}/1'::sparsevec; LINE 1: SELECT '{0:1}/1'::sparsevec;
^ ^
SELECT '{2:1}/1'::sparsevec; SELECT '{2:1}/1'::sparsevec;

4
test/sql/sparsevec_input.sql
View File

@@ -39,6 +39,10 @@ SELECT '{1:1,2:1,1:1}/2'::sparsevec;
SELECT '{}/5'::sparsevec; SELECT '{}/5'::sparsevec;
SELECT '{}/-1'::sparsevec; SELECT '{}/-1'::sparsevec;
SELECT '{}/1000001'::sparsevec; SELECT '{}/1000001'::sparsevec;
SELECT '{}/2147483648'::sparsevec;
SELECT '{}/-2147483649'::sparsevec;
SELECT '{}/9223372036854775808'::sparsevec;
SELECT '{}/-9223372036854775809'::sparsevec;
SELECT '{0:1}/1'::sparsevec; SELECT '{0:1}/1'::sparsevec;
SELECT '{2:1}/1'::sparsevec; SELECT '{2:1}/1'::sparsevec;