Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7572b77

Browse files
committed
Fix build after removing JsonbValue.estSize field.
Oops, I didn't realize that contrib/hstore refers to jsonb stuff.
1 parent eee6cf1 commit 7572b77

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

contrib/hstore/hstore_io.c

-12
Original file line numberDiff line numberDiff line change
@@ -1384,26 +1384,21 @@ hstore_to_jsonb(PG_FUNCTION_ARGS)
13841384
JsonbValue key,
13851385
val;
13861386

1387-
key.estSize = sizeof(JEntry);
13881387
key.type = jbvString;
13891388
key.val.string.len = HS_KEYLEN(entries, i);
13901389
key.val.string.val = pnstrdup(HS_KEY(entries, base, i), key.val.string.len);
1391-
key.estSize += key.val.string.len;
13921390

13931391
res = pushJsonbValue(&state, WJB_KEY, &key);
13941392

13951393
if (HS_VALISNULL(entries, i))
13961394
{
1397-
val.estSize = sizeof(JEntry);
13981395
val.type = jbvNull;
13991396
}
14001397
else
14011398
{
1402-
val.estSize = sizeof(JEntry);
14031399
val.type = jbvString;
14041400
val.val.string.len = HS_VALLEN(entries, i);
14051401
val.val.string.val = pnstrdup(HS_VAL(entries, base, i), val.val.string.len);
1406-
val.estSize += val.val.string.len;
14071402
}
14081403
res = pushJsonbValue(&state, WJB_VALUE, &val);
14091404
}
@@ -1436,16 +1431,12 @@ hstore_to_jsonb_loose(PG_FUNCTION_ARGS)
14361431
JsonbValue key,
14371432
val;
14381433

1439-
key.estSize = sizeof(JEntry);
14401434
key.type = jbvString;
14411435
key.val.string.len = HS_KEYLEN(entries, i);
14421436
key.val.string.val = pnstrdup(HS_KEY(entries, base, i), key.val.string.len);
1443-
key.estSize += key.val.string.len;
14441437

14451438
res = pushJsonbValue(&state, WJB_KEY, &key);
14461439

1447-
val.estSize = sizeof(JEntry);
1448-
14491440
if (HS_VALISNULL(entries, i))
14501441
{
14511442
val.type = jbvNull;
@@ -1511,15 +1502,12 @@ hstore_to_jsonb_loose(PG_FUNCTION_ARGS)
15111502
val.val.numeric = DatumGetNumeric(
15121503
DirectFunctionCall3(numeric_in, CStringGetDatum(tmp.data), 0, -1));
15131504

1514-
val.estSize += VARSIZE_ANY(val.val.numeric) +sizeof(JEntry);
15151505
}
15161506
else
15171507
{
1518-
val.estSize = sizeof(JEntry);
15191508
val.type = jbvString;
15201509
val.val.string.len = HS_VALLEN(entries, i);
15211510
val.val.string.val = pnstrdup(HS_VAL(entries, base, i), val.val.string.len);
1522-
val.estSize += val.val.string.len;
15231511
}
15241512
}
15251513
res = pushJsonbValue(&state, WJB_VALUE, &val);

0 commit comments

Comments
 (0)