Hide JsonbParseState struct definition

Nikita Glukhov · Nikita Glukhov · commit ec108e79322e · 2022-07-27T00:46:12.000+03:00
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -285,7 +285,7 @@ jsonb_in_object_start(void *pstate)
 	JsonbInState *_state = (JsonbInState *) pstate;
 
 	_state->res = pushJsonbValue(&_state->parseState, WJB_BEGIN_OBJECT, NULL);
-	_state->parseState->unique_keys = _state->unique_keys;
+	JsonbParseStateSetUniqueKeys(_state->parseState, _state->unique_keys);
 }
 
 static void
@@ -1143,8 +1143,9 @@ jsonb_build_object_worker(int nargs, Datum *args, bool *nulls, Oid *types,
 	memset(&result, 0, sizeof(JsonbInState));
 
 	result.res = pushJsonbValue(&result.parseState, WJB_BEGIN_OBJECT, NULL);
-	result.parseState->unique_keys = unique_keys;
-	result.parseState->skip_nulls = absent_on_null;
+
+	JsonbParseStateSetUniqueKeys(result.parseState, unique_keys);
+	JsonbParseStateSetSkipNulls(result.parseState, absent_on_null);
 
 	for (i = 0; i < nargs; i += 2)
 	{
@@ -1675,8 +1676,9 @@ jsonb_object_agg_transfn_worker(FunctionCallInfo fcinfo,
 		state->res = result;
 		result->res = pushJsonbValue(&result->parseState,
 									 WJB_BEGIN_OBJECT, NULL);
-		result->parseState->unique_keys = unique_keys;
-		result->parseState->skip_nulls = absent_on_null;
+
+		JsonbParseStateSetUniqueKeys(result->parseState, unique_keys);
+		JsonbParseStateSetSkipNulls(result->parseState, absent_on_null);
 
 		MemoryContextSwitchTo(oldcontext);
 
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -38,6 +38,16 @@
 #define JSONB_MAX_ELEMS (Min(MaxAllocSize / sizeof(JsonbValue), JB_CMASK))
 #define JSONB_MAX_PAIRS (Min(MaxAllocSize / sizeof(JsonbPair), JB_CMASK))
 
+/* Conversion state used when parsing Jsonb from text, or for type coercion */
+struct JsonbParseState
+{
+	JsonbValue	contVal;
+	Size		size;
+	struct JsonbParseState *next;
+	bool		unique_keys;	/* Check object key uniqueness */
+	bool		skip_nulls;		/* Skip null object fields */
+};
+
 static void fillJsonbValue(JsonbContainer *container, int index,
 						   char *base_addr, uint32 offset,
 						   JsonbValue *result);
@@ -575,6 +585,18 @@ JsonbParseStateClone(JsonbParseState *state)
 	return result;
 }
 
+void
+JsonbParseStateSetUniqueKeys(JsonbParseState *state, bool unique_keys)
+{
+	state->unique_keys = unique_keys;
+}
+
+void
+JsonbParseStateSetSkipNulls(JsonbParseState *state, bool skip_nulls)
+{
+	state->skip_nulls = skip_nulls;
+}
+
 /*
  * Push JsonbValue into JsonbParseState.
  *
diff --git a/src/include/utils/jsonb.h b/src/include/utils/jsonb.h
@@ -324,14 +324,7 @@ struct JsonbPair
 };
 
 /* Conversion state used when parsing Jsonb from text, or for type coercion */
-typedef struct JsonbParseState
-{
-	JsonbValue	contVal;
-	Size		size;
-	struct JsonbParseState *next;
-	bool		unique_keys;	/* Check object key uniqueness */
-	bool		skip_nulls;		/* Skip null object fields */
-} JsonbParseState;
+typedef struct JsonbParseState JsonbParseState;
 
 /*
  * JsonbIterator holds details of the type for each iteration. It also stores a
@@ -408,6 +401,8 @@ extern JsonbValue *pushJsonbValue(JsonbParseState **pstate,
 extern JsonbValue *pushScalarJsonbValue(JsonbParseState **pstate,
 										JsonbValue *jbval, bool isKey);
 extern JsonbParseState *JsonbParseStateClone(JsonbParseState *state);
+extern void JsonbParseStateSetUniqueKeys(JsonbParseState *state, bool unique_keys);
+extern void JsonbParseStateSetSkipNulls(JsonbParseState *state, bool skip_nulls);
 extern JsonbIterator *JsonbIteratorInit(JsonbContainer *container);
 extern JsonbIteratorToken JsonbIteratorNext(JsonbIterator **it, JsonbValue *val,
 											bool skipNested);
