Changeset: b2c7d26167f9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b2c7d26167f9
Added Files:
sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.sql
sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.err
sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.out
Modified Files:
monetdb5/modules/atoms/str.c
sql/test/BugTracker-2021/Tests/All
Branch: Oct2020
Log Message:
Added test and fix for bug #7126 After retrieving the unicode value from a UTF8
character, don't test for UTF8 character length, because that comparison may
give false positives on some characters
diffs (101 lines):
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -3230,7 +3230,7 @@ convertCase(BAT *from, BAT *to, str *res
int c;
UTF8_GETCHAR(c, src);
- if ((c & 0x80) == 0) {
+ if (c < 192) { /* the first 191 characters in unicode
are trivial to convert */
/* for ASCII characters we don't need to do a
hash
* lookup */
if (lower_to_upper) {
diff --git a/sql/test/BugTracker-2021/Tests/All
b/sql/test/BugTracker-2021/Tests/All
--- a/sql/test/BugTracker-2021/Tests/All
+++ b/sql/test/BugTracker-2021/Tests/All
@@ -5,3 +5,4 @@ ntile-wrong-result.Bug-7104
union-groupby.Bug-7108
merge-stmt.wrong-error.Bug-7109
remote-table-groupby.Bug-7110
+lowercase-crylic.Bug-7126
diff --git a/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.sql
b/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.sql
@@ -0,0 +1,1 @@
+select lower('ASDFasdfФЫВАфыва'), upper('ASDFasdfФЫВАфыва'), lower('ÀA'),
upper('àa');
diff --git
a/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.err
b/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.err
@@ -0,0 +1,29 @@
+stderr of test 'lowercase-crylic.Bug-7126` in directory
'sql/test/BugTracker-2021` itself:
+
+
+# 15:33:54 >
+# 15:33:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_listenaddr=all" "--set" "mapi_port=39171" "--set"
"mapi_usock=/var/tmp/mtest-317429/.s.monetdb.39171" "--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2021"
"--set" "embedded_r=yes" "--set" "embedded_c=true"
+# 15:33:54 >
+
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/monetdb5/dbfarm/demo
+# builtin opt mapi_port = 50000
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# builtin opt raw_strings = false
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_listenaddr = all
+# cmdline opt mapi_port = 39171
+# cmdline opt mapi_usock = /var/tmp/mtest-317429/.s.monetdb.39171
+# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2021
+# cmdline opt embedded_r = yes
+# cmdline opt embedded_c = true
+
+# 15:33:54 >
+# 15:33:54 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-317429" "--port=39171"
+# 15:33:54 >
+
+
+# 15:33:54 >
+# 15:33:54 > "Done."
+# 15:33:54 >
+
diff --git
a/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.out
b/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2021/Tests/lowercase-crylic.Bug-7126.stable.out
@@ -0,0 +1,36 @@
+stdout of test 'lowercase-crylic.Bug-7126` in directory
'sql/test/BugTracker-2021` itself:
+
+
+# 15:33:54 >
+# 15:33:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_listenaddr=all" "--set" "mapi_port=39171" "--set"
"mapi_usock=/var/tmp/mtest-317429/.s.monetdb.39171" "--forcemito"
"--dbpath=/home/ferreira/repositories/MonetDB-Oct2020/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2021"
"--set" "embedded_r=yes" "--set" "embedded_c=true"
+# 15:33:54 >
+
+# MonetDB 5 server v11.39.18 (hg id: af88b10dddb7)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2021', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 15.343 GiB available main-memory of which we use 12.504 GiB
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2021 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://fedora:39171/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-317429/.s.monetdb.39171
+# MonetDB/GIS module loaded
+# MonetDB/R module loaded
+# MonetDB/SQL module loaded
+
+# 15:33:54 >
+# 15:33:54 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-317429" "--port=39171"
+# 15:33:54 >
+
+#select lower('ASDFasdfФЫВАфыва'), upper('ASDFasdfФЫВАфыва'), lower('ÀA'),
upper('àa');
+% .%2, .%3, .%4, .%5 # table_name
+% %2, %3, %4, %5 # name
+% varchar, varchar, varchar, varchar # type
+% 16, 16, 2, 2 # length
+[ "asdfasdfфывафыва", "ASDFASDFФЫВАФЫВА", "àa", "ÀA" ]
+
+# 15:33:54 >
+# 15:33:54 > "Done."
+# 15:33:54 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
