From: Heikki Linnakangas <heikki@enterprisedb.com>
Date: Tue, 2 Dec 2008 11:30:53 +0000 (+0000)
Subject: Use PG_GETARG_TEXT_PP instead of PG_GETARG_TEXT_P in the new
X-Git-Tag: recoveryinfrav9~250
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=ef8672fece0246054d599aa86416b4f97a15526b;p=users%2Fsimon%2Fpostgres.git

Use PG_GETARG_TEXT_PP instead of PG_GETARG_TEXT_P in the new
gin_cmp_tslexeme and gin_cmp_prefix functions. Should shave off a few
cycles from GIN operations.
---

diff --git a/src/backend/utils/adt/tsginidx.c b/src/backend/utils/adt/tsginidx.c
index 02d0a533d4..88cf224f31 100644
--- a/src/backend/utils/adt/tsginidx.c
+++ b/src/backend/utils/adt/tsginidx.c
@@ -22,13 +22,13 @@
 Datum
 gin_cmp_tslexeme(PG_FUNCTION_ARGS)
 {
-	text    *a = PG_GETARG_TEXT_P(0);
-	text    *b = PG_GETARG_TEXT_P(1);
+	text    *a = PG_GETARG_TEXT_PP(0);
+	text    *b = PG_GETARG_TEXT_PP(1);
 	int     cmp;
 
 	cmp = tsCompareString(
-					VARDATA(a), VARSIZE(a) - VARHDRSZ,
-					VARDATA(b), VARSIZE(b) - VARHDRSZ,
+					VARDATA_ANY(a), VARSIZE_ANY_EXHDR(a),
+					VARDATA_ANY(b), VARSIZE_ANY_EXHDR(b),
 					false );
 
 	PG_FREE_IF_COPY(a,0);
@@ -39,16 +39,16 @@ gin_cmp_tslexeme(PG_FUNCTION_ARGS)
 Datum
 gin_cmp_prefix(PG_FUNCTION_ARGS)
 {
-	text    *a = PG_GETARG_TEXT_P(0);
-	text    *b = PG_GETARG_TEXT_P(1);
+	text    *a = PG_GETARG_TEXT_PP(0);
+	text    *b = PG_GETARG_TEXT_PP(1);
 #ifdef NOT_USED
 	StrategyNumber strategy = PG_GETARG_UINT16(2);
 #endif
 	int     cmp;
 
 	cmp = tsCompareString(
-					VARDATA(a), VARSIZE(a) - VARHDRSZ,
-					VARDATA(b), VARSIZE(b) - VARHDRSZ,
+					VARDATA_ANY(a), VARSIZE_ANY_EXHDR(a),
+					VARDATA_ANY(b), VARSIZE_ANY_EXHDR(b),
 					true );
 
 	if ( cmp < 0 )