Remove generic gson functions

Author: Nikita Glukhov

src/backend/utils/adt/json_generic.c

@@ -18,89 +18,6 @@
 static Json *JsonExpand(Json *tmp, Datum value, bool freeValue,
 						JsonContainerOps *ops);
 
-JsonValue *
-JsonValueCopy(JsonValue *res, const JsonValue *val)
-{
-	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;
-}
-
 JsonValue *
 JsonExtractScalar(JsonContainer *jc, JsonValue *scalar)
 {
@@ -142,129 +59,6 @@ JsonValueUnwrap(const JsonValue *val, JsonValue *valbuf)
 	return val;
 }
 
-static inline JsonValue *
-jsonFindKeyInObjectInternal(JsonContainer *obj, const char *key, int len,
-							bool last)
-{
-	JsonValue		   *res = NULL;
-	JsonValue			jbv;
-	JsonIterator	   *it;
-	JsonIteratorToken	tok;
-
-	Assert(JsonContainerIsObject(obj));
-
-	it = JsonIteratorInit(obj);
-
-	while ((tok = JsonIteratorNext(&it, &jbv, true)) != WJB_DONE)
-	{
-		if (tok == WJB_KEY &&
-			!lengthCompareJsonbString(key, len,
-									  jbv.val.string.val, jbv.val.string.len))
-		{
-			if (!last || !res)
-				res = palloc(sizeof(JsonValue));
-
-			tok = JsonIteratorNext(&it, res, true);
-			Assert(tok == WJB_VALUE);
-
-			if (last)
-				continue;
-
-			JsonIteratorFree(it);
-			break;
-		}
-	}
-
-	return res;
-}
-
-JsonValue *
-jsonFindKeyInObject(JsonContainer *obj, const char *key, int len)
-{
-	return jsonFindKeyInObjectInternal(obj, key, len, false);
-}
-
-JsonValue *
-jsonFindLastKeyInObject(JsonContainer *obj, const char *key, int len)
-{
-	return jsonFindKeyInObjectInternal(obj, key, len, true);
-}
-
-JsonValue *
-jsonFindValueInArray(JsonContainer *array, const JsonValue *elem)
-{
-	JsonValue		   *val = palloc(sizeof(JsonValue));
-	JsonIterator	   *it;
-	JsonIteratorToken	tok;
-
-	Assert(JsonContainerIsArray(array));
-	Assert(IsAJsonbScalar(elem));
-
-	it = JsonIteratorInit(array);
-
-	while ((tok = JsonIteratorNext(&it, val, true)) != WJB_DONE)
-	{
-		if (tok == WJB_ELEM && val->type == elem->type &&
-			equalsJsonbScalarValue(val, elem))
-		{
-			JsonIteratorFree(it);
-			return val;
-		}
-	}
-
-	pfree(val);
-	return NULL;
-}
-
-JsonValue *
-jsonGetArrayElement(JsonContainer *array, uint32 index)
-{
-	JsonValue		   *val = palloc(sizeof(JsonValue));
-	JsonIterator	   *it;
-	JsonIteratorToken	tok;
-
-	Assert(JsonContainerIsArray(array));
-
-	it = JsonIteratorInit(array);
-
-	while ((tok = JsonIteratorNext(&it, val, true)) != WJB_DONE)
-	{
-		if (tok == WJB_ELEM)
-		{
-			if (index-- == 0)
-			{
-				JsonIteratorFree(it);
-				return val;
-			}
-		}
-	}
-
-	pfree(val);
-
-	return NULL;
-}
-
-uint32
-jsonGetArraySize(JsonContainer *array)
-{
-	JsonValue		    val;
-	JsonIterator	   *it;
-	JsonIteratorToken	tok;
-	uint32				size = 0;
-
-	Assert(JsonContainerIsArray(array));
-
-	it = JsonIteratorInit(array);
-
-	while ((tok = JsonIteratorNext(&it, &val, true)) != WJB_DONE)
-	{
-		if (tok == WJB_ELEM)
-			size++;
-	}
-
-	return size;
-}
-
 JsonValue *
 JsonToJsonValue(Json *json, JsonValue *jv)
 {

src/include/utils/json_generic.h

@@ -301,12 +301,6 @@ extern char *JsonbToCStringIndent(StringInfo out, JsonContainer *in,
 #define JsonbToCString(out, in, estimated_len) \
 		JsonToCStringExt(out, in, estimated_len)
 
-extern JsonValue   *jsonFindKeyInObject(JsonContainer *obj, const char *key, int len);
-extern JsonValue   *jsonFindLastKeyInObject(JsonContainer *obj, const char *key, int len);
-extern JsonValue   *jsonFindValueInArray(JsonContainer *array, const JsonValue *elem);
-extern uint32		jsonGetArraySize(JsonContainer *array);
-extern JsonValue   *jsonGetArrayElement(JsonContainer *array, uint32 index);
-
 extern bool JsonValueScalarEquals(const JsonValue *aScalar,
 								  const JsonValue *bScalar);