Remove JsonValue.val.binary.len field

Nikita Glukhov · Nikita Glukhov · commit d1167d945ea3 · 2022-07-27T00:46:12.000+03:00
diff --git a/src/backend/utils/adt/json_generic.c b/src/backend/utils/adt/json_generic.c
@@ -393,7 +393,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->type = jbvBinary;
 		}
 	}
@@ -445,7 +444,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->type = jbvBinary;
 			}
 		}
@@ -569,7 +567,6 @@ jsonvFindKeyInObject(JsonContainer *objc, const char *key, int len,
 
 				jv->type = jbvBinary;
 				jv->val.binary.data = jc;
-				jv->val.binary.len = jc->len;
 			}
 			else
 				*jv = pair->value;
@@ -703,7 +700,6 @@ JsonToJsonValue(Json *json, JsonValue *jv)
 
 	jv->type = jbvBinary;
 	jv->val.binary.data = &json->root;
-	jv->val.binary.len = json->root.len;
 
 	return jv;
 }
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -523,7 +523,8 @@ JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len, bool
 				{
 					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);
 				}
@@ -548,7 +549,8 @@ JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len, bool
 					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
@@ -138,7 +138,7 @@ JsonContainerFlatten(JsonContainer *jc, JsonValueEncoder encoder,
 	{
 		jbv.type = jbvBinary;
 		jbv.val.binary.data = jc;
-		jbv.val.binary.len = jc->len;
+
 		binary = &jbv;
 	}
 
@@ -645,7 +645,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;
 	}
 }
 
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -1774,7 +1774,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);
 			}
@@ -2943,7 +2943,7 @@ populate_scalar(ScalarIOData *io, Oid typid, int32 typmod, JsValue *jsv)
 													  PointerGetDatum(jbv->val.numeric)));
 		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);
 	}
@@ -3492,7 +3492,6 @@ 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;
 	}
 
 	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
@@ -2622,7 +2622,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/include/utils/jsonb.h b/src/include/utils/jsonb.h
@@ -291,7 +291,6 @@ struct JsonbValue
 
 		struct
 		{
-			int			len; /* FIXME remove */
 			const struct JsonContainerData *data;
 		}			binary;		/* Array or object, in on-disk format */
 

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,6 @@ jsonvArrayIteratorNext(JsonIterator *it, JsonValue res, bool skipNested)`
`393`	`393`	`{`
`394`	`394`	`Assert(res->type == jbvArray \|\| res->type == jbvObject);`
`395`	`395`	`res->val.binary.data = JsonValueToContainer(val);`
`396`		`- res->val.binary.len = 0;`
`397`	`396`	`res->type = jbvBinary;`
`398`	`397`	`}`
`399`	`398`	`}`
`@@ -445,7 +444,6 @@ jsonvObjectIteratorNext(JsonIterator *it, JsonValue res, bool skipNested)`
`445`	`444`	`{`
`446`	`445`	`Assert(res->type == jbvArray \|\| res->type == jbvObject);`
`447`	`446`	`res->val.binary.data = JsonValueToContainer(&pair->value);`
`448`		`- res->val.binary.len = 0;`
`449`	`447`	`res->type = jbvBinary;`
`450`	`448`	`}`
`451`	`449`	`}`
`@@ -569,7 +567,6 @@ jsonvFindKeyInObject(JsonContainer objc, const char key, int len,`
`569`	`567`
`570`	`568`	`jv->type = jbvBinary;`
`571`	`569`	`jv->val.binary.data = jc;`
`572`		`- jv->val.binary.len = jc->len;`
`573`	`570`	`}`
`574`	`571`	`else`
`575`	`572`	`*jv = pair->value;`
`@@ -703,7 +700,6 @@ JsonToJsonValue(Json json, JsonValue jv)`
`703`	`700`
`704`	`701`	`jv->type = jbvBinary;`
`705`	`702`	`jv->val.binary.data = &json->root;`
`706`		`- jv->val.binary.len = json->root.len;`
`707`	`703`
`708`	`704`	`return jv;`
`709`	`705`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ JsonContainerFlatten(JsonContainer *jc, JsonValueEncoder encoder,`
`138`	`138`	`{`
`139`	`139`	`jbv.type = jbvBinary;`
`140`	`140`	`jbv.val.binary.data = jc;`
`141`		`- jbv.val.binary.len = jc->len;`
	`141`	`+`
`142`	`142`	`binary = &jbv;`
`143`	`143`	`}`
`144`	`144`
`@@ -645,7 +645,6 @@ fillJsonbValue(const JsonbContainer *container, int index,`
`645`	`645`	`(JsonbContainer *)(base_addr + INTALIGN(offset)),`
`646`	`646`	`getJsonbLength(container, index) -`
`647`	`647`	`(INTALIGN(offset) - offset));`
`648`		`- result->val.binary.len = result->val.binary.data->len;`
`649`	`648`	`}`
`650`	`649`	`}`
`651`	`650`
Original file line number	Diff line number	Diff line change
`@@ -2622,7 +2622,6 @@ JsonbInitBinary(JsonbValue jbv, Jsonb jb)`
`2622`	`2622`	`{`
`2623`	`2623`	`jbv->type = jbvBinary;`
`2624`	`2624`	`jbv->val.binary.data = &jb->root;`
`2625`		`- jbv->val.binary.len = VARSIZE_ANY_EXHDR(jb);`
`2626`	`2625`
`2627`	`2626`	`return jbv;`
`2628`	`2627`	`}`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,6 @@ struct JsonbValue`
`291`	`291`
`292`	`292`	`struct`
`293`	`293`	`{`
`294`		`- int len; /* FIXME remove */`
`295`	`294`	`const struct JsonContainerData *data;`
`296`	`295`	`} binary; /* Array or object, in on-disk format */`
`297`	`296`