NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit89a0b1a

committed

Forbid numeric NaN in jsonpath

SQL standard doesn't define numeric Inf or NaN values. It appears even moreridiculous to support then in jsonpath assuming JSON doesn't support thesevalues as well. This commit forbids returning NaN from .double(), which waspreviously allowed. NaN can't be result of inner-jsonpath computation overnon-NaNs. So, we can not expect NaN in the jsonpath output.Reported-by: Tom LaneDiscussion:https://postgr.es/m/203949.1591879542%40sss.pgh.pa.usAuthor: Alexander KorotkovReviewed-by: Tom LaneBackpatch-through: 12

1 parentb9a04a9 commit89a0b1aCopy full SHA for 89a0b1a

File tree

3 files changed

+10

-25

lines changed

src
- backend/utils/adt
  - jsonb_util.c
  - jsonpath_exec.c
- test/regress/expected
  - jsonb_jsonpath.out

3 files changed

+10

-25

lines changed

`‎src/backend/utils/adt/jsonb_util.c`

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1773,14 +1773,6 @@ convertJsonbScalar(StringInfo buffer, JEntry jentry, JsonbValue scalarVal)`
`1773`	`1773`	`break;`
`1774`	`1774`
`1775`	`1775`	`casejbvNumeric:`
`1776`		`-/* replace numeric NaN with string "NaN" */`
`1777`		`-if (numeric_is_nan(scalarVal->val.numeric))`
`1778`		`-{`
`1779`		`-appendToBuffer(buffer,"NaN",3);`
`1780`		`-*jentry=3;`
`1781`		`-break;`
`1782`		`-}`
`1783`		`-`
`1784`	`1776`	`numlen=VARSIZE_ANY(scalarVal->val.numeric);`
`1785`	`1777`	`padlen=padBufferToInt(buffer);`
`1786`	`1778`

`‎src/backend/utils/adt/jsonpath_exec.c`

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1044,15 +1044,16 @@ executeItemOptUnwrapTarget(JsonPathExecContext cxt, JsonPathItem jsp,`
`1044`	`1044`	`{`
`1045`	`1045`	`char*tmp=DatumGetCString(DirectFunctionCall1(numeric_out,`
`1046`	`1046`	`NumericGetDatum(jb->val.numeric)));`
	`1047`	`+doubleval;`
`1047`	`1048`	`boolhave_error= false;`
`1048`	`1049`
`1049`		`-(void)float8in_internal_opt_error(tmp,`
`1050`		`-NULL,`
`1051`		`-"double precision",`
`1052`		`-tmp,`
`1053`		`-&have_error);`
	`1050`	`+val=float8in_internal_opt_error(tmp,`
	`1051`	`+NULL,`
	`1052`	`+"double precision",`
	`1053`	`+tmp,`
	`1054`	`+&have_error);`
`1054`	`1055`
`1055`		`-if (have_error)`
	`1056`	`+if (have_error\|\|isinf(val)\|\|isnan(val))`
`1056`	`1057`	`RETURN_ERROR(ereport(ERROR,`
`1057`	`1058`	`(errcode(ERRCODE_NON_NUMERIC_SQL_JSON_ITEM),`
`1058`	`1059`	`errmsg("numeric argument of jsonpath item method .%s() is out of range for type double precision",`
`@@ -1073,7 +1074,7 @@ executeItemOptUnwrapTarget(JsonPathExecContext cxt, JsonPathItem jsp,`
`1073`	`1074`	`tmp,`
`1074`	`1075`	`&have_error);`
`1075`	`1076`
`1076`		`-if (have_error\|\|isinf(val))`
	`1077`	`+if (have_error\|\|isinf(val)\|\|isnan(val))`
`1077`	`1078`	`RETURN_ERROR(ereport(ERROR,`
`1078`	`1079`	`(errcode(ERRCODE_NON_NUMERIC_SQL_JSON_ITEM),`
`1079`	`1080`	`errmsg("string argument of jsonpath item method .%s() is not a valid representation of a double precision number",`

`‎src/test/regress/expected/jsonb_jsonpath.out`

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1500,17 +1500,9 @@ ERROR: string argument of jsonpath item method .double() is not a valid represe`
`1500`	`1500`	`select jsonb_path_query('1e1000', '$.double()');`
`1501`	`1501`	`ERROR: numeric argument of jsonpath item method .double() is out of range for type double precision`
`1502`	`1502`	`select jsonb_path_query('"nan"', '$.double()');`
`1503`		`- jsonb_path_query`
`1504`		`-------------------`
`1505`		`- "NaN"`
`1506`		`-(1 row)`
`1507`		`-`
	`1503`	`+ERROR: string argument of jsonpath item method .double() is not a valid representation of a double precision number`
`1508`	`1504`	`select jsonb_path_query('"NaN"', '$.double()');`
`1509`		`- jsonb_path_query`
`1510`		`-------------------`
`1511`		`- "NaN"`
`1512`		`-(1 row)`
`1513`		`-`
	`1505`	`+ERROR: string argument of jsonpath item method .double() is not a valid representation of a double precision number`
`1514`	`1506`	`select jsonb_path_query('"inf"', '$.double()');`
`1515`	`1507`	`ERROR: string argument of jsonpath item method .double() is not a valid representation of a double precision number`
`1516`	`1508`	`select jsonb_path_query('"-inf"', '$.double()');`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit89a0b1a

File tree

3 files changed

3 files changed

`‎src/backend/utils/adt/jsonb_util.c`

`‎src/backend/utils/adt/jsonpath_exec.c`

`‎src/test/regress/expected/jsonb_jsonpath.out`

0 commit comments