Correct a mistake in levenshtein_less_equal() multibyte character handling.

robertmhaas · robertmhaas · commit dd1587089c3d · 2010-10-22T15:27:39.000-04:00
Spotted by Alexander Korotkov.

Along the way, remove a misleading comment line.
diff --git a/contrib/fuzzystrmatch/levenshtein.c b/contrib/fuzzystrmatch/levenshtein.c
@@ -5,7 +5,6 @@
  *
  * Joe Conway <mail@joeconway.com>
  *
- * contrib/fuzzystrmatch/fuzzystrmatch.c
  * Copyright (c) 2001-2010, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
@@ -378,7 +377,7 @@ levenshtein_internal(text *s, text *t,
 				prev[start_column] = max_d + 1;
 				curr[start_column] = max_d + 1;
 				if (start_column != 0)
-					s_data += n != t_bytes + 1 ? pg_mblen(s_data) : 1;
+					s_data += s_char_len != NULL ? s_char_len[i - 1] : 1;
 				start_column++;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`*`
`6`	`6`	`* Joe Conway <mail@joeconway.com>`
`7`	`7`	`*`
`8`		`- * contrib/fuzzystrmatch/fuzzystrmatch.c`
`9`	`8`	`* Copyright (c) 2001-2010, PostgreSQL Global Development Group`
`10`	`9`	`* ALL RIGHTS RESERVED;`
`11`	`10`	`*`
`@@ -378,7 +377,7 @@ levenshtein_internal(text s, text t,`
`378`	`377`	`prev[start_column] = max_d + 1;`
`379`	`378`	`curr[start_column] = max_d + 1;`
`380`	`379`	`if (start_column != 0)`
`381`		`- s_data += n != t_bytes + 1 ? pg_mblen(s_data) : 1;`
	`380`	`+ s_data += s_char_len != NULL ? s_char_len[i - 1] : 1;`
`382`	`381`	`start_column++;`
`383`	`382`	`}`
`384`	`383`