🌐 AI搜索 & 代理 主页
Skip to content

Commit 3f2cec7

Browse files
adunstanadunstan
committed
Fix jsonb replace and delete on scalars and empty structures
These operations now error out if attempted on scalars, and simply return the input if attempted on empty arrays or objects. Along the way we remove the unnecessary cloning of the input when it's known to be unchanged. Regression tests covering these cases are added.
1 parent ae61571 commit 3f2cec7

File tree

4 files changed

+165
-53
lines changed

4 files changed

+165
-53
lines changed

‎src/backend/utils/adt/jsonfuncs.c‎

Lines changed: 35 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -3332,7 +3332,7 @@ jsonb_concat(PG_FUNCTION_ARGS)
33323332
out = JsonbValueToJsonb(res);
33333333
}
33343334

3335-
PG_RETURN_POINTER(out);
3335+
PG_RETURN_JSONB(out);
33363336
}
33373337

33383338

@@ -3349,18 +3349,20 @@ jsonb_delete(PG_FUNCTION_ARGS)
33493349
text *key = PG_GETARG_TEXT_PP(1);
33503350
char *keyptr = VARDATA_ANY(key);
33513351
int keylen = VARSIZE_ANY_EXHDR(key);
3352-
Jsonb *out = palloc(VARSIZE(in));
33533352
JsonbParseState *state = NULL;
33543353
JsonbIterator *it;
33553354
uint32 r;
33563355
JsonbValue v,
33573356
*res = NULL;
33583357
bool skipNested = false;
33593358

3360-
SET_VARSIZE(out, VARSIZE(in));
3359+
if (JB_ROOT_IS_SCALAR(in))
3360+
ereport(ERROR,
3361+
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
3362+
errmsg("cannot delete from scalar")));
33613363

33623364
if (JB_ROOT_COUNT(in) == 0)
3363-
PG_RETURN_POINTER(out);
3365+
PG_RETURN_JSONB(in);
33643366

33653367
it = JsonbIteratorInit(&in->root);
33663368

@@ -3382,13 +3384,9 @@ jsonb_delete(PG_FUNCTION_ARGS)
33823384
res = pushJsonbValue(&state, r, r < WJB_BEGIN_ARRAY ? &v : NULL);
33833385
}
33843386

3385-
if (res == NULL || (res->type == jbvArray && res->val.array.nElems == 0) ||
3386-
(res->type == jbvObject && res->val.object.nPairs == 0))
3387-
SET_VARSIZE(out, VARHDRSZ);
3388-
else
3389-
out = JsonbValueToJsonb(res);
3387+
Assert(res != NULL);
33903388

3391-
PG_RETURN_POINTER(out);
3389+
PG_RETURN_JSONB(JsonbValueToJsonb(res));
33923390
}
33933391

33943392
/*
@@ -3403,7 +3401,6 @@ jsonb_delete_idx(PG_FUNCTION_ARGS)
34033401
{
34043402
Jsonb *in = PG_GETARG_JSONB(0);
34053403
int idx = PG_GETARG_INT32(1);
3406-
Jsonb *out = palloc(VARSIZE(in));
34073404
JsonbParseState *state = NULL;
34083405
JsonbIterator *it;
34093406
uint32 r,
@@ -3412,11 +3409,13 @@ jsonb_delete_idx(PG_FUNCTION_ARGS)
34123409
JsonbValue v,
34133410
*res = NULL;
34143411

3412+
if (JB_ROOT_IS_SCALAR(in))
3413+
ereport(ERROR,
3414+
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
3415+
errmsg("cannot delete from scalar")));
3416+
34153417
if (JB_ROOT_COUNT(in) == 0)
3416-
{
3417-
memcpy(out, in, VARSIZE(in));
3418-
PG_RETURN_POINTER(out);
3419-
}
3418+
PG_RETURN_JSONB(in);
34203419

34213420
it = JsonbIteratorInit(&in->root);
34223421

@@ -3435,10 +3434,7 @@ jsonb_delete_idx(PG_FUNCTION_ARGS)
34353434
}
34363435

34373436
if (idx >= n)
3438-
{
3439-
memcpy(out, in, VARSIZE(in));
3440-
PG_RETURN_POINTER(out);
3441-
}
3437+
PG_RETURN_JSONB(in);
34423438

34433439
pushJsonbValue(&state, r, r < WJB_BEGIN_ARRAY ? &v : NULL);
34443440

@@ -3457,13 +3453,9 @@ jsonb_delete_idx(PG_FUNCTION_ARGS)
34573453
res = pushJsonbValue(&state, r, r < WJB_BEGIN_ARRAY ? &v : NULL);
34583454
}
34593455

3460-
if (res == NULL || (res->type == jbvArray && res->val.array.nElems == 0) ||
3461-
(res->type == jbvObject && res->val.object.nPairs == 0))
3462-
SET_VARSIZE(out, VARHDRSZ);
3463-
else
3464-
out = JsonbValueToJsonb(res);
3456+
Assert (res != NULL);
34653457

3466-
PG_RETURN_POINTER(out);
3458+
PG_RETURN_JSONB(JsonbValueToJsonb(res));
34673459
}
34683460

34693461
/*
@@ -3475,7 +3467,6 @@ jsonb_replace(PG_FUNCTION_ARGS)
34753467
Jsonb *in = PG_GETARG_JSONB(0);
34763468
ArrayType *path = PG_GETARG_ARRAYTYPE_P(1);
34773469
Jsonb *newval = PG_GETARG_JSONB(2);
3478-
Jsonb *out = palloc(VARSIZE(in) + VARSIZE(newval));
34793470
JsonbValue *res = NULL;
34803471
Datum *path_elems;
34813472
bool *path_nulls;
@@ -3488,31 +3479,27 @@ jsonb_replace(PG_FUNCTION_ARGS)
34883479
(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
34893480
errmsg("wrong number of array subscripts")));
34903481

3482+
if (JB_ROOT_IS_SCALAR(in))
3483+
ereport(ERROR,
3484+
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
3485+
errmsg("cannot replace path in scalar")));
3486+
34913487
if (JB_ROOT_COUNT(in) == 0)
3492-
{
3493-
memcpy(out, in, VARSIZE(in));
3494-
PG_RETURN_POINTER(out);
3495-
}
3488+
PG_RETURN_JSONB(in);
34963489

34973490
deconstruct_array(path, TEXTOID, -1, false, 'i',
34983491
&path_elems, &path_nulls, &path_len);
34993492

35003493
if (path_len == 0)
3501-
{
3502-
memcpy(out, in, VARSIZE(in));
3503-
PG_RETURN_POINTER(out);
3504-
}
3494+
PG_RETURN_JSONB(in);
35053495

35063496
it = JsonbIteratorInit(&in->root);
35073497

35083498
res = replacePath(&it, path_elems, path_nulls, path_len, &st, 0, newval);
35093499

3510-
if (res == NULL)
3511-
SET_VARSIZE(out, VARHDRSZ);
3512-
else
3513-
out = JsonbValueToJsonb(res);
3500+
Assert (res != NULL);
35143501

3515-
PG_RETURN_POINTER(out);
3502+
PG_RETURN_JSONB(JsonbValueToJsonb(res));
35163503
}
35173504

35183505

@@ -3524,7 +3511,6 @@ jsonb_delete_path(PG_FUNCTION_ARGS)
35243511
{
35253512
Jsonb *in = PG_GETARG_JSONB(0);
35263513
ArrayType *path = PG_GETARG_ARRAYTYPE_P(1);
3527-
Jsonb *out = palloc(VARSIZE(in));
35283514
JsonbValue *res = NULL;
35293515
Datum *path_elems;
35303516
bool *path_nulls;
@@ -3537,31 +3523,27 @@ jsonb_delete_path(PG_FUNCTION_ARGS)
35373523
(errcode(ERRCODE_ARRAY_SUBSCRIPT_ERROR),
35383524
errmsg("wrong number of array subscripts")));
35393525

3526+
if (JB_ROOT_IS_SCALAR(in))
3527+
ereport(ERROR,
3528+
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
3529+
errmsg("cannot delete path in scalar")));
3530+
35403531
if (JB_ROOT_COUNT(in) == 0)
3541-
{
3542-
memcpy(out, in, VARSIZE(in));
3543-
PG_RETURN_POINTER(out);
3544-
}
3532+
PG_RETURN_JSONB(in);
35453533

35463534
deconstruct_array(path, TEXTOID, -1, false, 'i',
35473535
&path_elems, &path_nulls, &path_len);
35483536

35493537
if (path_len == 0)
3550-
{
3551-
memcpy(out, in, VARSIZE(in));
3552-
PG_RETURN_POINTER(out);
3553-
}
3538+
PG_RETURN_JSONB(in);
35543539

35553540
it = JsonbIteratorInit(&in->root);
35563541

35573542
res = replacePath(&it, path_elems, path_nulls, path_len, &st, 0, NULL);
35583543

3559-
if (res == NULL)
3560-
SET_VARSIZE(out, VARHDRSZ);
3561-
else
3562-
out = JsonbValueToJsonb(res);
3544+
Assert (res != NULL);
35633545

3564-
PG_RETURN_POINTER(out);
3546+
PG_RETURN_JSONB(JsonbValueToJsonb(res));
35653547
}
35663548

35673549

‎src/test/regress/expected/jsonb.out‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3175,3 +3175,60 @@ select '{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb - '{d
31753175
{"a": 1, "b": [1, 2], "c": {"1": 2}, "d": {"1": [3]}, "n": null}
31763176
(1 row)
31773177

3178+
-- empty structure and error conditions for delete and replace
3179+
select '"a"'::jsonb - 'a'; -- error
3180+
ERROR: cannot delete from scalar
3181+
select '{}'::jsonb - 'a';
3182+
?column?
3183+
----------
3184+
{}
3185+
(1 row)
3186+
3187+
select '[]'::jsonb - 'a';
3188+
?column?
3189+
----------
3190+
[]
3191+
(1 row)
3192+
3193+
select '"a"'::jsonb - 1; -- error
3194+
ERROR: cannot delete from scalar
3195+
select '{}'::jsonb - 1 ;
3196+
?column?
3197+
----------
3198+
{}
3199+
(1 row)
3200+
3201+
select '[]'::jsonb - 1;
3202+
?column?
3203+
----------
3204+
[]
3205+
(1 row)
3206+
3207+
select '"a"'::jsonb - '{a}'::text[]; -- error
3208+
ERROR: cannot delete path in scalar
3209+
select '{}'::jsonb - '{a}'::text[];
3210+
?column?
3211+
----------
3212+
{}
3213+
(1 row)
3214+
3215+
select '[]'::jsonb - '{a}'::text[];
3216+
?column?
3217+
----------
3218+
[]
3219+
(1 row)
3220+
3221+
select jsonb_replace('"a"','{a}','"b"'); --error
3222+
ERROR: cannot replace path in scalar
3223+
select jsonb_replace('{}','{a}','"b"');
3224+
jsonb_replace
3225+
---------------
3226+
{}
3227+
(1 row)
3228+
3229+
select jsonb_replace('[]','{1}','"b"');
3230+
jsonb_replace
3231+
---------------
3232+
[]
3233+
(1 row)
3234+

‎src/test/regress/expected/jsonb_1.out‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3175,3 +3175,60 @@ select '{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb - '{d
31753175
{"a": 1, "b": [1, 2], "c": {"1": 2}, "d": {"1": [3]}, "n": null}
31763176
(1 row)
31773177

3178+
-- empty structure and error conditions for delete and replace
3179+
select '"a"'::jsonb - 'a'; -- error
3180+
ERROR: cannot delete from scalar
3181+
select '{}'::jsonb - 'a';
3182+
?column?
3183+
----------
3184+
{}
3185+
(1 row)
3186+
3187+
select '[]'::jsonb - 'a';
3188+
?column?
3189+
----------
3190+
[]
3191+
(1 row)
3192+
3193+
select '"a"'::jsonb - 1; -- error
3194+
ERROR: cannot delete from scalar
3195+
select '{}'::jsonb - 1 ;
3196+
?column?
3197+
----------
3198+
{}
3199+
(1 row)
3200+
3201+
select '[]'::jsonb - 1;
3202+
?column?
3203+
----------
3204+
[]
3205+
(1 row)
3206+
3207+
select '"a"'::jsonb - '{a}'::text[]; -- error
3208+
ERROR: cannot delete path in scalar
3209+
select '{}'::jsonb - '{a}'::text[];
3210+
?column?
3211+
----------
3212+
{}
3213+
(1 row)
3214+
3215+
select '[]'::jsonb - '{a}'::text[];
3216+
?column?
3217+
----------
3218+
[]
3219+
(1 row)
3220+
3221+
select jsonb_replace('"a"','{a}','"b"'); --error
3222+
ERROR: cannot replace path in scalar
3223+
select jsonb_replace('{}','{a}','"b"');
3224+
jsonb_replace
3225+
---------------
3226+
{}
3227+
(1 row)
3228+
3229+
select jsonb_replace('[]','{1}','"b"');
3230+
jsonb_replace
3231+
---------------
3232+
[]
3233+
(1 row)
3234+

‎src/test/regress/sql/jsonb.sql‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,3 +767,19 @@ select jsonb_delete('{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'
767767
select '{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb - '{n}'::text[];
768768
select '{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb - '{b,-1}'::text[];
769769
select '{"n":null, "a":1, "b":[1,2], "c":{"1":2}, "d":{"1":[2,3]}}'::jsonb - '{d,1,0}'::text[];
770+
771+
772+
-- empty structure and error conditions for delete and replace
773+
774+
select '"a"'::jsonb - 'a'; -- error
775+
select '{}'::jsonb - 'a';
776+
select '[]'::jsonb - 'a';
777+
select '"a"'::jsonb - 1; -- error
778+
select '{}'::jsonb - 1 ;
779+
select '[]'::jsonb - 1;
780+
select '"a"'::jsonb - '{a}'::text[]; -- error
781+
select '{}'::jsonb - '{a}'::text[];
782+
select '[]'::jsonb - '{a}'::text[];
783+
select jsonb_replace('"a"','{a}','"b"'); --error
784+
select jsonb_replace('{}','{a}','"b"');
785+
select jsonb_replace('[]','{1}','"b"');

0 commit comments

Comments
 (0)