Remove useless character-length checks in contrib/ltree.

tglsfdc · tglsfdc · commit 58640f37d9ac · 2022-10-06T11:18:32.000-04:00
The t_iseq() macro does not need to be guarded by a character length check (at least when the comparison value is an ASCII character, as its documentation requires). Some portions of contrib/ltree hadn't read that memo, so simplify them. The last change in gettoken_query, - else if (charlen == 1 && !t_iseq(state->buf, ' ')) + else if (!t_iseq(state->buf, ' ')) looks like it's actually a bug fix: I doubt that the intention was to silently ignore multibyte characters as if they were whitespace. I'm not tempted to back-patch though, because this will have the effect of tightening what is allowed in ltxtquery strings. Discussion: https://postgr.es/m/2548310.1664999615@sss.pgh.pa.us
diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c
@@ -25,17 +25,16 @@ static char *
 getlexeme(char *start, char *end, int *len)
 {
 	char	   *ptr;
-	int			charlen;
 
-	while (start < end && (charlen = pg_mblen(start)) == 1 && t_iseq(start, '_'))
-		start += charlen;
+	while (start < end && t_iseq(start, '_'))
+		start += pg_mblen(start);
 
 	ptr = start;
 	if (ptr >= end)
 		return NULL;
 
-	while (ptr < end && !((charlen = pg_mblen(ptr)) == 1 && t_iseq(ptr, '_')))
-		ptr += charlen;
+	while (ptr < end && !t_iseq(ptr, '_'))
+		ptr += pg_mblen(ptr);
 
 	*len = ptr - start;
 	return start;
diff --git a/contrib/ltree/ltree.h b/contrib/ltree/ltree.h
@@ -126,7 +126,7 @@ typedef struct
 
 #define LQUERY_HASNOT		0x01
 
-#define ISALNUM(x)	( t_isalnum(x) || ( pg_mblen(x) == 1 && t_iseq((x), '_') ) )
+#define ISALNUM(x)	( t_isalnum(x) || t_iseq(x, '_') )
 
 /* full text query */
 
diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c
@@ -64,13 +64,13 @@ gettoken_query(QPRS_STATE *state, int32 *val, int32 *lenval, char **strval, uint
 		switch (state->state)
 		{
 			case WAITOPERAND:
-				if (charlen == 1 && t_iseq(state->buf, '!'))
+				if (t_iseq(state->buf, '!'))
 				{
 					(state->buf)++;
 					*val = (int32) '!';
 					return OPR;
 				}
-				else if (charlen == 1 && t_iseq(state->buf, '('))
+				else if (t_iseq(state->buf, '('))
 				{
 					state->count++;
 					(state->buf)++;
@@ -97,11 +97,11 @@ gettoken_query(QPRS_STATE *state, int32 *val, int32 *lenval, char **strval, uint
 								 errmsg("modifiers syntax error")));
 					*lenval += charlen;
 				}
-				else if (charlen == 1 && t_iseq(state->buf, '%'))
+				else if (t_iseq(state->buf, '%'))
 					*flag |= LVAR_SUBLEXEME;
-				else if (charlen == 1 && t_iseq(state->buf, '@'))
+				else if (t_iseq(state->buf, '@'))
 					*flag |= LVAR_INCASE;
-				else if (charlen == 1 && t_iseq(state->buf, '*'))
+				else if (t_iseq(state->buf, '*'))
 					*flag |= LVAR_ANYEND;
 				else
 				{
@@ -110,22 +110,22 @@ gettoken_query(QPRS_STATE *state, int32 *val, int32 *lenval, char **strval, uint
 				}
 				break;
 			case WAITOPERATOR:
-				if (charlen == 1 && (t_iseq(state->buf, '&') || t_iseq(state->buf, '|')))
+				if (t_iseq(state->buf, '&') || t_iseq(state->buf, '|'))
 				{
 					state->state = WAITOPERAND;
 					*val = (int32) *(state->buf);
 					(state->buf)++;
 					return OPR;
 				}
-				else if (charlen == 1 && t_iseq(state->buf, ')'))
+				else if (t_iseq(state->buf, ')'))
 				{
 					(state->buf)++;
 					state->count--;
 					return (state->count < 0) ? ERR : CLOSE;
 				}
 				else if (*(state->buf) == '\0')
 					return (state->count) ? ERR : END;
-				else if (charlen == 1 && !t_iseq(state->buf, ' '))
+				else if (!t_iseq(state->buf, ' '))
 					return ERR;
 				break;
 			default:

Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,13 @@ gettoken_query(QPRS_STATE state, int32 val, int32 lenval, char *strval, uint`
`64`	`64`	`switch (state->state)`
`65`	`65`	`{`
`66`	`66`	`case WAITOPERAND:`
`67`		`- if (charlen == 1 && t_iseq(state->buf, '!'))`
	`67`	`+ if (t_iseq(state->buf, '!'))`
`68`	`68`	`{`
`69`	`69`	`(state->buf)++;`
`70`	`70`	`*val = (int32) '!';`
`71`	`71`	`return OPR;`
`72`	`72`	`}`
`73`		`- else if (charlen == 1 && t_iseq(state->buf, '('))`
	`73`	`+ else if (t_iseq(state->buf, '('))`
`74`	`74`	`{`
`75`	`75`	`state->count++;`
`76`	`76`	`(state->buf)++;`
`@@ -97,11 +97,11 @@ gettoken_query(QPRS_STATE state, int32 val, int32 lenval, char *strval, uint`
`97`	`97`	`errmsg("modifiers syntax error")));`
`98`	`98`	`*lenval += charlen;`
`99`	`99`	`}`
`100`		`- else if (charlen == 1 && t_iseq(state->buf, '%'))`
	`100`	`+ else if (t_iseq(state->buf, '%'))`
`101`	`101`	`*flag \|= LVAR_SUBLEXEME;`
`102`		`- else if (charlen == 1 && t_iseq(state->buf, '@'))`
	`102`	`+ else if (t_iseq(state->buf, '@'))`
`103`	`103`	`*flag \|= LVAR_INCASE;`
`104`		`- else if (charlen == 1 && t_iseq(state->buf, '*'))`
	`104`	`+ else if (t_iseq(state->buf, '*'))`
`105`	`105`	`*flag \|= LVAR_ANYEND;`
`106`	`106`	`else`
`107`	`107`	`{`
`@@ -110,22 +110,22 @@ gettoken_query(QPRS_STATE state, int32 val, int32 lenval, char *strval, uint`
`110`	`110`	`}`
`111`	`111`	`break;`
`112`	`112`	`case WAITOPERATOR:`
`113`		`- if (charlen == 1 && (t_iseq(state->buf, '&') \|\| t_iseq(state->buf, '\|')))`
	`113`	`+ if (t_iseq(state->buf, '&') \|\| t_iseq(state->buf, '\|'))`
`114`	`114`	`{`
`115`	`115`	`state->state = WAITOPERAND;`
`116`	`116`	`val = (int32) (state->buf);`
`117`	`117`	`(state->buf)++;`
`118`	`118`	`return OPR;`
`119`	`119`	`}`
`120`		`- else if (charlen == 1 && t_iseq(state->buf, ')'))`
	`120`	`+ else if (t_iseq(state->buf, ')'))`
`121`	`121`	`{`
`122`	`122`	`(state->buf)++;`
`123`	`123`	`state->count--;`
`124`	`124`	`return (state->count < 0) ? ERR : CLOSE;`
`125`	`125`	`}`
`126`	`126`	`else if (*(state->buf) == '\0')`
`127`	`127`	`return (state->count) ? ERR : END;`
`128`		`- else if (charlen == 1 && !t_iseq(state->buf, ' '))`
	`128`	`+ else if (!t_iseq(state->buf, ' '))`
`129`	`129`	`return ERR;`
`130`	`130`	`break;`
`131`	`131`	`default:`