NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8f12541

committed

Cleanup of varchar.

1 parent84ef6aa commit8f12541Copy full SHA for 8f12541

File tree

1 file changed

+18

-33

lines changed

src/backend/utils/adt
- varchar.c

1 file changed

+18

-33

lines changed

`‎src/backend/utils/adt/varchar.c`

Lines changed: 18 additions & 33 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.22 1998/01/0804:58:19 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.23 1998/01/0806:18:18 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -327,29 +327,13 @@ bpcharcmp(char arg1, char arg2)`
`327`	`327`	`*Comparison Functions used for varchar`
`328`	`328`	`*****************************************************************************/`
`329`	`329`
`330`		`-staticint`
`331`		`-vcTruelen(char*arg)`
`332`		`-{`
`333`		`-char*s=VARDATA(arg);`
`334`		`-inti;`
`335`		`-intlen;`
`336`		`-`
`337`		`-len=VARSIZE(arg)-VARHDRSZ;`
`338`		`-for (i=0;i<len;i++)`
`339`		`-{`
`340`		`-if (*s++=='\0')`
`341`		`-break;`
`342`		`-}`
`343`		`-returni;`
`344`		`-}`
`345`		`-`
`346`	`330`	`int32`
`347`	`331`	`varcharlen(char*arg)`
`348`	`332`	`{`
`349`	`333`	`if (!PointerIsValid(arg))`
`350`	`334`	`elog(ERROR,"Bad (null) varchar() external representation",NULL);`
`351`	`335`
`352`		`-return(vcTruelen(arg));`
	`336`	`+return(VARSIZE(arg)-VARHDRSZ);`
`353`	`337`	`}`
`354`	`338`
`355`	`339`	`bool`
`@@ -360,8 +344,9 @@ varchareq(char arg1, char arg2)`
`360`	`344`
`361`	`345`	`if (arg1==NULL\|\|arg2==NULL)`
`362`	`346`	`return ((bool)0);`
`363`		`-len1=vcTruelen(arg1);`
`364`		`-len2=vcTruelen(arg2);`
	`347`	`+`
	`348`	`+len1=VARSIZE(arg1)-VARHDRSZ;`
	`349`	`+len2=VARSIZE(arg2)-VARHDRSZ;`
`365`	`350`
`366`	`351`	`if (len1!=len2)`
`367`	`352`	`return0;`
`@@ -377,8 +362,8 @@ varcharne(char arg1, char arg2)`
`377`	`362`
`378`	`363`	`if (arg1==NULL\|\|arg2==NULL)`
`379`	`364`	`return ((bool)0);`
`380`		`-len1=vcTruelen(arg1);`
`381`		`-len2=vcTruelen(arg2);`
	`365`	`+len1=VARSIZE(arg1)-VARHDRSZ;`
	`366`	`+len2=VARSIZE(arg2)-VARHDRSZ;`
`382`	`367`
`383`	`368`	`if (len1!=len2)`
`384`	`369`	`return1;`
`@@ -395,8 +380,8 @@ varcharlt(char arg1, char arg2)`
`395`	`380`
`396`	`381`	`if (arg1==NULL\|\|arg2==NULL)`
`397`	`382`	`return ((bool)0);`
`398`		`-len1=vcTruelen(arg1);`
`399`		`-len2=vcTruelen(arg2);`
	`383`	`+len1=VARSIZE(arg1)-VARHDRSZ;`
	`384`	`+len2=VARSIZE(arg2)-VARHDRSZ;`
`400`	`385`
`401`	`386`	`cmp=strncmp(VARDATA(arg1),VARDATA(arg2),Min(len1,len2));`
`402`	`387`	`if (cmp==0)`
`@@ -414,8 +399,8 @@ varcharle(char arg1, char arg2)`
`414`	`399`
`415`	`400`	`if (arg1==NULL\|\|arg2==NULL)`
`416`	`401`	`return ((bool)0);`
`417`		`-len1=vcTruelen(arg1);`
`418`		`-len2=vcTruelen(arg2);`
	`402`	`+len1=VARSIZE(arg1)-VARHDRSZ;`
	`403`	`+len2=VARSIZE(arg2)-VARHDRSZ;`
`419`	`404`
`420`	`405`	`cmp=strncmp(VARDATA(arg1),VARDATA(arg2),Min(len1,len2));`
`421`	`406`	`if (0==cmp)`
`@@ -433,8 +418,8 @@ varchargt(char arg1, char arg2)`
`433`	`418`
`434`	`419`	`if (arg1==NULL\|\|arg2==NULL)`
`435`	`420`	`return ((bool)0);`
`436`		`-len1=vcTruelen(arg1);`
`437`		`-len2=vcTruelen(arg2);`
	`421`	`+len1=VARSIZE(arg1)-VARHDRSZ;`
	`422`	`+len2=VARSIZE(arg2)-VARHDRSZ;`
`438`	`423`
`439`	`424`	`cmp=strncmp(VARDATA(arg1),VARDATA(arg2),Min(len1,len2));`
`440`	`425`	`if (cmp==0)`
`@@ -452,8 +437,8 @@ varcharge(char arg1, char arg2)`
`452`	`437`
`453`	`438`	`if (arg1==NULL\|\|arg2==NULL)`
`454`	`439`	`return ((bool)0);`
`455`		`-len1=vcTruelen(arg1);`
`456`		`-len2=vcTruelen(arg2);`
	`440`	`+len1=VARSIZE(arg1)-VARHDRSZ;`
	`441`	`+len2=VARSIZE(arg2)-VARHDRSZ;`
`457`	`442`
`458`	`443`	`cmp=strncmp(VARDATA(arg1),VARDATA(arg2),Min(len1,len2));`
`459`	`444`	`if (0==cmp)`
`@@ -470,8 +455,8 @@ varcharcmp(char arg1, char arg2)`
`470`	`455`	`len2;`
`471`	`456`	`intcmp;`
`472`	`457`
`473`		`-len1=vcTruelen(arg1);`
`474`		`-len2=vcTruelen(arg2);`
	`458`	`+len1=VARSIZE(arg1)-VARHDRSZ;`
	`459`	`+len2=VARSIZE(arg2)-VARHDRSZ;`
`475`	`460`	`cmp= (strncmp(VARDATA(arg1),VARDATA(arg2),Min(len1,len2)));`
`476`	`461`	`if ((0==cmp)&& (len1!=len2))`
`477`	`462`	`return (int32) (len1<len2 ?-1 :1);`
`@@ -536,7 +521,7 @@ hashvarchar(struct varlena * key)`
`536`	`521`	`intloop;`
`537`	`522`
`538`	`523`	`keydata=VARDATA(key);`
`539`		`-keylen=vcTruelen((char*)key);`
	`524`	`+keylen=VARSIZE(key)-VARHDRSZ;`
`540`	`525`
`541`	`526`	`#defineHASHCn = keydata++ + 65599 n`
`542`	`527`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8f12541

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/varchar.c`

0 commit comments