Make text octet_length() return non-compressed length to be consistent

bmomjian · bmomjian · commit 6f6567812e46 · 2001-11-19T18:21:10.000Z
with other data types, per disucssion.  Encoding issue still open.
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.76 2001/11/19 09:05:02 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.77 2001/11/19 18:21:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -256,20 +256,13 @@ textlen(PG_FUNCTION_ARGS)
  * textoctetlen -
  *	  returns the physical length of a text*
  *	   (which is less than the VARSIZE of the text*)
- *
- * XXX is it actually appropriate to return the compressed length
- * when the value is compressed?  It's not at all clear to me that
- * this is what SQL92 has in mind ...
  */
 Datum
 textoctetlen(PG_FUNCTION_ARGS)
 {
-	struct varattrib *t = (struct varattrib *) PG_GETARG_RAW_VARLENA_P(0);
-
-	if (!VARATT_IS_EXTERNAL(t))
-		PG_RETURN_INT32(VARATT_SIZE(t) - VARHDRSZ);
+	text    *arg = PG_GETARG_VARCHAR_P(0);
 
-	PG_RETURN_INT32(t->va_content.va_external.va_extsize);
+	PG_RETURN_INT32(VARSIZE(arg) - VARHDRSZ);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.76 2001/11/19 09:05:02 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.77 2001/11/19 18:21:10 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -256,20 +256,13 @@ textlen(PG_FUNCTION_ARGS)`
`256`	`256`	`* textoctetlen -`
`257`	`257`	`* returns the physical length of a text*`
`258`	`258`	`* (which is less than the VARSIZE of the text*)`
`259`		`- *`
`260`		`- * XXX is it actually appropriate to return the compressed length`
`261`		`- * when the value is compressed? It's not at all clear to me that`
`262`		`- * this is what SQL92 has in mind ...`
`263`	`259`	`*/`
`264`	`260`	`Datum`
`265`	`261`	`textoctetlen(PG_FUNCTION_ARGS)`
`266`	`262`	`{`
`267`		`- struct varattrib t = (struct varattrib ) PG_GETARG_RAW_VARLENA_P(0);`
`268`		`-`
`269`		`- if (!VARATT_IS_EXTERNAL(t))`
`270`		`- PG_RETURN_INT32(VARATT_SIZE(t) - VARHDRSZ);`
	`263`	`+ text *arg = PG_GETARG_VARCHAR_P(0);`
`271`	`264`
`272`		`- PG_RETURN_INT32(t->va_content.va_external.va_extsize);`
	`265`	`+ PG_RETURN_INT32(VARSIZE(arg) - VARHDRSZ);`
`273`	`266`	`}`
`274`	`267`
`275`	`268`	`/*`