Remove references to JsonbIterator.isScalar outside of jsonb_utils.c

Nikita Glukhov · Nikita Glukhov · commit 181fab853bd0 · 2021-03-29T20:40:07.000+03:00
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -5445,10 +5445,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)
 	{
@@ -5468,7 +5466,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
`@@ -5445,10 +5445,8 @@ transform_jsonb_string_values(Jsonb jsonb, void action_state,`
`5445`	`5445`	`JsonbIteratorToken type;`
`5446`	`5446`	`JsonbParseState *st = NULL;`
`5447`	`5447`	`text *out;`
`5448`		`- bool is_scalar = false;`
`5449`	`5448`
`5450`	`5449`	`it = JsonbIteratorInit(&jsonb->root);`
`5451`		`- is_scalar = it->isScalar;`
`5452`	`5450`
`5453`	`5451`	`while ((type = JsonbIteratorNext(&it, &v, false)) != WJB_DONE)`
`5454`	`5452`	`{`
`@@ -5468,7 +5466,7 @@ transform_jsonb_string_values(Jsonb jsonb, void action_state,`
`5468`	`5466`	`}`
`5469`	`5467`
`5470`	`5468`	`if (res->type == jbvArray)`
`5471`		`- res->val.array.rawScalar = is_scalar;`
	`5469`	`+ res->val.array.rawScalar = JB_ROOT_IS_SCALAR(jsonb);`
`5472`	`5470`
`5473`	`5471`	`return JsonbValueToJsonb(res);`
`5474`	`5472`	`}`