Remove references to JsonbIterator.isScalar outside of jsonb_utils.c

Nikita Glukhov · Nikita Glukhov · commit 080b741ad8fe · 2022-07-27T00:46:12.000+03:00
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -5375,10 +5375,8 @@ transform_jsonb_string_values(Jsonb *jsonb, void *action_state,
 	JsonbIteratorToken type;
 	JsonbParseState *st = NULL;
 	text	   *out;
-	bool		is_scalar = false;
 
 	it = JsonbIteratorInit(&jsonb->root);
-	is_scalar = it->isScalar;
 
 	while ((type = JsonbIteratorNext(&it, &v, false)) != WJB_DONE)
 	{
@@ -5398,7 +5396,7 @@ transform_jsonb_string_values(Jsonb *jsonb, void *action_state,
 	}
 
 	if (res->type == jbvArray)
-		res->val.array.rawScalar = is_scalar;
+		res->val.array.rawScalar = JB_ROOT_IS_SCALAR(jsonb);
 
 	return JsonbValueToJsonb(res);
 }

Original file line number	Diff line number	Diff line change
`@@ -5375,10 +5375,8 @@ transform_jsonb_string_values(Jsonb jsonb, void action_state,`
`5375`	`5375`	`JsonbIteratorToken type;`
`5376`	`5376`	`JsonbParseState *st = NULL;`
`5377`	`5377`	`text *out;`
`5378`		`- bool is_scalar = false;`
`5379`	`5378`
`5380`	`5379`	`it = JsonbIteratorInit(&jsonb->root);`
`5381`		`- is_scalar = it->isScalar;`
`5382`	`5380`
`5383`	`5381`	`while ((type = JsonbIteratorNext(&it, &v, false)) != WJB_DONE)`
`5384`	`5382`	`{`
`@@ -5398,7 +5396,7 @@ transform_jsonb_string_values(Jsonb jsonb, void action_state,`
`5398`	`5396`	`}`
`5399`	`5397`
`5400`	`5398`	`if (res->type == jbvArray)`
`5401`		`- res->val.array.rawScalar = is_scalar;`
	`5399`	`+ res->val.array.rawScalar = JB_ROOT_IS_SCALAR(jsonb);`
`5402`	`5400`
`5403`	`5401`	`return JsonbValueToJsonb(res);`
`5404`	`5402`	`}`