@@ -1384,26 +1384,21 @@ hstore_to_jsonb(PG_FUNCTION_ARGS)
13841384JsonbValue key ,
13851385val ;
13861386
1387- key .estSize = sizeof (JEntry );
13881387key .type = jbvString ;
13891388key .val .string .len = HS_KEYLEN (entries ,i );
13901389key .val .string .val = pnstrdup (HS_KEY (entries ,base ,i ),key .val .string .len );
1391- key .estSize += key .val .string .len ;
13921390
13931391res = pushJsonbValue (& state ,WJB_KEY ,& key );
13941392
13951393if (HS_VALISNULL (entries ,i ))
13961394{
1397- val .estSize = sizeof (JEntry );
13981395val .type = jbvNull ;
13991396}
14001397else
14011398{
1402- val .estSize = sizeof (JEntry );
14031399val .type = jbvString ;
14041400val .val .string .len = HS_VALLEN (entries ,i );
14051401val .val .string .val = pnstrdup (HS_VAL (entries ,base ,i ),val .val .string .len );
1406- val .estSize += val .val .string .len ;
14071402}
14081403res = pushJsonbValue (& state ,WJB_VALUE ,& val );
14091404}
@@ -1436,16 +1431,12 @@ hstore_to_jsonb_loose(PG_FUNCTION_ARGS)
14361431JsonbValue key ,
14371432val ;
14381433
1439- key .estSize = sizeof (JEntry );
14401434key .type = jbvString ;
14411435key .val .string .len = HS_KEYLEN (entries ,i );
14421436key .val .string .val = pnstrdup (HS_KEY (entries ,base ,i ),key .val .string .len );
1443- key .estSize += key .val .string .len ;
14441437
14451438res = pushJsonbValue (& state ,WJB_KEY ,& key );
14461439
1447- val .estSize = sizeof (JEntry );
1448-
14491440if (HS_VALISNULL (entries ,i ))
14501441{
14511442val .type = jbvNull ;
@@ -1511,15 +1502,12 @@ hstore_to_jsonb_loose(PG_FUNCTION_ARGS)
15111502val .val .numeric = DatumGetNumeric (
15121503DirectFunctionCall3 (numeric_in ,CStringGetDatum (tmp .data ),0 ,-1 ));
15131504
1514- val .estSize += VARSIZE_ANY (val .val .numeric )+ sizeof (JEntry );
15151505}
15161506else
15171507{
1518- val .estSize = sizeof (JEntry );
15191508val .type = jbvString ;
15201509val .val .string .len = HS_VALLEN (entries ,i );
15211510val .val .string .val = pnstrdup (HS_VAL (entries ,base ,i ),val .val .string .len );
1522- val .estSize += val .val .string .len ;
15231511}
15241512}
15251513res = pushJsonbValue (& state ,WJB_VALUE ,& val );