[CF 6000] v2 - Optimize JsonbContainerTypeName by reordering type checks

This branch was automatically generated by a robot using patches from an
email thread registered at:

https://commitfest.postgresql.org/patch/6000

The branch will be overwritten each time a new patch version is posted to
the thread, and also periodically to check for bitrot caused by changes
on the master branch.

Patch(es): https://www.postgresql.org/message-id/CAEoWx2n25k=amT2u_KY+Dk-UmV8GZiHfx=qpmh0RC=PTbAO+nA@mail.gmail.com
Author(s): Chao Li

Author: Commitfest Bot

src/backend/utils/adt/jsonb.c

@@ -160,12 +160,12 @@ JsonbContainerTypeName(JsonbContainer *jbc)
 {
 	JsonbValue	scalar;
 
-	if (JsonbExtractScalar(jbc, &scalar))
-		return JsonbTypeName(&scalar);
-	else if (JsonContainerIsArray(jbc))
-		return "array";
-	else if (JsonContainerIsObject(jbc))
+	if (JsonContainerIsObject(jbc))
 		return "object";
+	else if (!JsonContainerIsScalar(jbc) && JsonContainerIsArray(jbc))
+		return "array";
+	else if (JsonbExtractScalar(jbc, &scalar))
+		return JsonbTypeName(&scalar);
 	else
 	{
 		elog(ERROR, "invalid jsonb container type: 0x%08x", jbc->header);