Hide JsonbIterator struct definition

Nikita Glukhov · Nikita Glukhov · commit 8d99ad58f5f8 · 2020-11-24T18:49:50.000+03:00
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -45,6 +45,36 @@ struct JsonbParseState
 	struct JsonbParseState *next;
 };
 
+struct JsonbIterator
+{
+	/* Container being iterated */
+	JsonbContainer *container;
+	uint32		nElems;			/* Number of elements in children array (will
+								 * be nPairs for objects) */
+	bool		isScalar;		/* Pseudo-array scalar value? */
+	JEntry	   *children;		/* JEntrys for child nodes */
+	/* Data proper.  This points to the beginning of the variable-length data */
+	char	   *dataProper;
+
+	/* Current item in buffer (up to nElems) */
+	int			curIndex;
+
+	/* Data offset corresponding to current item */
+	uint32		curDataOffset;
+
+	/*
+	 * If the container is an object, we want to return keys and values
+	 * alternately; so curDataOffset points to the current key, and
+	 * curValueOffset points to the current value.
+	 */
+	uint32		curValueOffset;
+
+	/* Private state */
+	JsonbIterState state;
+
+	struct JsonbIterator *parent;
+};
+
 static void fillJsonbValue(JsonbContainer *container, int index,
 						   char *base_addr, uint32 offset,
 						   JsonbValue *result);
diff --git a/src/include/utils/jsonb.h b/src/include/utils/jsonb.h
@@ -339,35 +339,7 @@ typedef enum
 	JBI_OBJECT_VALUE
 } JsonbIterState;
 
-typedef struct JsonbIterator
-{
-	/* Container being iterated */
-	JsonbContainer *container;
-	uint32		nElems;			/* Number of elements in children array (will
-								 * be nPairs for objects) */
-	bool		isScalar;		/* Pseudo-array scalar value? */
-	JEntry	   *children;		/* JEntrys for child nodes */
-	/* Data proper.  This points to the beginning of the variable-length data */
-	char	   *dataProper;
-
-	/* Current item in buffer (up to nElems) */
-	int			curIndex;
-
-	/* Data offset corresponding to current item */
-	uint32		curDataOffset;
-
-	/*
-	 * If the container is an object, we want to return keys and values
-	 * alternately; so curDataOffset points to the current key, and
-	 * curValueOffset points to the current value.
-	 */
-	uint32		curValueOffset;
-
-	/* Private state */
-	JsonbIterState state;
-
-	struct JsonbIterator *parent;
-} JsonbIterator;
+typedef struct JsonbIterator JsonbIterator;
 
 
 /* Support functions */
