Changeset: 0e6e5e0540bb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e6e5e0540bb
Added Files:
sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.sql
sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.stable.err
sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.stable.out
Modified Files:
sql/server/rel_optimizer.c
sql/test/BugTracker-2015/Tests/All
Branch: Jul2015
Log Message:
Fix bug 3811: do not rewrite like select without wildcard if anti flag is set.
diffs (187 lines):
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -5729,7 +5729,7 @@ rel_simplify_like_select(int *changes, m
list *l = e->l;
list *r = e->r;
- if (e->type == e_cmp && get_cmp(e) == cmp_filter &&
strcmp(((sql_subfunc*)e->f)->func->base.name, "like") == 0 && list_length(l) ==
1 && list_length(r) <= 2) {
+ if (e->type == e_cmp && get_cmp(e) == cmp_filter &&
strcmp(((sql_subfunc*)e->f)->func->base.name, "like") == 0 && list_length(l) ==
1 && list_length(r) <= 2 && !(e->flag & ANTISEL)) {
list *r = e->r;
sql_exp *fmt = r->h->data;
sql_exp *esc =
(r->h->next)?r->h->next->data:NULL;
@@ -5771,7 +5771,7 @@ rel_simplify_like_select(int *changes, m
list *l = e->l;
list *r = e->r;
sql_exp *ne = exp_compare(sql->sa,
l->h->data, r->h->data, cmp_equal);
- /* if rewriten don't cache this query */
+ /* if rewritten don't cache this query
*/
list_append(exps, ne);
sql->caching = 0;
(*changes)++;
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
--- a/sql/test/BugTracker-2015/Tests/All
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -62,4 +62,5 @@ local-remotetable-crash.Bug-3754
savepoint.Bug-3738-1
savepoint.Bug-3738-2
string_split.Bug-3564
+not-like-without-wildcard.Bug-3811
copy_into.Bug-3813
diff --git
a/sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.sql
b/sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.sql
@@ -0,0 +1,7 @@
+start transaction;
+create table test (id int, value text);
+insert into test values (1, 'Alice'), (2, 'Bob'), (3, 'Carol');
+select * from test;
+select * from test where value not like 'Bob';
+select * from test where value not ilike 'Bob';
+rollback;
diff --git
a/sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.stable.err
b/sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'not-like-without-wildcard.Bug-3811` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 14:01:49 >
+# 14:01:49 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39434" "--set"
"mapi_usock=/var/tmp/mtest-23077/.s.monetdb.39434" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 14:01:49 >
+
+# builtin opt gdk_dbpath = /home/sjoerd/Monet-stable/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 39434
+# cmdline opt mapi_usock = /var/tmp/mtest-23077/.s.monetdb.39434
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 14:01:50 >
+# 14:01:50 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23077" "--port=39434"
+# 14:01:50 >
+
+
+# 14:01:50 >
+# 14:01:50 > "Done."
+# 14:01:50 >
+
diff --git
a/sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.stable.out
b/sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2015/Tests/not-like-without-wildcard.Bug-3811.stable.out
@@ -0,0 +1,98 @@
+stdout of test 'not-like-without-wildcard.Bug-3811` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 14:01:49 >
+# 14:01:49 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39434" "--set"
"mapi_usock=/var/tmp/mtest-23077/.s.monetdb.39434" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 14:01:49 >
+
+# MonetDB 5 server v11.21.6 (hg id: f593d28ab836+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.733 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://gaai.mullender.nl:39434/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-23077/.s.monetdb.39434
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 14:01:50 >
+# 14:01:50 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23077" "--port=39434"
+# 14:01:50 >
+
+#start transaction;
+#create table test (id int, value text);
+#insert into test values (1, 'Alice'), (2, 'Bob'), (3, 'Carol');
+[ 3 ]
+#select * from test;
+% sys.test, sys.test # table_name
+% id, value # name
+% int, clob # type
+% 1, 5 # length
+[ 1, "Alice" ]
+[ 2, "Bob" ]
+[ 3, "Carol" ]
+#select * from test where value not like 'Bob';
+% sys.test, sys.test # table_name
+% id, value # name
+% int, clob # type
+% 1, 5 # length
+[ 1, "Alice" ]
+[ 3, "Carol" ]
+#select * from test where value not ilike 'Bob';
+% sys.test, sys.test # table_name
+% id, value # name
+% int, clob # type
+% 1, 5 # length
+[ 1, "Alice" ]
+[ 3, "Carol" ]
+#rollback;
+
+# 14:01:50 >
+# 14:01:50 > "Done."
+# 14:01:50 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
