Remove JsonValue.val.binary.len field

Nikita Glukhov · Nikita Glukhov · commit ed7a6ac8566d · 2017-05-02T21:38:30.000+03:00
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
@@ -2767,7 +2767,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;
 
@@ -2789,8 +2788,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/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;
@@ -405,7 +404,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;
 		}
@@ -458,7 +456,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;
@@ -713,7 +710,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
@@ -554,7 +554,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);
 				}
@@ -580,7 +581,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
@@ -632,7 +632,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
@@ -2911,7 +2911,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);
 	}
@@ -3335,7 +3335,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->io, tupType, tupTypmod,
diff --git a/src/include/utils/jsonb.h b/src/include/utils/jsonb.h
@@ -295,7 +295,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
`@@ -632,7 +632,6 @@ fillJsonbValue(const JsonbContainer *container, int index,`
`632`	`632`	`(JsonbContainer *)(base_addr + INTALIGN(offset)),`
`633`	`633`	`getJsonbLength(container, index) -`
`634`	`634`	`(INTALIGN(offset) - offset));`
`635`		`- result->val.binary.len = result->val.binary.data->len;`
`636`	`635`	`result->val.binary.uniquified = true;`
`637`	`636`	`}`
`638`	`637`	`}`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,6 @@ struct JsonbValue`
`295`	`295`
`296`	`296`	`struct`
`297`	`297`	`{`
`298`		`- int len; /* FIXME remove */`
`299`	`298`	`bool uniquified;`
`300`	`299`	`const struct JsonContainerData *data;`
`301`	`300`	`} binary; /* Array or object, in on-disk format */`