Add JsonValueCopy(), JsonCopy()

Nikita Glukhov · Nikita Glukhov · commit 63ba0baeaffc · 2017-05-02T21:38:30.000+03:00
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
@@ -3033,4 +3033,5 @@ jsontContainerOps =
 	jsonGetArrayElement,
 	jsontGetArraySize,
 	jsontToString,
+	JsonCopyFlat,
 };
diff --git a/src/backend/utils/adt/json_generic.c b/src/backend/utils/adt/json_generic.c
@@ -8,6 +8,8 @@
  *
  */
 
+#include "postgres.h"
+#include "miscadmin.h"
 #include "access/compression.h"
 #include "utils/builtins.h"
 #include "utils/json_generic.h"
@@ -19,15 +21,88 @@ static Json *JsonExpand(Json *tmp, Datum value, bool freeValue,
 
 JsonContainerOps jsonvContainerOps;
 
-#if 0
-static JsonValue *
-JsonValueCopy(JsonValue *val)
+JsonValue *
+JsonValueCopy(JsonValue *res, const JsonValue *val)
 {
-	JsonValue *copy = palloc(sizeof(JsonValue));
-	memcpy(copy, val, sizeof(JsonValue));
-	return copy;
+	check_stack_depth();
+
+	if (!res)
+		res = (JsonValue *) palloc(sizeof(JsonValue));
+
+	res->type = val->type;
+
+	switch (val->type)
+	{
+		case jbvNull:
+			break;
+
+		case jbvBool:
+			res->val.boolean = val->val.boolean;
+			break;
+
+		case jbvString:
+		{	/* copy string values in the current context */
+			char *buf = palloc(val->val.string.len + 1);
+			memcpy(buf, val->val.string.val, val->val.string.len);
+			buf[val->val.string.len] = 0;
+			res->val.string.val = buf;
+			res->val.string.len = val->val.string.len;
+			break;
+		}
+
+		case jbvNumeric:
+			/* same for numeric */
+			res->val.numeric =
+					DatumGetNumeric(DirectFunctionCall1(numeric_uplus,
+											NumericGetDatum(val->val.numeric)));
+			break;
+
+		case jbvArray:
+		{
+			int i;
+
+			res->val.array = val->val.array;
+			res->val.array.elems = (JsonValue *)
+							palloc(sizeof(JsonValue) * val->val.array.nElems);
+
+			for (i = 0; i < val->val.array.nElems; i++)
+				JsonValueCopy(&res->val.array.elems[i],
+							  &val->val.array.elems[i]);
+
+			break;
+		}
+
+		case jbvObject:
+		{
+			int i;
+
+			res->val.object = val->val.object;
+			res->val.object.pairs = (JsonPair *)
+							palloc(sizeof(JsonPair) * val->val.object.nPairs);
+
+			for (i = 0; i < val->val.object.nPairs; i++)
+			{
+				res->val.object.pairs[i].order = val->val.object.pairs[i].order;
+				JsonValueCopy(&res->val.object.pairs[i].key,
+							  &val->val.object.pairs[i].key);
+				JsonValueCopy(&res->val.object.pairs[i].value,
+							  &val->val.object.pairs[i].value);
+			}
+
+			break;
+		}
+
+		case jbvBinary:
+			res->val.binary = val->val.binary;
+			res->val.binary.data = JsonCopy(val->val.binary.data);
+			break;
+
+		default:
+			elog(ERROR, "unknown json value type %d", val->type);
+	}
+
+	return res;
 }
-#endif
 
 static inline JsonValue *
 jsonFindKeyInObjectInternal(JsonContainer *obj, const JsonValue *key, bool last)
@@ -550,6 +625,17 @@ jsonvGetArraySize(JsonContainer *arrc)
 	}
 }
 
+static JsonContainer *
+jsonvCopy(JsonContainer *jc)
+{
+	JsonContainerData *res = JsonContainerAlloc();
+
+	*res = *jc;
+	res->data = JsonValueCopy(NULL, (JsonValue *) jc->data);
+
+	return res;
+}
+
 JsonContainerOps
 jsonvContainerOps =
 {
@@ -562,6 +648,7 @@ jsonvContainerOps =
 	jsonvGetArrayElement,
 	jsonvGetArraySize,
 	JsonbToCStringRaw,
+	jsonvCopy,
 };
 
 JsonValue *
@@ -1031,6 +1118,21 @@ JsonValueToJson(JsonValue *val)
 	}
 }
 
+JsonContainer *
+JsonCopyFlat(JsonContainer *jc)
+{
+	JsonContainerData *res = JsonContainerAlloc();
+
+	*res = *jc;
+	res->data = palloc(jc->len);
+	memcpy(res->data, jc->data, jc->len);
+
+	if (jc->ops->compressionOps && jc->ops->compressionOps->copyOptions)
+		res->options = jc->ops->compressionOps->copyOptions(jc->options);
+
+	return res;
+}
+
 JsonValue *
 JsonContainerExtractKeys(JsonContainer *jsc)
 {
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -2108,4 +2108,5 @@ jsonbContainerOps =
 	jsonbGetArrayElement,
 	NULL,
 	JsonbToCStringRaw,
+	JsonCopyFlat,
 };
diff --git a/src/include/utils/json_generic.h b/src/include/utils/json_generic.h
@@ -58,6 +58,7 @@ typedef struct JsonCompressionOptionsOps
 	Size	(*encodeOptions)(JsonContainer *, void *buf);
 	Size	(*decodeOptions)(const void *buf, CompressionOptions *);
 	bool	(*optionsAreEqual)(JsonContainer *, CompressionOptions);
+	void   *(*copyOptions)(void *options);
 } JsonCompressionOptionsOps;
 
 typedef enum JsonContainerTypes
@@ -86,6 +87,7 @@ struct JsonContainerOps
 	uint32			(*getArraySize)(JsonContainer *array);
 	char		   *(*toString)(StringInfo out, JsonContainer *jc,
 								int estimated_len);
+	JsonContainer  *(*copy)(JsonContainer *jc);
 };
 
 typedef struct CompressedObject
@@ -230,6 +232,9 @@ typedef struct Json
 #define JsonGetArraySize(json) \
 		JsonOp0(getArraySize, json)
 
+#define JsonCopy(jscontainer) \
+		JsonOp0(copy, jscontainer)
+
 static inline JsonIteratorToken
 JsonIteratorNext(JsonIterator **it, JsonValue *val, bool skipNested)
 {
@@ -340,6 +345,8 @@ extern Json *JsonValueToJson(JsonValue *val);
 extern JsonValue *JsonToJsonValue(Json *json, JsonValue *jv);
 extern JsonValue *JsonValueUnpackBinary(const JsonValue *jbv);
 extern JsonContainer *JsonValueToContainer(const JsonValue *val);
+extern JsonValue *JsonValueCopy(JsonValue *res, const JsonValue *val);
+extern JsonContainer *JsonCopyFlat(JsonContainer *flatContainer);
 
 extern int JsonCompareContainers(JsonContainer *a, JsonContainer *b);
 
