Remove JsonValue.val.binary.len field

Nikita Glukhov · Nikita Glukhov · commit 7fe7b77aff4b · 2020-11-24T18:49:54.000+03:00
diff --git a/src/backend/utils/adt/json_generic.c b/src/backend/utils/adt/json_generic.c
@@ -160,7 +160,6 @@ JsonValueWrapInBinary(const JsonValue *val, JsonValue *bin)
 
 	bin->type = jbvBinary;
 	bin->val.binary.data = jc;
-	bin->val.binary.len = jc->len;
 	bin->val.binary.uniquified = JsonValueIsUniquified(val);
 
 	return bin;
@@ -407,7 +406,6 @@ jsonvArrayIteratorNext(JsonIterator **it, JsonValue *res, bool skipNested)
 		{
 			Assert(res->type == jbvArray || res->type == jbvObject);
 			res->val.binary.data = JsonValueToContainer(val);
-			res->val.binary.len = 0;
 			res->val.binary.uniquified = JsonValueIsUniquified(val);
 			res->type = jbvBinary;
 		}
@@ -460,7 +458,6 @@ jsonvObjectIteratorNext(JsonIterator **it, JsonValue *res, bool skipNested)
 			{
 				Assert(res->type == jbvArray || res->type == jbvObject);
 				res->val.binary.data = JsonValueToContainer(&pair->value);
-				res->val.binary.len = 0;
 				res->val.binary.uniquified =
 											JsonValueIsUniquified(&pair->value);
 				res->type = jbvBinary;
@@ -721,7 +718,6 @@ JsonToJsonValue(Json *json, JsonValue *jv)
 
 	jv->type = jbvBinary;
 	jv->val.binary.data = &json->root;
-	jv->val.binary.len = json->root.len;
 	jv->val.binary.uniquified = json->root.ops != &jsontContainerOps;
 
 	return jv;
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -608,7 +608,8 @@ JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len,
 				{
 					first = false;
 					if (v.type == jbvBinary)
-						JsonbToCString(out, v.val.binary.data, v.val.binary.len);
+						JsonbToCString(out, v.val.binary.data,
+									   v.val.binary.data->len);
 					else
 						jsonb_put_escaped_value(out, &v);
 				}
@@ -634,7 +635,8 @@ JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len,
 					add_indent(out, use_indent, level);
 
 				if (v.type == jbvBinary)
-					JsonbToCString(out, v.val.binary.data, v.val.binary.len);
+					JsonbToCString(out, v.val.binary.data,
+								   v.val.binary.data->len);
 				else
 					jsonb_put_escaped_value(out, &v);
 				break;
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -139,7 +139,6 @@ JsonContainerFlatten(JsonContainer *jc, JsonValueEncoder encoder,
 	{
 		jbv.type = jbvBinary;
 		jbv.val.binary.data = jc;
-		jbv.val.binary.len = jc->len;
 		jbv.val.binary.uniquified = JsonContainerIsUniquified(jc);
 
 		binary = &jbv;
@@ -663,7 +662,6 @@ fillJsonbValue(const JsonbContainer *container, int index,
 						   (JsonbContainer *)(base_addr + INTALIGN(offset)),
 						   getJsonbLength(container, index) -
 								(INTALIGN(offset) - offset));
-		result->val.binary.len = result->val.binary.data->len;
 		result->val.binary.uniquified = true;
 	}
 }
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -1703,7 +1703,7 @@ JsonbValueAsText(JsonbValue *v)
 
 				initStringInfo(&jtext);
 				(void) JsonbToCString(&jtext, v->val.binary.data,
-									  v->val.binary.len);
+									  v->val.binary.data->len);
 
 				return cstring_to_text_with_len(jtext.data, jtext.len);
 			}
@@ -3014,7 +3014,7 @@ populate_scalar(ScalarIOData *io, Oid typid, int32 typmod, JsValue *jsv)
 			str = JsonbToCString(NULL, JsonValueToContainer(jbv), 0);
 		else if (jbv->type == jbvBinary)
 			str = JsonbToCString(NULL, jbv->val.binary.data,
-								 jbv->val.binary.len);
+								 jbv->val.binary.data->len);
 		else
 			elog(ERROR, "unrecognized jsonb type: %d", (int) jbv->type);
 	}
@@ -3521,7 +3521,7 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname,
 		/* fill binary jsonb value pointing to jb */
 		jbv.type = jbvBinary;
 		jbv.val.binary.data = &jb->root;
-		jbv.val.binary.len = jb->root.len;
+		jbv.val.binary.uniquified = true;
 	}
 
 	rettuple = populate_composite(&cache->c.io.composite, cache->argtype,
diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
@@ -2625,7 +2625,6 @@ JsonbInitBinary(JsonbValue *jbv, Jsonb *jb)
 {
 	jbv->type = jbvBinary;
 	jbv->val.binary.data = &jb->root;
-	jbv->val.binary.len = VARSIZE_ANY_EXHDR(jb);
 
 	return jbv;
 }
diff --git a/src/common/jsonapi.c b/src/common/jsonapi.c
@@ -1333,7 +1333,6 @@ jsontFillValue(JsonIterator **pit, JsonValue *res, bool skipNested,
 			int		len;
 
 			res->type = jbvBinary;
-			res->val.binary.len = 0;
 			res->val.binary.data = JsonContainerAlloc();
 			res->val.binary.uniquified = false;
 
@@ -1355,8 +1354,6 @@ jsontFillValue(JsonIterator **pit, JsonValue *res, bool skipNested,
 															   : jbvArray,
 							   -1);
 
-			res->val.binary.len = res->val.binary.data->len;
-
 			if (skipNested)
 				return false;
 
diff --git a/src/include/utils/jsonb.h b/src/include/utils/jsonb.h
@@ -307,7 +307,6 @@ struct JsonbValue
 
 		struct
 		{
-			int			len; /* FIXME remove */
 			bool		uniquified;
 			const struct JsonContainerData *data;
 		}			binary;		/* Array or object, in on-disk format */

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,6 @@ JsonContainerFlatten(JsonContainer *jc, JsonValueEncoder encoder,`
`139`	`139`	`{`
`140`	`140`	`jbv.type = jbvBinary;`
`141`	`141`	`jbv.val.binary.data = jc;`
`142`		`- jbv.val.binary.len = jc->len;`
`143`	`142`	`jbv.val.binary.uniquified = JsonContainerIsUniquified(jc);`
`144`	`143`
`145`	`144`	`binary = &jbv;`
`@@ -663,7 +662,6 @@ fillJsonbValue(const JsonbContainer *container, int index,`
`663`	`662`	`(JsonbContainer *)(base_addr + INTALIGN(offset)),`
`664`	`663`	`getJsonbLength(container, index) -`
`665`	`664`	`(INTALIGN(offset) - offset));`
`666`		`- result->val.binary.len = result->val.binary.data->len;`
`667`	`665`	`result->val.binary.uniquified = true;`
`668`	`666`	`}`
`669`	`667`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2625,7 +2625,6 @@ JsonbInitBinary(JsonbValue jbv, Jsonb jb)`
`2625`	`2625`	`{`
`2626`	`2626`	`jbv->type = jbvBinary;`
`2627`	`2627`	`jbv->val.binary.data = &jb->root;`
`2628`		`- jbv->val.binary.len = VARSIZE_ANY_EXHDR(jb);`
`2629`	`2628`
`2630`	`2629`	`return jbv;`
`2631`	`2630`	`}`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,6 @@ struct JsonbValue`
`307`	`307`
`308`	`308`	`struct`
`309`	`309`	`{`
`310`		`- int len; /* FIXME remove */`
`311`	`310`	`bool uniquified;`
`312`	`311`	`const struct JsonContainerData *data;`
`313`	`312`	`} binary; /* Array or object, in on-disk format */`