Remove JsonValue.val.binary.len field

Author: Nikita Glukhov

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;
 }

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;

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;
 	}
 }
 

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,

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;
 }

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 */