Fix build after removing JsonbValue.estSize field.

hlinnaka · hlinnaka · commit 7572b7735971 · 2014-05-08T00:06:28.000+03:00
Oops, I didn't realize that contrib/hstore refers to jsonb stuff.
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
@@ -1384,26 +1384,21 @@ hstore_to_jsonb(PG_FUNCTION_ARGS)
 		JsonbValue	key,
 					val;
 
-		key.estSize = sizeof(JEntry);
 		key.type = jbvString;
 		key.val.string.len = HS_KEYLEN(entries, i);
 		key.val.string.val = pnstrdup(HS_KEY(entries, base, i), key.val.string.len);
-		key.estSize += key.val.string.len;
 
 		res = pushJsonbValue(&state, WJB_KEY, &key);
 
 		if (HS_VALISNULL(entries, i))
 		{
-			val.estSize = sizeof(JEntry);
 			val.type = jbvNull;
 		}
 		else
 		{
-			val.estSize = sizeof(JEntry);
 			val.type = jbvString;
 			val.val.string.len = HS_VALLEN(entries, i);
 			val.val.string.val = pnstrdup(HS_VAL(entries, base, i), val.val.string.len);
-			val.estSize += val.val.string.len;
 		}
 		res = pushJsonbValue(&state, WJB_VALUE, &val);
 	}
@@ -1436,16 +1431,12 @@ hstore_to_jsonb_loose(PG_FUNCTION_ARGS)
 		JsonbValue	key,
 					val;
 
-		key.estSize = sizeof(JEntry);
 		key.type = jbvString;
 		key.val.string.len = HS_KEYLEN(entries, i);
 		key.val.string.val = pnstrdup(HS_KEY(entries, base, i), key.val.string.len);
-		key.estSize += key.val.string.len;
 
 		res = pushJsonbValue(&state, WJB_KEY, &key);
 
-		val.estSize = sizeof(JEntry);
-
 		if (HS_VALISNULL(entries, i))
 		{
 			val.type = jbvNull;
@@ -1511,15 +1502,12 @@ hstore_to_jsonb_loose(PG_FUNCTION_ARGS)
 				val.val.numeric = DatumGetNumeric(
 												  DirectFunctionCall3(numeric_in, CStringGetDatum(tmp.data), 0, -1));
 
-				val.estSize += VARSIZE_ANY(val.val.numeric) +sizeof(JEntry);
 			}
 			else
 			{
-				val.estSize = sizeof(JEntry);
 				val.type = jbvString;
 				val.val.string.len = HS_VALLEN(entries, i);
 				val.val.string.val = pnstrdup(HS_VAL(entries, base, i), val.val.string.len);
-				val.estSize += val.val.string.len;
 			}
 		}
 		res = pushJsonbValue(&state, WJB_VALUE, &val);

Original file line number	Diff line number	Diff line change
`@@ -1384,26 +1384,21 @@ hstore_to_jsonb(PG_FUNCTION_ARGS)`
`1384`	`1384`	`JsonbValue key,`
`1385`	`1385`	`val;`
`1386`	`1386`
`1387`		`- key.estSize = sizeof(JEntry);`
`1388`	`1387`	`key.type = jbvString;`
`1389`	`1388`	`key.val.string.len = HS_KEYLEN(entries, i);`
`1390`	`1389`	`key.val.string.val = pnstrdup(HS_KEY(entries, base, i), key.val.string.len);`
`1391`		`- key.estSize += key.val.string.len;`
`1392`	`1390`
`1393`	`1391`	`res = pushJsonbValue(&state, WJB_KEY, &key);`
`1394`	`1392`
`1395`	`1393`	`if (HS_VALISNULL(entries, i))`
`1396`	`1394`	`{`
`1397`		`- val.estSize = sizeof(JEntry);`
`1398`	`1395`	`val.type = jbvNull;`
`1399`	`1396`	`}`
`1400`	`1397`	`else`
`1401`	`1398`	`{`
`1402`		`- val.estSize = sizeof(JEntry);`
`1403`	`1399`	`val.type = jbvString;`
`1404`	`1400`	`val.val.string.len = HS_VALLEN(entries, i);`
`1405`	`1401`	`val.val.string.val = pnstrdup(HS_VAL(entries, base, i), val.val.string.len);`
`1406`		`- val.estSize += val.val.string.len;`
`1407`	`1402`	`}`
`1408`	`1403`	`res = pushJsonbValue(&state, WJB_VALUE, &val);`
`1409`	`1404`	`}`
`@@ -1436,16 +1431,12 @@ hstore_to_jsonb_loose(PG_FUNCTION_ARGS)`
`1436`	`1431`	`JsonbValue key,`
`1437`	`1432`	`val;`
`1438`	`1433`
`1439`		`- key.estSize = sizeof(JEntry);`
`1440`	`1434`	`key.type = jbvString;`
`1441`	`1435`	`key.val.string.len = HS_KEYLEN(entries, i);`
`1442`	`1436`	`key.val.string.val = pnstrdup(HS_KEY(entries, base, i), key.val.string.len);`
`1443`		`- key.estSize += key.val.string.len;`
`1444`	`1437`
`1445`	`1438`	`res = pushJsonbValue(&state, WJB_KEY, &key);`
`1446`	`1439`
`1447`		`- val.estSize = sizeof(JEntry);`
`1448`		`-`
`1449`	`1440`	`if (HS_VALISNULL(entries, i))`
`1450`	`1441`	`{`
`1451`	`1442`	`val.type = jbvNull;`
`@@ -1511,15 +1502,12 @@ hstore_to_jsonb_loose(PG_FUNCTION_ARGS)`
`1511`	`1502`	`val.val.numeric = DatumGetNumeric(`
`1512`	`1503`	`DirectFunctionCall3(numeric_in, CStringGetDatum(tmp.data), 0, -1));`
`1513`	`1504`
`1514`		`- val.estSize += VARSIZE_ANY(val.val.numeric) +sizeof(JEntry);`
`1515`	`1505`	`}`
`1516`	`1506`	`else`
`1517`	`1507`	`{`
`1518`		`- val.estSize = sizeof(JEntry);`
`1519`	`1508`	`val.type = jbvString;`
`1520`	`1509`	`val.val.string.len = HS_VALLEN(entries, i);`
`1521`	`1510`	`val.val.string.val = pnstrdup(HS_VAL(entries, base, i), val.val.string.len);`
`1522`		`- val.estSize += val.val.string.len;`
`1523`	`1511`	`}`
`1524`	`1512`	`}`
`1525`	`1513`	`res = pushJsonbValue(&state, WJB_VALUE, &val);`