Refactor JsonbDeepContains()

Author: Nikita Glukhov

src/backend/utils/adt/jsonb_op.c

@@ -116,16 +116,10 @@ jsonb_contains(PG_FUNCTION_ARGS)
 	Jsonb	   *val = PG_GETARG_JSONB_P(0);
 	Jsonb	   *tmpl = PG_GETARG_JSONB_P(1);
 
-	JsonbIterator *it1,
-			   *it2;
-
 	if (JB_ROOT_IS_OBJECT(val) != JB_ROOT_IS_OBJECT(tmpl))
 		PG_RETURN_BOOL(false);
 
-	it1 = JsonbIteratorInit(&val->root);
-	it2 = JsonbIteratorInit(&tmpl->root);
-
-	PG_RETURN_BOOL(JsonbDeepContains(&it1, &it2));
+	PG_RETURN_BOOL(JsonbDeepContains(JsonRoot(val), JsonRoot(tmpl)));
 }
 
 Datum
@@ -135,16 +129,10 @@ jsonb_contained(PG_FUNCTION_ARGS)
 	Jsonb	   *tmpl = PG_GETARG_JSONB_P(0);
 	Jsonb	   *val = PG_GETARG_JSONB_P(1);
 
-	JsonbIterator *it1,
-			   *it2;
-
 	if (JB_ROOT_IS_OBJECT(val) != JB_ROOT_IS_OBJECT(tmpl))
 		PG_RETURN_BOOL(false);
 
-	it1 = JsonbIteratorInit(&val->root);
-	it2 = JsonbIteratorInit(&tmpl->root);
-
-	PG_RETURN_BOOL(JsonbDeepContains(&it1, &it2));
+	PG_RETURN_BOOL(JsonbDeepContains(JsonRoot(val), JsonRoot(tmpl)));
 }
 
 Datum

src/backend/utils/adt/jsonb_util.c

@@ -1227,12 +1227,11 @@ JsonbIteratorInit(JsonContainer *cont)
  */
 
 bool
-JsonbDeepContains(JsonIterator **val, JsonIterator **mContained)
+JsonbDeepContains(JsonContainer *cval, JsonContainer *ccont)
 {
-	JsonbValue	vval,
-				vcontained;
-	JsonbIteratorToken rval,
-				rcont;
+	JsonIterator	   *icont;
+	JsonbValue			vcont;
+	JsonbIteratorToken	rcont;
 
 	/*
 	 * Guard against stack overflow due to overly complex Jsonb.
@@ -1242,94 +1241,76 @@ JsonbDeepContains(JsonIterator **val, JsonIterator **mContained)
 	 */
 	check_stack_depth();
 
-	rval = JsonIteratorNext(val, &vval, false);
-	rcont = JsonIteratorNext(mContained, &vcontained, false);
-
-	if (rval != rcont)
+	if (JsonContainerIsObject(cval) != JsonContainerIsObject(ccont))
 	{
 		/*
 		 * The differing return values can immediately be taken as indicating
 		 * two differing container types at this nesting level, which is
 		 * sufficient reason to give up entirely (but it should be the case
 		 * that they're both some container type).
 		 */
-		Assert(rval == WJB_BEGIN_OBJECT || rval == WJB_BEGIN_ARRAY);
-		Assert(rcont == WJB_BEGIN_OBJECT || rcont == WJB_BEGIN_ARRAY);
 		return false;
 	}
-	else if (rcont == WJB_BEGIN_OBJECT)
+	else if (JsonContainerIsObject(cval))
 	{
-		Assert(vval.type == jbvObject);
-		Assert(vcontained.type == jbvObject);
-
 		/*
 		 * If the lhs has fewer pairs than the rhs, it can't possibly contain
 		 * the rhs.  (This conclusion is safe only because we de-duplicate
 		 * keys in all Jsonb objects; thus there can be no corresponding
 		 * optimization in the array case.)  The case probably won't arise
 		 * often, but since it's such a cheap check we may as well make it.
 		 */
-		if (vval.val.object.nPairs < vcontained.val.object.nPairs)
+		if (JsonContainerSize(cval) >= 0 &&
+			JsonContainerSize(ccont) >= 0 &&
+			JsonContainerSize(cval) < JsonContainerSize(ccont))
 			return false;
 
-		/* Work through rhs "is it contained within?" object */
-		for (;;)
-		{
-			JsonbValue *lhsVal; /* lhsVal is from pair in lhs object */
-			JsonbValue	lhsValBuf;
-
-			rcont = JsonIteratorNext(mContained, &vcontained, false);
+		icont = JsonIteratorInit(ccont);
+		rcont = JsonIteratorNext(&icont, &vcont, false);
+		Assert(rcont == WJB_BEGIN_OBJECT);
 
-			/*
-			 * When we get through caller's rhs "is it contained within?"
-			 * object without failing to find one of its values, it's
-			 * contained.
-			 */
-			if (rcont == WJB_END_OBJECT)
-				return true;
-
-			Assert(rcont == WJB_KEY);
-			Assert(vcontained.type == jbvString);
+		/*
+		 * Work through rhs "is it contained within?" object.
+		 *
+		 * When we get through caller's rhs "is it contained within?"
+		 * object without failing to find one of its values, it's
+		 * contained.
+		 */
+		while ((rcont = JsonIteratorNext(&icont, &vcont, false)) == WJB_KEY)
+		{
+			/* First, find value by key in lhs object ... */
+			JsonbValue *lhsVal = JsonFindKeyInObject(cval,
+													 vcont.val.string.val,
+													 vcont.val.string.len);
 
-			/* First, find value by key... */
-			lhsVal = JsonFindKeyInObject((*val)->container,
-										 vcontained.val.string.val,
-										 vcontained.val.string.len);
 			if (!lhsVal)
 				return false;
 
 			/*
 			 * ...at this stage it is apparent that there is at least a key
 			 * match for this rhs pair.
 			 */
-			rcont = JsonIteratorNext(mContained, &vcontained, true);
-
+			rcont = JsonIteratorNext(&icont, &vcont, true);
 			Assert(rcont == WJB_VALUE);
 
 			/*
 			 * Compare rhs pair's value with lhs pair's value just found using
 			 * key
 			 */
-			if (lhsVal->type != vcontained.type)
+			if (lhsVal->type != vcont.type)
 			{
 				return false;
 			}
 			else if (IsAJsonbScalar(lhsVal))
 			{
-				if (!equalsJsonbScalarValue(lhsVal, &vcontained))
+				if (!equalsJsonbScalarValue(lhsVal, &vcont))
 					return false;
 			}
 			else
 			{
 				/* Nested container value (object or array) */
-				JsonIterator *nestval,
-						   *nestContained;
-
 				Assert(lhsVal->type == jbvBinary);
-				Assert(vcontained.type == jbvBinary);
-
-				nestval = JsonIteratorInit(lhsVal->val.binary.data);
-				nestContained = JsonIteratorInit(vcontained.val.binary.data);
+				Assert(vcont.type == jbvBinary);
 
 				/*
 				 * Match "value" side of rhs datum object's pair recursively.
@@ -1351,18 +1332,19 @@ JsonbDeepContains(JsonIterator **val, JsonIterator **mContained)
 				 * of containment (plus of course the mapped nodes must be
 				 * equal).
 				 */
-				if (!JsonbDeepContains(&nestval, &nestContained))
+				if (!JsonbDeepContains(lhsVal->val.binary.data,
+									   vcont.val.binary.data))
 					return false;
 			}
 		}
+
+		Assert(rcont == WJB_END_OBJECT);
+		Assert(icont == NULL);
 	}
-	else if (rcont == WJB_BEGIN_ARRAY)
+	else
 	{
-		JsonbValue *lhsConts = NULL;
-		uint32		nLhsElems = vval.val.array.nElems;
-
-		Assert(vval.type == jbvArray);
-		Assert(vcontained.type == jbvArray);
+		JsonbValue		   *lhsConts = NULL;
+		uint32				nLhsElems = JsonContainerSize(cval);
 
 		/*
 		 * Handle distinction between "raw scalar" pseudo arrays, and real
@@ -1374,29 +1356,25 @@ JsonbDeepContains(JsonIterator **val, JsonIterator **mContained)
 		 * only contain pairs, never raw scalars (a pair is represented by an
 		 * rhs object argument with a single contained pair).
 		 */
-		if (vval.val.array.rawScalar && !vcontained.val.array.rawScalar)
+		if (JsonContainerIsScalar(cval) && !JsonContainerIsScalar(ccont))
 			return false;
 
-		/* Work through rhs "is it contained within?" array */
-		for (;;)
-		{
-			rcont = JsonIteratorNext(mContained, &vcontained, true);
+		icont = JsonIteratorInit(ccont);
+		rcont = JsonIteratorNext(&icont, &vcont, false);
+		Assert(rcont == WJB_BEGIN_ARRAY);
 
-			/*
-			 * When we get through caller's rhs "is it contained within?"
-			 * array without failing to find one of its values, it's
-			 * contained.
-			 */
-			if (rcont == WJB_END_ARRAY)
-				return true;
-
-			Assert(rcont == WJB_ELEM);
-
-			if (IsAJsonbScalar(&vcontained))
+		/*
+		 * Work through rhs "is it contained within?" array.
+		 *
+		 * When we get through caller's rhs "is it contained within?"
+		 * array without failing to find one of its values, it's
+		 * contained.
+		 */
+		while ((rcont = JsonIteratorNext(&icont, &vcont, true)) == WJB_ELEM)
+		{
+			if (IsAJsonbScalar(&vcont))
 			{
-				if (!findJsonbValueFromContainer((*val)->container,
-												 JB_FARRAY,
-												 &vcontained))
+				if (!findJsonbValueFromContainer(cval, JB_FARRAY, &vcont))
 					return false;
 			}
 			else
@@ -1409,21 +1387,37 @@ JsonbDeepContains(JsonIterator **val, JsonIterator **mContained)
 				 */
 				if (lhsConts == NULL)
 				{
-					uint32		j = 0;
+					uint32			j = 0;
+					JsonIterator   *ival;
+					JsonbValue		vval;
+
+					if ((int32) nLhsElems < 0)
+						nLhsElems = JsonGetArraySize(cval);
+
+					if (nLhsElems == 0)
+						return false;
 
 					/* Make room for all possible values */
 					lhsConts = palloc(sizeof(JsonbValue) * nLhsElems);
 
+					ival = JsonIteratorInit(cval);
+					rcont = JsonIteratorNext(&ival, &vval, true);
+					Assert(rcont == WJB_BEGIN_ARRAY);
+
 					for (i = 0; i < nLhsElems; i++)
 					{
 						/* Store all lhs elements in temp array */
-						rcont = JsonIteratorNext(val, &vval, true);
+						rcont = JsonIteratorNext(&ival, &vval, true);
 						Assert(rcont == WJB_ELEM);
 
 						if (vval.type == jbvBinary)
 							lhsConts[j++] = vval;
 					}
 
+					rcont = JsonIteratorNext(&ival, &vval, true);
+					Assert(rcont == WJB_END_ARRAY);
+					Assert(ival == NULL);
+
 					/* No container elements in temp array, so give up now */
 					if (j == 0)
 						return false;
@@ -1436,20 +1430,8 @@ JsonbDeepContains(JsonIterator **val, JsonIterator **mContained)
 				for (i = 0; i < nLhsElems; i++)
 				{
 					/* Nested container value (object or array) */
-					JsonIterator *nestval,
-							   *nestContained;
-					bool		contains;
-
-					nestval = JsonIteratorInit(lhsConts[i].val.binary.data);
-					nestContained = JsonIteratorInit(vcontained.val.binary.data);
-
-					contains = JsonbDeepContains(&nestval, &nestContained);
-
-					if (nestval)
-						pfree(nestval);
-					if (nestContained)
-						pfree(nestContained);
-					if (contains)
+					if (JsonbDeepContains(lhsConts[i].val.binary.data,
+										  vcont.val.binary.data))
 						break;
 				}
 
@@ -1461,14 +1443,15 @@ JsonbDeepContains(JsonIterator **val, JsonIterator **mContained)
 					return false;
 			}
 		}
-	}
-	else
-	{
-		elog(ERROR, "invalid jsonb container type");
+
+		Assert(rcont == WJB_END_ARRAY);
+		Assert(icont == NULL);
+
+		if (lhsConts != NULL)
+			pfree(lhsConts);
 	}
 
-	elog(ERROR, "unexpectedly fell off end of jsonb container");
-	return false;
+	return true;
 }
 
 /*

src/include/utils/json_generic.h

@@ -293,7 +293,7 @@ extern const char *JsonbTypeName(JsonbValue *jb);
 
 extern int JsonCompareContainers(JsonContainer *a, JsonContainer *b);
 
-extern bool JsonbDeepContains(JsonIterator **val, JsonIterator **mContained);
+extern bool JsonbDeepContains(JsonContainer *val, JsonContainer *mContained);
 
 extern JsonValue *JsonContainerExtractKeys(JsonContainer *jsc);