Refactor jsonb.h, remove redefines

Author: Nikita Glukhov

src/backend/utils/adt/json_generic.c

@@ -12,7 +12,7 @@
 
 #include "miscadmin.h"
 #include "utils/builtins.h"
-#include "utils/json_generic.h"
+#include "utils/jsonb.h"
 #include "utils/memutils.h"
 
 static Json *JsonExpand(Json *tmp, Datum value, bool freeValue,

src/backend/utils/adt/jsonb.c

@@ -25,7 +25,6 @@
 #include "utils/datetime.h"
 #include "utils/json.h"
 #include "utils/jsonb.h"
-#include "utils/json_generic.h"
 #include "utils/jsonfuncs.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"

src/backend/utils/adt/jsonb_gin.c

@@ -68,7 +68,6 @@
 #include "utils/builtins.h"
 #include "utils/jsonb.h"
 #include "utils/jsonpath.h"
-#include "utils/json_generic.h"
 #include "utils/varlena.h"
 
 typedef struct PathHashStack

src/backend/utils/adt/jsonb_op.c

@@ -17,7 +17,6 @@
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/jsonb.h"
-#include "utils/json_generic.h"
 
 Datum
 jsonb_exists(PG_FUNCTION_ARGS)

src/backend/utils/adt/jsonb_util.c

@@ -13,8 +13,6 @@
  */
 #include "postgres.h"
 
-#define JSONB_UTIL_C
-
 #include "catalog/pg_collation.h"
 #include "catalog/pg_type.h"
 #include "common/hashfn.h"
@@ -25,21 +23,21 @@
 #include "utils/datetime.h"
 #include "utils/json.h"
 #include "utils/jsonb.h"
-#include "utils/json_generic.h"
+#include "utils/jsonb_internals.h"
 #include "utils/memutils.h"
 #include "utils/varlena.h"
 
 /*
  * Maximum number of elements in an array (or key/value pairs in an object).
  * This is limited by two things: the size of the JEntry array must fit
  * in MaxAllocSize, and the number of elements (or pairs) must fit in the bits
- * reserved for that in the JsonbContainer.header field.
+ * reserved for that in the JsonbContainerHeader.header field.
  *
  * (The total size of an array's or object's elements is also limited by
  * JENTRY_OFFLENMASK, but we're not concerned about that here.)
  */
-#define JSONB_MAX_ELEMS (Min(MaxAllocSize / sizeof(JsonbValue), JB_CMASK))
-#define JSONB_MAX_PAIRS (Min(MaxAllocSize / sizeof(JsonbPair), JB_CMASK))
+#define JSONB_MAX_ELEMS (Min(MaxAllocSize / sizeof(JsonbValue), JBC_CMASK))
+#define JSONB_MAX_PAIRS (Min(MaxAllocSize / sizeof(JsonbPair), JBC_CMASK))
 
 /* Conversion state used when parsing Jsonb from text, or for type coercion */
 struct JsonbParseState
@@ -56,7 +54,7 @@ typedef struct jsonbIterator
 	JsonIterator	ji;
 
 	/* Container being iterated */
-	const JsonbContainer *container;
+	const JsonbContainerHeader *container;
 
 	uint32		nElems;			/* Number of elements in children array (will
 								 * be nPairs for objects) */
@@ -82,7 +80,7 @@ typedef struct jsonbIterator
 	JsonbIterState state;
 } jsonbIterator;
 
-static void fillJsonbValue(const JsonbContainer *container, int index,
+static void fillJsonbValue(const JsonbContainerHeader *container, int index,
 						   char *base_addr, uint32 offset,
 						   JsonbValue *result);
 static int	compareJsonbScalarValue(const JsonbValue *a, const JsonbValue *b);
@@ -107,7 +105,7 @@ static void uniqueifyJsonbObject(JsonbValue *object, bool unique_keys,
 static JsonbValue *pushSingleScalarJsonbValue(JsonbParseState **pstate,
 											  const JsonbValue *jbval,
 											  bool unpackBinary);
-static void jsonbInitContainer(JsonContainerData *jc, JsonbContainer *jbc, int len);
+static void jsonbInitContainer(JsonContainerData *jc, JsonbContainerHeader *jbc, int len);
 
 JsonValue *
 JsonValueUnpackBinary(const JsonValue *jbv)
@@ -183,7 +181,7 @@ JsonValueFlatten(const JsonValue *val, JsonValueEncoder encoder,
  * by index within the container's JEntry array.
  */
 static uint32
-getJsonbOffset(const JsonbContainer *jc, int index)
+getJsonbOffset(const JsonbContainerHeader *jc, int index)
 {
 	uint32		offset = 0;
 	int			i;
@@ -208,7 +206,7 @@ getJsonbOffset(const JsonbContainer *jc, int index)
  * The node is identified by index within the container's JEntry array.
  */
 static uint32
-getJsonbLength(const JsonbContainer *jc, int index)
+getJsonbLength(const JsonbContainerHeader *jc, int index)
 {
 	uint32		off;
 	uint32		len;
@@ -379,19 +377,19 @@ compareJsonbContainers(JsonContainer *a, JsonContainer *b)
 
 typedef struct JsonbArrayIterator
 {
-	const JsonbContainer *container;
+	const JsonbContainerHeader *container;
 	char			   *base_addr;
 	int					index;
 	int					count;
 	uint32				offset;
 } JsonbArrayIterator;
 
 static void
-JsonbArrayIteratorInit(JsonbArrayIterator *it, const JsonbContainer *container)
+JsonbArrayIteratorInit(JsonbArrayIterator *it, const JsonbContainerHeader *container)
 {
 	it->container = container;
 	it->index = 0;
-	it->count = (container->header & JB_CMASK);
+	it->count = (container->header & JBC_CMASK);
 	it->offset = 0;
 	it->base_addr = (char *) (container->children + it->count);
 }
@@ -431,7 +429,7 @@ JsonbArrayIteratorGetIth(JsonbArrayIterator *it, uint32 i)
 static JsonbValue *
 jsonbFindValueInArray(JsonContainer *jsc, const JsonbValue *key)
 {
-	const JsonbContainer *container = jsc->data;
+	const JsonbContainerHeader *container = jsc->data;
 	JsonbArrayIterator	it;
 	JsonbValue		   *result = palloc(sizeof(JsonbValue));
 
@@ -510,7 +508,7 @@ static JsonbValue *
 jsonbFindKeyInObject(JsonContainer *jsc, const char *keyVal, int keyLen,
 					 JsonValue *res)
 {
-	const JsonbContainer *container = jsc->data;
+	const JsonbContainerHeader *container = jsc->data;
 	const JEntry *children = container->children;
 	int			count = JsonContainerSize(jsc);
 	char	   *baseAddr;
@@ -603,7 +601,7 @@ jsonbGetArrayElement(JsonContainer *jsc, uint32 i)
  * expanded.
  */
 static void
-fillJsonbValue(const JsonbContainer *container, int index,
+fillJsonbValue(const JsonbContainerHeader *container, int index,
 			   char *base_addr, uint32 offset,
 			   JsonbValue *result)
 {
@@ -642,7 +640,7 @@ fillJsonbValue(const JsonbContainer *container, int index,
 		result->val.binary.data = JsonContainerAlloc();
 		jsonbInitContainer((JsonContainerData *) result->val.binary.data,
 				/* Remove alignment padding from data pointer and length */
-						   (JsonbContainer *)(base_addr + INTALIGN(offset)),
+						   (JsonbContainerHeader *)(base_addr + INTALIGN(offset)),
 						   getJsonbLength(container, index) -
 								(INTALIGN(offset) - offset));
 	}
@@ -1193,40 +1191,40 @@ iteratorFromContainer(JsonContainer *container, jsonbIterator *parent)
 }
 
 /*
- * Given a JsonbContainer, expand to jsonbIterator to iterate over items
+ * Given a JsonContainer, expand to jsonbIterator to iterate over items
  * fully expanded to in-memory representation for manipulation.
  *
  * See jsonbIteratorNext() for notes on memory management.
  */
 static JsonIterator *
 jsonbIteratorInit(JsonContainer *cont)
 {
-	const JsonbContainer *container = cont->data;
+	const JsonbContainerHeader *container = cont->data;
 	jsonbIterator *it;
 
 	it = palloc0(sizeof(jsonbIterator));
 	it->ji.container = cont;
 	it->ji.parent = NULL;
 	it->ji.next = jsonbIteratorNext;
 	it->container = container;
-	it->nElems = container->header & JB_CMASK;
+	it->nElems = container->header & JBC_CMASK;
 
 	/* Array starts just after header */
 	it->children = container->children;
 
-	switch (container->header & (JB_FARRAY | JB_FOBJECT))
+	switch (container->header & (JBC_FARRAY | JBC_FOBJECT))
 	{
-		case JB_FARRAY:
+		case JBC_FARRAY:
 			it->dataProper =
 				(char *) it->children + it->nElems * sizeof(JEntry);
-			it->isScalar = (container->header & JB_FSCALAR) != 0;
+			it->isScalar = (container->header & JBC_FSCALAR) != 0;
 			/* This is either a "raw scalar", or an array */
 			Assert(!it->isScalar || it->nElems == 1);
 
 			it->state = JBI_ARRAY_START;
 			break;
 
-		case JB_FOBJECT:
+		case JBC_FOBJECT:
 			it->dataProper =
 				(char *) it->children + it->nElems * sizeof(JEntry) * 2;
 			it->state = JBI_OBJECT_START;
@@ -1816,12 +1814,12 @@ convertJsonbArray(StringInfo buffer, JEntry *pheader, const JsonbValue *val, int
 	 * Construct the header Jentry and store it in the beginning of the
 	 * variable-length payload.
 	 */
-	header = nElems | JB_FARRAY;
+	header = nElems | JBC_FARRAY;
 	if (val->val.array.rawScalar)
 	{
 		Assert(nElems == 1);
 		Assert(level == 0);
-		header |= JB_FSCALAR;
+		header |= JBC_FSCALAR;
 	}
 
 	appendToBuffer(buffer, (char *) &header, sizeof(uint32));
@@ -1902,7 +1900,7 @@ convertJsonbObject(StringInfo buffer, JEntry *pheader, const JsonbValue *val, in
 	 * Construct the header Jentry and store it in the beginning of the
 	 * variable-length payload.
 	 */
-	header = nPairs | JB_FOBJECT;
+	header = nPairs | JBC_FOBJECT;
 	appendToBuffer(buffer, (char *) &header, sizeof(uint32));
 
 	/* Reserve space for the JEntries of the keys and values. */
@@ -2205,21 +2203,21 @@ uniqueifyJsonbObject(JsonbValue *object, bool unique_keys, bool skip_nulls)
 
 
 static void
-jsonbInitContainer(JsonContainerData *jc, JsonbContainer *jbc, int len)
+jsonbInitContainer(JsonContainerData *jc, JsonbContainerHeader *jbc, int len)
 {
 	jc->ops = &jsonbContainerOps;
 	jc->data = jbc;
 	jc->len = len;
-	jc->size = jbc->header & JB_CMASK;
-	jc->type = jbc->header & JB_FOBJECT ? jbvObject :
-			   jbc->header & JB_FSCALAR ? jbvArray | jbvScalar :
-										  jbvArray;
+	jc->size = jbc->header & JBC_CMASK;
+	jc->type = jbc->header & JBC_FOBJECT ? jbvObject :
+			   jbc->header & JBC_FSCALAR ? jbvArray | jbvScalar :
+										   jbvArray;
 }
 
 static void
 jsonbInit(JsonContainerData *jc, Datum value)
 {
-	Jsonb  *jb = (Jsonb *) DatumGetPointer(value);
+	JsonbDatum *jb = (JsonbDatum *) DatumGetPointer(value);
 	jsonbInitContainer(jc, &jb->root, VARSIZE_ANY_EXHDR(jb));
 }
 

src/backend/utils/adt/jsonbsubs.c

@@ -21,7 +21,6 @@
 #include "parser/parse_coerce.h"
 #include "parser/parse_expr.h"
 #include "utils/jsonb.h"
-#include "utils/json_generic.h"
 #include "utils/jsonfuncs.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"

src/backend/utils/adt/jsonfuncs.c

@@ -31,7 +31,6 @@
 #include "utils/hsearch.h"
 #include "utils/json.h"
 #include "utils/jsonb.h"
-#include "utils/json_generic.h"
 #include "utils/jsonfuncs.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
@@ -3171,7 +3170,6 @@ json_populate_type(Datum json_val, Oid json_type, Oid typid, int32 typmod,
 		/* fill binary jsonb value pointing to jb */
 		jbv.type = jbvBinary;
 		jbv.val.binary.data = &jsonb->root;
-		jbv.val.binary.len = VARSIZE(jsonb) - VARHDRSZ;
 	}
 
 	if (!*cache)

src/include/utils/json_generic.h

@@ -13,8 +13,6 @@
 #ifndef UTILS_JSON_GENERIC_H
 #define UTILS_JSON_GENERIC_H
 
-#define JSON_GENERIC
-
 #include "postgres.h"
 #include "lib/stringinfo.h"
 #include "utils/jsonb.h"
@@ -79,6 +77,10 @@ typedef struct Json
 	bool		is_json;		/* json or jsonb */
 } Json;
 
+typedef Json Jsonb;
+typedef JsonContainer JsonbContainer;
+
+
 #define JsonIsTemporary(json)		((json)->obj.isTemporary)
 
 #define JsonFlattenToJsonbDatum(json) \
@@ -117,11 +119,6 @@ typedef struct Json
 
 #define JsonbValueToJsonb JsonValueToJson
 
-#ifndef JSONB_UTIL_C
-#define Jsonb Json
-#define JsonbContainer JsonContainer
-#endif
-
 #define JB_ROOT_COUNT(json)		JsonContainerSize(JsonRoot(json))
 #define JB_ROOT_IS_SCALAR(json)	JsonContainerIsScalar(JsonRoot(json))
 #define JB_ROOT_IS_OBJECT(json)	JsonContainerIsObject(JsonRoot(json))