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

Updated invalid input syntax messages to be consistent [skip ci]

Browse Source
This commit is contained in:
Andrew Kane
2024-04-13 11:32:47 -07:00
parent f627e69c5f
commit c5c82bafda
6 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/halfvec.c
View File

@@ -169,7 +169,7 @@ halfvec_in(PG_FUNCTION_ARGS)
if (*str != '[') if (*str != '[')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed halfvec literal: \"%s\"", lit), errmsg("invalid input syntax for type halfvec: \"%s\"", lit),
errdetail("Vector contents must start with \"[\"."))); errdetail("Vector contents must start with \"[\".")));
str++; str++;
@@ -231,7 +231,7 @@ halfvec_in(PG_FUNCTION_ARGS)
if (stringEnd == NULL || *stringEnd != ']') if (stringEnd == NULL || *stringEnd != ']')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed halfvec literal: \"%s\"", lit), errmsg("invalid input syntax for type halfvec: \"%s\"", lit),
errdetail("Unexpected end of input."))); errdetail("Unexpected end of input.")));
stringEnd++; stringEnd++;
@@ -243,7 +243,7 @@ halfvec_in(PG_FUNCTION_ARGS)
if (*stringEnd != '\0') if (*stringEnd != '\0')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed halfvec literal: \"%s\"", lit), errmsg("invalid input syntax for type halfvec: \"%s\"", lit),
errdetail("Junk after closing right brace."))); errdetail("Junk after closing right brace.")));
/* Ensure no consecutive delimiters since strtok skips */ /* Ensure no consecutive delimiters since strtok skips */
@@ -252,7 +252,7 @@ halfvec_in(PG_FUNCTION_ARGS)
if (pt[-1] == ',' && *pt == ',') if (pt[-1] == ',' && *pt == ',')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed halfvec literal: \"%s\"", lit))); errmsg("invalid input syntax for type halfvec: \"%s\"", lit)));
} }
if (dim < 1) if (dim < 1)

8
src/sparsevec.c
View File

@@ -209,7 +209,7 @@ sparsevec_in(PG_FUNCTION_ARGS)
if (*str != '{') if (*str != '{')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed sparsevec literal: \"%s\"", lit), errmsg("invalid input syntax for type sparsevec: \"%s\"", lit),
errdetail("Vector contents must start with \"{\"."))); errdetail("Vector contents must start with \"{\".")));
str++; str++;
@@ -305,7 +305,7 @@ sparsevec_in(PG_FUNCTION_ARGS)
if (stringEnd == NULL || *stringEnd != '}') if (stringEnd == NULL || *stringEnd != '}')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed sparsevec literal: \"%s\"", lit), errmsg("invalid input syntax for type sparsevec: \"%s\"", lit),
errdetail("Unexpected end of input."))); errdetail("Unexpected end of input.")));
stringEnd++; stringEnd++;
@@ -316,7 +316,7 @@ sparsevec_in(PG_FUNCTION_ARGS)
if (*stringEnd != '/') if (*stringEnd != '/')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed sparsevec literal: \"%s\"", lit), errmsg("invalid input syntax for type sparsevec: \"%s\"", lit),
errdetail("Unexpected end of input."))); errdetail("Unexpected end of input.")));
stringEnd++; stringEnd++;
@@ -341,7 +341,7 @@ sparsevec_in(PG_FUNCTION_ARGS)
if (*stringEnd != '\0') if (*stringEnd != '\0')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed sparsevec literal: \"%s\"", lit), errmsg("invalid input syntax for type sparsevec: \"%s\"", lit),
errdetail("Junk after closing."))); errdetail("Junk after closing.")));
pfree(litcopy); pfree(litcopy);

8
src/vector.c
View File

@@ -193,7 +193,7 @@ vector_in(PG_FUNCTION_ARGS)
if (*str != '[') if (*str != '[')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed vector literal: \"%s\"", lit), errmsg("invalid input syntax for type vector: \"%s\"", lit),
errdetail("Vector contents must start with \"[\"."))); errdetail("Vector contents must start with \"[\".")));
str++; str++;
@@ -254,7 +254,7 @@ vector_in(PG_FUNCTION_ARGS)
if (stringEnd == NULL || *stringEnd != ']') if (stringEnd == NULL || *stringEnd != ']')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed vector literal: \"%s\"", lit), errmsg("invalid input syntax for type vector: \"%s\"", lit),
errdetail("Unexpected end of input."))); errdetail("Unexpected end of input.")));
stringEnd++; stringEnd++;
@@ -266,7 +266,7 @@ vector_in(PG_FUNCTION_ARGS)
if (*stringEnd != '\0') if (*stringEnd != '\0')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed vector literal: \"%s\"", lit), errmsg("invalid input syntax for type vector: \"%s\"", lit),
errdetail("Junk after closing right brace."))); errdetail("Junk after closing right brace.")));
/* Ensure no consecutive delimiters since strtok skips */ /* Ensure no consecutive delimiters since strtok skips */
@@ -275,7 +275,7 @@ vector_in(PG_FUNCTION_ARGS)
if (pt[-1] == ',' && *pt == ',') if (pt[-1] == ',' && *pt == ',')
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("malformed vector literal: \"%s\"", lit))); errmsg("invalid input syntax for type vector: \"%s\"", lit)));
} }
if (dim < 1) if (dim < 1)

16
test/expected/halfvec_input.out
View File

@@ -71,37 +71,37 @@ SELECT '[1e-46,1]'::halfvec;
(1 row) (1 row)
SELECT '[1,2,3'::halfvec; SELECT '[1,2,3'::halfvec;
ERROR: malformed halfvec literal: "[1,2,3" ERROR: invalid input syntax for type halfvec: "[1,2,3"
LINE 1: SELECT '[1,2,3'::halfvec; LINE 1: SELECT '[1,2,3'::halfvec;
^ ^
DETAIL: Unexpected end of input. DETAIL: Unexpected end of input.
SELECT '[1,2,3]9'::halfvec; SELECT '[1,2,3]9'::halfvec;
ERROR: malformed halfvec literal: "[1,2,3]9" ERROR: invalid input syntax for type halfvec: "[1,2,3]9"
LINE 1: SELECT '[1,2,3]9'::halfvec; LINE 1: SELECT '[1,2,3]9'::halfvec;
^ ^
DETAIL: Junk after closing right brace. DETAIL: Junk after closing right brace.
SELECT '1,2,3'::halfvec; SELECT '1,2,3'::halfvec;
ERROR: malformed halfvec literal: "1,2,3" ERROR: invalid input syntax for type halfvec: "1,2,3"
LINE 1: SELECT '1,2,3'::halfvec; LINE 1: SELECT '1,2,3'::halfvec;
^ ^
DETAIL: Vector contents must start with "[". DETAIL: Vector contents must start with "[".
SELECT ''::halfvec; SELECT ''::halfvec;
ERROR: malformed halfvec literal: "" ERROR: invalid input syntax for type halfvec: ""
LINE 1: SELECT ''::halfvec; LINE 1: SELECT ''::halfvec;
^ ^
DETAIL: Vector contents must start with "[". DETAIL: Vector contents must start with "[".
SELECT '['::halfvec; SELECT '['::halfvec;
ERROR: malformed halfvec literal: "[" ERROR: invalid input syntax for type halfvec: "["
LINE 1: SELECT '['::halfvec; LINE 1: SELECT '['::halfvec;
^ ^
DETAIL: Unexpected end of input. DETAIL: Unexpected end of input.
SELECT '[ '::halfvec; SELECT '[ '::halfvec;
ERROR: malformed halfvec literal: "[ " ERROR: invalid input syntax for type halfvec: "[ "
LINE 1: SELECT '[ '::halfvec; LINE 1: SELECT '[ '::halfvec;
^ ^
DETAIL: Unexpected end of input. DETAIL: Unexpected end of input.
SELECT '[,'::halfvec; SELECT '[,'::halfvec;
ERROR: malformed halfvec literal: "[," ERROR: invalid input syntax for type halfvec: "[,"
LINE 1: SELECT '[,'::halfvec; LINE 1: SELECT '[,'::halfvec;
^ ^
DETAIL: Unexpected end of input. DETAIL: Unexpected end of input.
@@ -127,7 +127,7 @@ ERROR: invalid input syntax for type halfvec: "[1a]"
LINE 1: SELECT '[1a]'::halfvec; LINE 1: SELECT '[1a]'::halfvec;
^ ^
SELECT '[1,,3]'::halfvec; SELECT '[1,,3]'::halfvec;
ERROR: malformed halfvec literal: "[1,,3]" ERROR: invalid input syntax for type halfvec: "[1,,3]"
LINE 1: SELECT '[1,,3]'::halfvec; LINE 1: SELECT '[1,,3]'::halfvec;
^ ^
SELECT '[1, ,3]'::halfvec; SELECT '[1, ,3]'::halfvec;

8
test/expected/sparsevec_input.out
View File

@@ -11,12 +11,12 @@ SELECT ' { 1 : 1.5 , 3 : 3.5 } / 5 '::sparsevec;
(1 row) (1 row)
SELECT ''::sparsevec; SELECT ''::sparsevec;
ERROR: malformed sparsevec literal: "" ERROR: invalid input syntax for type sparsevec: ""
LINE 1: SELECT ''::sparsevec; LINE 1: SELECT ''::sparsevec;
^ ^
DETAIL: Vector contents must start with "{". DETAIL: Vector contents must start with "{".
SELECT '{'::sparsevec; SELECT '{'::sparsevec;
ERROR: malformed sparsevec literal: "{" ERROR: invalid input syntax for type sparsevec: "{"
LINE 1: SELECT '{'::sparsevec; LINE 1: SELECT '{'::sparsevec;
^ ^
DETAIL: Unexpected end of input. DETAIL: Unexpected end of input.
@@ -25,7 +25,7 @@ ERROR: invalid input syntax for type sparsevec: "{ "
LINE 1: SELECT '{ '::sparsevec; LINE 1: SELECT '{ '::sparsevec;
^ ^
SELECT '{}'::sparsevec; SELECT '{}'::sparsevec;
ERROR: malformed sparsevec literal: "{}" ERROR: invalid input syntax for type sparsevec: "{}"
LINE 1: SELECT '{}'::sparsevec; LINE 1: SELECT '{}'::sparsevec;
^ ^
DETAIL: Unexpected end of input. DETAIL: Unexpected end of input.
@@ -34,7 +34,7 @@ ERROR: invalid input syntax for type sparsevec: "{}/"
LINE 1: SELECT '{}/'::sparsevec; LINE 1: SELECT '{}/'::sparsevec;
^ ^
SELECT '{}/1a'::sparsevec; SELECT '{}/1a'::sparsevec;
ERROR: malformed sparsevec literal: "{}/1a" ERROR: invalid input syntax for type sparsevec: "{}/1a"
LINE 1: SELECT '{}/1a'::sparsevec; LINE 1: SELECT '{}/1a'::sparsevec;
^ ^
DETAIL: Junk after closing. DETAIL: Junk after closing.

16
test/expected/vector_input.out
View File

@@ -83,37 +83,37 @@ SELECT '[-1e-46,1]'::vector;
(1 row) (1 row)
SELECT '[1,2,3'::vector; SELECT '[1,2,3'::vector;
ERROR: malformed vector literal: "[1,2,3" ERROR: invalid input syntax for type vector: "[1,2,3"
LINE 1: SELECT '[1,2,3'::vector; LINE 1: SELECT '[1,2,3'::vector;
^ ^
DETAIL: Unexpected end of input. DETAIL: Unexpected end of input.
SELECT '[1,2,3]9'::vector; SELECT '[1,2,3]9'::vector;
ERROR: malformed vector literal: "[1,2,3]9" ERROR: invalid input syntax for type vector: "[1,2,3]9"
LINE 1: SELECT '[1,2,3]9'::vector; LINE 1: SELECT '[1,2,3]9'::vector;
^ ^
DETAIL: Junk after closing right brace. DETAIL: Junk after closing right brace.
SELECT '1,2,3'::vector; SELECT '1,2,3'::vector;
ERROR: malformed vector literal: "1,2,3" ERROR: invalid input syntax for type vector: "1,2,3"
LINE 1: SELECT '1,2,3'::vector; LINE 1: SELECT '1,2,3'::vector;
^ ^
DETAIL: Vector contents must start with "[". DETAIL: Vector contents must start with "[".
SELECT ''::vector; SELECT ''::vector;
ERROR: malformed vector literal: "" ERROR: invalid input syntax for type vector: ""
LINE 1: SELECT ''::vector; LINE 1: SELECT ''::vector;
^ ^
DETAIL: Vector contents must start with "[". DETAIL: Vector contents must start with "[".
SELECT '['::vector; SELECT '['::vector;
ERROR: malformed vector literal: "[" ERROR: invalid input syntax for type vector: "["
LINE 1: SELECT '['::vector; LINE 1: SELECT '['::vector;
^ ^
DETAIL: Unexpected end of input. DETAIL: Unexpected end of input.
SELECT '[ '::vector; SELECT '[ '::vector;
ERROR: malformed vector literal: "[ " ERROR: invalid input syntax for type vector: "[ "
LINE 1: SELECT '[ '::vector; LINE 1: SELECT '[ '::vector;
^ ^
DETAIL: Unexpected end of input. DETAIL: Unexpected end of input.
SELECT '[,'::vector; SELECT '[,'::vector;
ERROR: malformed vector literal: "[," ERROR: invalid input syntax for type vector: "[,"
LINE 1: SELECT '[,'::vector; LINE 1: SELECT '[,'::vector;
^ ^
DETAIL: Unexpected end of input. DETAIL: Unexpected end of input.
@@ -139,7 +139,7 @@ ERROR: invalid input syntax for type vector: "[1a]"
LINE 1: SELECT '[1a]'::vector; LINE 1: SELECT '[1a]'::vector;
^ ^
SELECT '[1,,3]'::vector; SELECT '[1,,3]'::vector;
ERROR: malformed vector literal: "[1,,3]" ERROR: invalid input syntax for type vector: "[1,,3]"
LINE 1: SELECT '[1,,3]'::vector; LINE 1: SELECT '[1,,3]'::vector;
^ ^
SELECT '[1, ,3]'::vector; SELECT '[1, ,3]'::vector;