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

Commite3fa4c0

Browse files
author
Nikita Glukhov
committed
Remove old jsonb macros
1 parent960afef commite3fa4c0

File tree

2 files changed

+5
-44
lines changed

2 files changed

+5
-44
lines changed

‎src/include/utils/json_generic.h‎

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -84,33 +84,22 @@ typedef struct Json
8484
#defineJsonFlattenToJsonbDatum(json) \
8585
PointerGetDatum(JsonFlatten(json, JsonbEncode, &jsonbContainerOps))
8686

87-
#undef JsonbPGetDatum
8887
#defineJsonbPGetDatum(json)JsonFlattenToJsonbDatum(json)
8988

90-
#undef DatumGetJsonbP
9189
#defineDatumGetJsonbP(datum)DatumGetJson(datum, &jsonbContainerOps, NULL)
9290
#defineDatumGetJsontP(datum)DatumGetJson(datum, &jsontContainerOps, NULL)
9391

94-
#undef DatumGetJsonbPCopy
9592
#defineDatumGetJsonbPCopy(datum)DatumGetJsonbP(PointerGetDatum(PG_DETOAST_DATUM_COPY(datum)))
9693
#defineDatumGetJsontPCopy(datum)DatumGetJsontP(PointerGetDatum(PG_DETOAST_DATUM_COPY(datum)))
9794

98-
#undef PG_RETURN_JSONB_P
9995
#definePG_RETURN_JSONB_P(x)PG_RETURN_DATUM(JsonbPGetDatum(x))
100-
101-
#undefPG_GETARG_JSONB_P
10296
#definePG_GETARG_JSONB_P(n)DatumGetJson(PG_GETARG_DATUM(n), &jsonbContainerOps, alloca(sizeof(Json)))/* FIXME conditional alloca() */
103-
104-
#definePG_FREE_IF_COPY_JSONB(json,n) JsonFree(json)
105-
106-
#undefPG_GETARG_JSONB_P_COPY
10797
#definePG_GETARG_JSONB_P_COPY(x)DatumGetJsonbPCopy(PG_GETARG_DATUM(x))
10898

99+
#definePG_FREE_IF_COPY_JSONB(json,n) JsonFree(json)
109100

110101
#defineJsonRoot(json)(&(json)->root)
111102
#defineJsonGetSize(json)(JsonRoot(json)->len)
112-
#undef JsonbRoot
113-
#undef JsonbGetSize
114103
#defineJsonbRoot(json)JsonRoot(json)
115104
#defineJsonbGetSize(json)JsonGetSize(json)
116105

@@ -126,24 +115,17 @@ typedef struct Json
126115
#defineJsonbIteratorInit JsonIteratorInit
127116
#defineJsonbIteratorNext JsonIteratorNext
128117

129-
#ifdefJSONB_UTIL_C
130-
#defineJsonbValueToJsonb JsonValueToJsonb
131-
#else
132-
#defineJsonb Json
118+
#defineJsonbValueToJsonb JsonValueToJson
133119

120+
#ifndefJSONB_UTIL_C
121+
#defineJsonb Json
134122
#defineJsonbContainer JsonContainer
123+
#endif
135124

136-
#defineJsonbValueToJsonb JsonValueToJson
137-
138-
#undef JB_ROOT_COUNT
139-
#undef JB_ROOT_IS_SCALAR
140-
#undef JB_ROOT_IS_OBJECT
141-
#undef JB_ROOT_IS_ARRAY
142125
#defineJB_ROOT_COUNT(json)JsonContainerSize(JsonRoot(json))
143126
#defineJB_ROOT_IS_SCALAR(json)JsonContainerIsScalar(JsonRoot(json))
144127
#defineJB_ROOT_IS_OBJECT(json)JsonContainerIsObject(JsonRoot(json))
145128
#defineJB_ROOT_IS_ARRAY(json)JsonContainerIsArray(JsonRoot(json))
146-
#endif
147129

148130
#defineJsonOp(op,jscontainer) \
149131
(*(jscontainer)->ops->op)

‎src/include/utils/jsonb.h‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,6 @@ typedef enum
6868
#defineJGINFLAG_HASHED 0x10/* OR'd into flag if value was hashed */
6969
#defineJGIN_MAXLENGTH125/* max length of text part before hashing */
7070

71-
/* Convenience macros */
72-
#defineDatumGetJsonbP(d)((Jsonb *) PG_DETOAST_DATUM(d))
73-
#defineDatumGetJsonbPCopy(d)((Jsonb *) PG_DETOAST_DATUM_COPY(d))
74-
#defineJsonbPGetDatum(p)PointerGetDatum(p)
75-
#definePG_GETARG_JSONB_P(x)DatumGetJsonbP(PG_GETARG_DATUM(x))
76-
#definePG_GETARG_JSONB_P_COPY(x)DatumGetJsonbPCopy(PG_GETARG_DATUM(x))
77-
#definePG_RETURN_JSONB_P(x)PG_RETURN_DATUM(JsonbPGetDatum(x))
78-
79-
#defineJsonbRoot(jsonb)(&(jsonb)->root)
80-
#defineJsonbGetSize(jsonb)VARSIZE(jsonb)
81-
8271
typedefstructJsonbPairJsonbPair;
8372
typedefstructJsonbValueJsonbValue;
8473

@@ -223,16 +212,6 @@ typedef struct
223212
JsonbContainerroot;
224213
}Jsonb;
225214

226-
#ifdefJSONB_UTIL_C
227-
/* convenience macros for accessing the root container in a Jsonb datum */
228-
#defineJB_HEADER(jbp_)(((JsonbContainer *) VARDATA(jbp_))->header)
229-
#defineJB_ROOT_COUNT(jbp_)(*(uint32 *) VARDATA(jbp_) & JB_CMASK)
230-
#defineJB_ROOT_IS_SCALAR(jbp_) ((*(uint32 *) VARDATA(jbp_) & JB_FSCALAR) != 0)
231-
#defineJB_ROOT_IS_OBJECT(jbp_) ((*(uint32 *) VARDATA(jbp_) & JB_FOBJECT) != 0)
232-
#defineJB_ROOT_IS_ARRAY(jbp_)((*(uint32 *) VARDATA(jbp_) & JB_FARRAY) != 0)
233-
#endif
234-
235-
236215
typedefenumjbvType
237216
{
238217
/* Scalar types */

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp