Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7d45e77

Browse files
author
Nikita Glukhov
committed
Add uniquification for binary jsons in JsonbGetDatum()
1 parent031b22c commit7d45e77

File tree

5 files changed

+57
-16
lines changed

5 files changed

+57
-16
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
#definejsonb_set_elementjson_set_element
6969

7070
#defineJsonxContainerOps(&jsontContainerOps)
71+
#defineJsonxGetUniquified(json)(json)
7172
#defineJsonxPGetDatum(json)JsontPGetDatum(json)
7273

7374
#include"postgres.h"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
#definegin_triconsistent_jsonb_pathgin_triconsistent_json_path
2020

2121
#defineJsonxContainerOps(&jsontContainerOps)
22-
#defineJsonxGetDatum(json)JsontGetDatum(json)
22+
#defineJsonxGetUniquified(json)(json)
23+
#defineJsonxPGetDatum(json)JsontGetDatum(json)
2324

2425
#include"utils/json_generic.h"
2526

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
#definejsonb_hash_extendedjson_hash_extended
2525

2626
#defineJsonxContainerOps(&jsontContainerOps)
27-
#defineJsonxGetDatum(json)JsontGetDatum(json)
27+
#defineJsonxGetUniquified(json)(json)
28+
#defineJsonxPGetDatum(json)JsontGetDatum(json)
2829

2930
#include"utils/json_generic.h"
3031

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2196,6 +2196,9 @@ JsonValueUniquify(JsonValue *res, const JsonValue *val)
21962196
{
21972197
check_stack_depth();
21982198

2199+
if (!res)
2200+
res= (JsonValue*)palloc(sizeof(JsonValue));
2201+
21992202
if (val->type==jbvObject&&
22002203
(!val->val.object.valuesUniquified|| !val->val.object.uniquified))
22012204
{
@@ -2249,6 +2252,31 @@ JsonValueUniquify(JsonValue *res, const JsonValue *val)
22492252
returnres;
22502253
}
22512254

2255+
Json*
2256+
JsonUniquify(Json*json)
2257+
{
2258+
if (JsonRoot(json)->ops==&jsontContainerOps)
2259+
{
2260+
JsonValueval;
2261+
Json*res=JsonValueToJson(JsonValueUnpackBinary(JsonToJsonValue(json,&val)));
2262+
res->is_json=json->is_json;
2263+
returnres;
2264+
}
2265+
elseif (JsonRoot(json)->ops==&jsonvContainerOps)
2266+
{
2267+
constJsonValue*val= (constJsonValue*)JsonRoot(json)->data;
2268+
2269+
if (!JsonValueIsUniquified(val))
2270+
{
2271+
Json*res=JsonValueToJson(JsonValueUniquify(NULL,val));
2272+
res->is_json=json->is_json;
2273+
returnres;
2274+
}
2275+
}
2276+
2277+
returnjson;
2278+
}
2279+
22522280
staticvoid
22532281
jsonbInitContainer(JsonContainerData*jc,JsonbContainer*jbc,intlen)
22542282
{

‎src/include/utils/json_generic.h

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,10 @@ typedef struct Json
115115
*/
116116

117117
#undef JsonbPGetDatum
118-
#defineJsonbPGetDatum(json)JsonFlattenToJsonbDatum(json)
119-
120-
#ifndefJsonxPGetDatum
121-
# ifdefJSON_FLATTEN_INTO_TARGET
122-
# defineJsonxPGetDatum(json)JsonbPGetDatum(json)
123-
# else
124-
# defineJsonxPGetDatum(json)JsonGetEOHDatum(json)
125-
# endif
118+
#ifdefJSON_FLATTEN_INTO_TARGET
119+
# defineJsonbPGetDatum(json)JsonFlattenToJsonbDatum(JsonGetUniquified(json))
120+
#else
121+
# defineJsonbPGetDatum(json)JsonGetEOHDatum(JsonGetUniquified(json))
126122
#endif
127123

128124
#ifdefJSON_FLATTEN_INTO_TARGET
@@ -137,7 +133,13 @@ JsontPGetDatum(Json *json)
137133
}
138134
#endif
139135

140-
#defineJsonGetDatum(json)JsonxPGetDatum(json)
136+
#ifdefJsonxPGetDatum
137+
# defineJsonGetDatum(json)JsonxPGetDatum(json)
138+
#elif defined(JsonxGetUniquified)
139+
# defineJsonGetDatum(json)JsonGetEOHDatum(JsonxGetUniquified(json))
140+
#else
141+
# defineJsonGetDatum(json)JsonbPGetDatum(json)
142+
#endif
141143

142144
#undef DatumGetJsonbP
143145
#defineDatumGetJsonbP(datum)DatumGetJson(datum, &jsonbContainerOps, NULL)
@@ -191,14 +193,15 @@ JsontPGetDatum(Json *json)
191193
((jc)->ops != &jsonvContainerOps || \
192194
JsonValueIsUniquified((JsonValue *) jc->data)))
193195

196+
#defineJsonIsUniquified(json)JsonContainerIsUniquified(JsonRoot(json))
197+
194198
#defineJsonValueIsScalar(jsval)IsAJsonbScalar(jsval)
195199

196200
#defineJsonContainerGetType(jc) ((jc)->ops->type)
197201
#defineJsonContainerGetOpsByType(type) \
198202
((type) == JsonContainerJsont ? &jsontContainerOps : \
199203
(type) == JsonContainerJsonb ? &jsonbContainerOps : NULL)
200204

201-
202205
#ifdefJSONB_UTIL_C
203206
#defineJsonbValueToJsonb JsonValueToJsonb
204207
#else
@@ -270,10 +273,15 @@ JsonIteratorNext(JsonIterator **it, JsonValue *val, bool skipNested)
270273
#definecompareJsonbContainersJsonCompareContainers
271274
#defineequalsJsonbScalarValueJsonValueScalarEquals
272275

276+
externJsonContainerOpsjsonbContainerOps;
277+
externJsonContainerOpsjsontContainerOps;
278+
externJsonContainerOpsjsonvContainerOps;
279+
273280
externJson*DatumGetJson(Datumval,JsonContainerOps*ops,Json*tmp);
274281

275282
externvoidJsonFree(Json*json);
276283
externJson*JsonCopyTemporary(Json*tmp);
284+
externJson*JsonUniquify(Json*json);
277285

278286
#defineJsonContainerAlloc() \
279287
((JsonContainerData *) palloc(sizeof(JsonContainerData)))
@@ -315,6 +323,12 @@ JsonGetNonTemporary(Json *json)
315323
returnJsonIsTemporary(json) ?JsonCopyTemporary(json) :json;
316324
}
317325

326+
staticinlineJson*
327+
JsonGetUniquified(Json*json)
328+
{
329+
returnJsonIsUniquified(json) ?json :JsonUniquify(json);
330+
}
331+
318332
staticinlineJsonValue*
319333
JsonValueInitObject(JsonValue*val,intnPairs,intnPairsAllocated,
320334
booluniquified)
@@ -425,8 +439,4 @@ extern int lengthCompareJsonbStringValue(const void *a, const void *b);
425439
externintlengthCompareJsonbString(constchar*val1,intlen1,
426440
constchar*val2,intlen2);
427441

428-
externJsonContainerOpsjsonbContainerOps;
429-
externJsonContainerOpsjsontContainerOps;
430-
externJsonContainerOpsjsonvContainerOps;
431-
432442
#endif/* UTILS_JSON_GENERIC_H */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp