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

Improve reporting for syntax errors in multi-line JSON data.

Browse Source 
Point to the specific line where the error was detected; the
previous code tended to include several preceding lines as well.
Avoid re-scanning the entire input to recompute which line that
was.  Simplify the logic a bit.  Add test cases.

Simon Riggs and Hamid Akhtar, reviewed by Daniel Gustafsson and myself

Discussion: https://postgr.es/m/CANbhV-EPBnXm3MF_TTWBwwqgn1a1Ghmep9VHfqmNBQ8BT0f+_g@mail.gmail.com
This commit is contained in:
Tom Lane
2021-03-01 16:44:17 -05:00
parent bd69ddfcdb
commit ffd3944ab9
7 changed files with 113 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/backend/utils/adt/jsonfuncs.c
View File

@ -641,30 +641,19 @@ report_json_context(JsonLexContext *lex)
const char *context_start;
const char *context_end;
const char *line_start;
int line_number;
char *ctxt;
int ctxtlen;
const char *prefix;
const char *suffix;
/* Choose boundaries for the part of the input we will display */
context_start = lex->input;
line_start = lex->line_start;
context_start = line_start;
context_end = lex->token_terminator;
line_start = context_start;
line_number = 1;
for (;;)
/* Advance until we are close enough to context_end */
while (context_end - context_start >= 50 && context_start < context_end)
{
/* Always advance over newlines */
if (context_start < context_end && *context_start == '\n')
{
context_start++;
line_start = context_start;
line_number++;
continue;
}
/* Otherwise, done as soon as we are close enough to context_end */
if (context_end - context_start < 50)
break;
/* Advance to next multibyte character */
if (IS_HIGHBIT_SET(*context_start))
context_start += pg_mblen(context_start);
@ -694,7 +683,7 @@ report_json_context(JsonLexContext *lex)
suffix = (lex->token_type != JSON_TOKEN_END && context_end - lex->input < lex->input_length && *context_end != '\n' && *context_end != '\r') ? "..." : "";
return errcontext("JSON data, line %d: %s%s%s",
line_number, prefix, ctxt, suffix);
lex->line_number, prefix, ctxt, suffix);
}