Extract pushScalarJsonbValue()

Author: Nikita Glukhov

src/backend/utils/adt/jsonb.c

@@ -363,20 +363,6 @@ jsonb_put_escaped_value(StringInfo out, JsonbValue *scalarVal)
 	}
 }
 
-static JsonbValue *
-pushSingleScalarJsonbValue(JsonbParseState **pstate, JsonbValue *jbval)
-{
-	/* single root scalar */
-	JsonbValue	va;
-
-	va.type = jbvArray;
-	va.val.array.rawScalar = true;
-	va.val.array.nElems = 1;
-
-	pushJsonbValue(pstate, WJB_BEGIN_ARRAY, &va);
-	pushJsonbValue(pstate, WJB_ELEM, jbval);
-	return pushJsonbValue(pstate, WJB_END_ARRAY, NULL);
-}
 
 /*
  * For jsonb we always want the de-escaped value - that's what's in token
@@ -428,26 +414,7 @@ jsonb_in_scalar(void *pstate, char *token, JsonTokenType tokentype)
 			break;
 	}
 
-	if (_state->parseState == NULL)
-	{
-		_state->res = pushSingleScalarJsonbValue(&_state->parseState, &v);
-	}
-	else
-	{
-		JsonbValue *o = &_state->parseState->contVal;
-
-		switch (o->type)
-		{
-			case jbvArray:
-				_state->res = pushJsonbValue(&_state->parseState, WJB_ELEM, &v);
-				break;
-			case jbvObject:
-				_state->res = pushJsonbValue(&_state->parseState, WJB_VALUE, &v);
-				break;
-			default:
-				elog(ERROR, "unexpected parent of nested structure");
-		}
-	}
+	_state->res = pushScalarJsonbValue(&_state->parseState, &v, false);
 }
 
 /*
@@ -917,28 +884,8 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 		/* work has been done recursively */
 		return;
 	}
-	else if (result->parseState == NULL)
-	{
-		result->res = pushSingleScalarJsonbValue(&result->parseState, &jb);
-	}
-	else
-	{
-		JsonbValue *o = &result->parseState->contVal;
 
-		switch (o->type)
-		{
-			case jbvArray:
-				result->res = pushJsonbValue(&result->parseState, WJB_ELEM, &jb);
-				break;
-			case jbvObject:
-				result->res = pushJsonbValue(&result->parseState,
-											 key_scalar ? WJB_KEY : WJB_VALUE,
-											 &jb);
-				break;
-			default:
-				elog(ERROR, "unexpected parent of nested structure");
-		}
-	}
+	result->res = pushScalarJsonbValue(&result->parseState, &jb, key_scalar);
 }
 
 /*

src/backend/utils/adt/jsonb_util.c

@@ -696,6 +696,46 @@ pushJsonbValueScalar(JsonbParseState **pstate, JsonbIteratorToken seq,
 	return result;
 }
 
+static JsonbValue *
+pushSingleScalarJsonbValue(JsonbParseState **pstate, JsonbValue *jbval)
+{
+	/* single root scalar */
+	JsonbValue	va;
+
+	va.type = jbvArray;
+	va.val.array.rawScalar = true;
+	va.val.array.nElems = 1;
+
+	pushJsonbValue(pstate, WJB_BEGIN_ARRAY, &va);
+	pushJsonbValue(pstate, WJB_ELEM, jbval);
+	return pushJsonbValue(pstate, WJB_END_ARRAY, NULL);
+}
+
+static JsonbValue *
+pushNestedScalarJsonbValue(JsonbParseState **pstate, JsonbValue *jbval,
+							  bool isKey)
+{
+	switch ((*pstate)->contVal.type)
+	{
+		case jbvArray:
+			return pushJsonbValue(pstate, WJB_ELEM, jbval);
+		case jbvObject:
+			return pushJsonbValue(pstate, isKey ? WJB_KEY : WJB_VALUE, jbval);
+		default:
+			elog(ERROR, "unexpected parent of nested structure");
+			return NULL;
+	}
+}
+
+JsonbValue *
+pushScalarJsonbValue(JsonbParseState **pstate, JsonbValue *jbval, bool isKey)
+{
+	return *pstate == NULL
+				? pushSingleScalarJsonbValue(pstate, jbval)
+				: pushNestedScalarJsonbValue(pstate, jbval, isKey);
+
+}
+
 /*
  * pushJsonbValue() worker:  Iteration-like forming of Jsonb
  */

src/backend/utils/adt/jsonfuncs.c

@@ -4164,31 +4164,20 @@ static void
 addJsonbToParseState(JsonbParseState **jbps, Jsonb *jb)
 {
 	JsonbIterator *it;
-	JsonbValue *o = &(*jbps)->contVal;
 	JsonbValue	v;
 	JsonbIteratorToken type;
 
 	it = JsonbIteratorInit(&jb->root);
 
-	Assert(o->type == jbvArray || o->type == jbvObject);
+	Assert(*jbps);
 
 	if (JB_ROOT_IS_SCALAR(jb))
 	{
 		(void) JsonbIteratorNext(&it, &v, false);	/* skip array header */
 		Assert(v.type == jbvArray);
 		(void) JsonbIteratorNext(&it, &v, false);	/* fetch scalar value */
 
-		switch (o->type)
-		{
-			case jbvArray:
-				(void) pushJsonbValue(jbps, WJB_ELEM, &v);
-				break;
-			case jbvObject:
-				(void) pushJsonbValue(jbps, WJB_VALUE, &v);
-				break;
-			default:
-				elog(ERROR, "unexpected parent of nested structure");
-		}
+		(void) pushScalarJsonbValue(jbps, &v, false);
 	}
 	else
 	{

src/include/utils/jsonb.h

@@ -387,6 +387,8 @@ extern JsonbValue *getIthJsonbValueFromContainer(JsonbContainer *sheader,
 												 uint32 i);
 extern JsonbValue *pushJsonbValue(JsonbParseState **pstate,
 								  JsonbIteratorToken seq, JsonbValue *jbval);
+extern JsonbValue *pushScalarJsonbValue(JsonbParseState **pstate,
+										JsonbValue *jbval, bool isKey);
 extern JsonbParseState *JsonbParseStateClone(JsonbParseState *state);
 extern JsonbIterator *JsonbIteratorInit(JsonbContainer *container);
 extern JsonbIteratorToken JsonbIteratorNext(JsonbIterator **it, JsonbValue *val,