diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2014-05-08 00:05:43 +0300 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2014-05-08 00:06:28 +0300 |
| commit | 7572b7735971cd7a5ef289e133eedf7d82f79c42 (patch) | |
| tree | 6fb8c1ceec2f74a9bbef27387e8bda03f72665bb | |
| parent | eee6cf1f337aa488a20e9111df446cdad770e645 (diff) | |
| download | postgresql-7572b7735971cd7a5ef289e133eedf7d82f79c42.tar.gz postgresql-7572b7735971cd7a5ef289e133eedf7d82f79c42.zip | |
Fix build after removing JsonbValue.estSize field.
Oops, I didn't realize that contrib/hstore refers to jsonb stuff.
| -rw-r--r-- | contrib/hstore/hstore_io.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c index cd303fc9729..441dbf4a7c2 100644 --- 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); |