WIP: optimize jsonb

Author: Nikita Glukhov

src/backend/utils/adt/json.c

@@ -3713,41 +3713,44 @@ JsonGetArraySize(JsonContainer *jc)
  * Find last key in a json object by name. Returns palloc()'d copy of the
  * corresponding value, or NULL if is not found.
  */
-static inline JsonbValue *
-jsonFindLastKeyInObject(JsonContainer *obj, const JsonbValue *key)
+JsonbValue *
+jsonFindLastKeyInObject(JsonContainer *obj, const char *keyval, int keylen,
+						JsonbValue *res)
 {
-	JsonbValue *res = NULL;
+	JsonbValue *val = NULL;
 	JsonbValue	jbv;
 	JsonIterator *it;
 	JsonbIteratorToken tok;
 
 	Assert(JsonContainerIsObject(obj));
-	Assert(key->type == jbvString);
 
 	it = JsonIteratorInit(obj);
 
 	while ((tok = JsonIteratorNext(&it, &jbv, true)) != WJB_DONE)
 	{
-		if (tok == WJB_KEY && !lengthCompareJsonbStringValue(key, &jbv))
+		if (tok == WJB_KEY &&
+			jbv.val.string.len == keylen &&
+			!memcmp(jbv.val.string.val, keyval, keylen))
 		{
-			if (!res)
-				res = palloc(sizeof(*res));
+			if (!val)
+				val = res ? res : palloc(sizeof(*val));
 
 			tok = JsonIteratorNext(&it, res, true);
 			Assert(tok == WJB_VALUE);
 		}
 	}
 
-	return res;
+	return val;
 }
 
 /*
  * Find scalar element in a array.  Returns palloc()'d copy of value or NULL.
  */
 static JsonbValue *
-jsonFindValueInArray(JsonContainer *array, const JsonbValue *elem)
+jsonFindValueInArray(JsonContainer *array, const JsonbValue *elem,
+					 JsonbValue *res)
 {
-	JsonbValue *val = palloc(sizeof(*val));
+	JsonbValue *val = res ? res : palloc(sizeof(*val));
 	JsonIterator *it;
 	JsonbIteratorToken tok;
 
@@ -3766,7 +3769,8 @@ jsonFindValueInArray(JsonContainer *array, const JsonbValue *elem)
 		}
 	}
 
-	pfree(val);
+	if (!res)
+		pfree(val);
 	return NULL;
 }
 
@@ -3780,18 +3784,23 @@ jsonFindValueInArray(JsonContainer *array, const JsonbValue *elem)
  * For more details, see findJsonbValueFromContainer().
  */
 JsonbValue *
-findJsonValueFromContainer(JsonContainer *jc, uint32 flags, JsonbValue *key)
+findJsonValueFromContainer(JsonContainer *jc, uint32 flags, JsonbValue *key,
+						   JsonbValue *val)
 {
 	Assert((flags & ~(JB_FARRAY | JB_FOBJECT)) == 0);
 
 	if (!JsonContainerSize(jc))
 		return NULL;
 
 	if ((flags & JB_FARRAY) && JsonContainerIsArray(jc))
-		return jsonFindValueInArray(jc, key);
+		return jsonFindValueInArray(jc, key, val);
 
 	if ((flags & JB_FOBJECT) && JsonContainerIsObject(jc))
-		return jsonFindLastKeyInObject(jc, key);
+	{
+		Assert(key->type == jbvString);
+		return jsonFindLastKeyInObject(jc, key->val.string.val,
+									   key->val.string.len, val);
+	}
 
 	/* Not found */
 	return NULL;
@@ -3803,9 +3812,10 @@ findJsonValueFromContainer(JsonContainer *jc, uint32 flags, JsonbValue *key)
  * Returns palloc()'d copy of the value, or NULL if it does not exist.
  */
 JsonbValue *
-getIthJsonValueFromContainer(JsonContainer *array, uint32 index)
+getIthJsonValueFromContainer(JsonContainer *array, uint32 index,
+							 JsonbValue *res)
 {
-	JsonbValue *val = palloc(sizeof(JsonbValue));
+	JsonbValue *val = res ? res : palloc(sizeof(*val));
 	JsonIterator *it;
 	JsonbIteratorToken tok;
 
@@ -3825,7 +3835,8 @@ getIthJsonValueFromContainer(JsonContainer *array, uint32 index)
 		}
 	}
 
-	pfree(val);
+	if (!res)
+		pfree(val);
 
 	return NULL;
 }

src/backend/utils/adt/jsonb.c

@@ -2161,9 +2161,12 @@ jsonb_is_valid(PG_FUNCTION_ARGS)
 bool
 JsonbExtractScalar(JsonbContainer *jbc, JsonbValue *res)
 {
+#if 0
 	JsonbIterator *it;
 	JsonbIteratorToken tok PG_USED_FOR_ASSERTS_ONLY;
 	JsonbValue	tmp;
+#endif
+	JsonbValue	*scalar PG_USED_FOR_ASSERTS_ONLY;
 
 	if (!JsonContainerIsArray(jbc) || !JsonContainerIsScalar(jbc))
 	{
@@ -2172,6 +2175,10 @@ JsonbExtractScalar(JsonbContainer *jbc, JsonbValue *res)
 		return false;
 	}
 
+#if 1
+	scalar = getIthJsonbValueFromContainer(jbc, 0, res);
+	Assert(scalar);
+#else
 	/*
 	 * A root scalar is stored as an array of one element, so we get the array
 	 * and then its first (and only) member.
@@ -2191,7 +2198,7 @@ JsonbExtractScalar(JsonbContainer *jbc, JsonbValue *res)
 
 	tok = JsonbIteratorNext(&it, &tmp, true);
 	Assert(tok == WJB_DONE);
-
+#endif
 	return true;
 }
 

src/backend/utils/adt/jsonb_op.c

@@ -24,6 +24,7 @@ jsonb_exists(PG_FUNCTION_ARGS)
 	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	text	   *key = PG_GETARG_TEXT_PP(1);
 	JsonbValue	kval;
+	JsonbValue	vval;
 	JsonbValue *v = NULL;
 
 	/*
@@ -38,7 +39,7 @@ jsonb_exists(PG_FUNCTION_ARGS)
 
 	v = findJsonbValueFromContainer(&jb->root,
 									JB_FOBJECT | JB_FARRAY,
-									&kval);
+									&kval, &vval);
 
 	PG_RETURN_BOOL(v != NULL);
 }
@@ -59,6 +60,7 @@ jsonb_exists_any(PG_FUNCTION_ARGS)
 	for (i = 0; i < elem_count; i++)
 	{
 		JsonbValue	strVal;
+		JsonbValue	valVal;
 
 		if (key_nulls[i])
 			continue;
@@ -69,7 +71,7 @@ jsonb_exists_any(PG_FUNCTION_ARGS)
 
 		if (findJsonbValueFromContainer(&jb->root,
 										JB_FOBJECT | JB_FARRAY,
-										&strVal) != NULL)
+										&strVal, &valVal) != NULL)
 			PG_RETURN_BOOL(true);
 	}
 
@@ -92,6 +94,7 @@ jsonb_exists_all(PG_FUNCTION_ARGS)
 	for (i = 0; i < elem_count; i++)
 	{
 		JsonbValue	strVal;
+		JsonbValue	valVal;
 
 		if (key_nulls[i])
 			continue;
@@ -102,7 +105,7 @@ jsonb_exists_all(PG_FUNCTION_ARGS)
 
 		if (findJsonbValueFromContainer(&jb->root,
 										JB_FOBJECT | JB_FARRAY,
-										&strVal) == NULL)
+										&strVal, &valVal) == NULL)
 			PG_RETURN_BOOL(false);
 	}