@@ -2855,10 +2855,23 @@ JsonbzArrayIteratorInit(JsonbzArrayIterator *it, CompressedJsonb *cjb)
28552855#endif
28562856const JsonbContainerHeader * jbc = (const JsonbContainerHeader * )((char * )jb + cjb -> offset );
28572857
2858+ #ifndef JSONB_DETOAST_ITERATOR
2859+ CompressedDatumDecompress (cjb -> datum ,cjb -> offset + ((char * )& jbc -> children - (char * )jbc ));
2860+ #else
2861+ PG_DETOAST_ITERATE (cjb -> iter , (const char * )& jbc -> children );
2862+ #endif
2863+
2864+ it -> count = (jbc -> header & JBC_CMASK );
2865+
2866+ #ifndef JSONB_DETOAST_ITERATOR
2867+ CompressedDatumDecompress (cjb -> datum ,cjb -> offset + ((char * )& jbc -> children [it -> count ]- (char * )jbc ));
2868+ #else
2869+ PG_DETOAST_ITERATE (cjb -> iter , (const char * )& jbc -> children [it -> count ]);
2870+ #endif
2871+
28582872it -> cjb = cjb ;
28592873it -> container = jbc ;
28602874it -> index = 0 ;
2861- it -> count = (jbc -> header & JBC_CMASK );
28622875it -> offset = 0 ;
28632876it -> base_addr = (char * )& jbc -> children [it -> count ];
28642877}
@@ -2972,7 +2985,7 @@ jsonbzInitFromDetoastIterator(JsonContainerData *jc, DetoastIterator iter)
29722985if (!jsonb_partial_decompression )
29732986PG_DETOAST_ITERATE (iter ,iter -> buf -> capacity );
29742987else
2975- PG_DETOAST_ITERATE (iter ,Min (iter -> buf -> buf + offsetof(Jsonb ,root .children ),iter -> buf -> capacity ));
2988+ PG_DETOAST_ITERATE (iter ,Min (iter -> buf -> buf + offsetof(JsonbDatum ,root .children ),iter -> buf -> capacity ));
29762989
29772990jsonbzInitContainer (jc ,cjb ,VARSIZE_ANY_EXHDR (iter -> buf -> buf ));// cd->total_len - VARHDRSZ
29782991#endif
