Minor refactoring of datum_to_jsonb()

Nikita Glukhov · Nikita Glukhov · commit 5f4e1b2c79ed · 2017-05-02T21:38:29.000+03:00
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -700,7 +700,6 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 	char	   *outputstr;
 	bool		numeric_error;
 	JsonbValue	jb;
-	bool		scalar_jsonb = false;
 
 	check_stack_depth();
 
@@ -730,10 +729,10 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 		{
 			case JSONBTYPE_ARRAY:
 				array_to_jsonb_internal(val, result);
-				break;
+				return;
 			case JSONBTYPE_COMPOSITE:
 				composite_to_jsonb(val, result);
-				break;
+				return;
 			case JSONBTYPE_BOOL:
 				if (key_scalar)
 				{
@@ -873,9 +872,8 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 					sem.object_field_start = jsonb_in_object_field_start;
 
 					pg_parse_json(lex, &sem);
-
 				}
-				break;
+				return;
 #ifdef JSON_GENERIC
 			case JSONBTYPE_JSON:
 #endif
@@ -897,35 +895,33 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 						(void) JsonbIteratorNext(&it, &jb, true);
 						Assert(jb.type == jbvArray);
 						(void) JsonbIteratorNext(&it, &jb, true);
-						scalar_jsonb = true;
+						break;
 					}
-					else
-					{
-						JsonbIteratorToken type;
 
-
-						if (result->parseState)
-						{
+					if (result->parseState)
+						result->res =
 							pushScalarJsonbValue(&result->parseState,
 												 JsonToJsonValue(jsonb, &jb),
 												 false, false);
-							return;
-						}
+					else
+					{
+						JsonbIteratorToken type;
 
 						while ((type = JsonbIteratorNext(&it, &jb, false))
 							   != WJB_DONE)
 						{
-							if (type == WJB_END_ARRAY || type == WJB_END_OBJECT ||
-								type == WJB_BEGIN_ARRAY || type == WJB_BEGIN_OBJECT)
-								result->res = pushJsonbValue(&result->parseState,
-															 type, NULL);
-							else
-								result->res = pushJsonbValue(&result->parseState,
-															 type, &jb);
+							JsonbValue *jv =
+									type == WJB_END_ARRAY ||
+									type == WJB_END_OBJECT ||
+									type == WJB_BEGIN_ARRAY ||
+									type == WJB_BEGIN_OBJECT ? NULL : &jb;
+
+							result->res = pushJsonbValue(&result->parseState,
+														 type, jv);
 						}
 					}
 				}
-				break;
+				return;
 			default:
 				outputstr = OidOutputFunctionCall(outfuncoid, val);
 				jb.type = jbvString;
@@ -936,13 +932,6 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 	}
 
 	/* Now insert jb into result, unless we did it recursively */
-	if (!is_null && !scalar_jsonb &&
-		tcategory >= JSONBTYPE_JSON && tcategory <= JSONBTYPE_JSONCAST)
-	{
-		/* work has been done recursively */
-		return;
-	}
-
 	result->res = pushScalarJsonbValue(&result->parseState, &jb, key_scalar,
 									   true);
 }
