Changeset: 4a7ab58ad31a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a7ab58ad31a
Added Files:
sql/test/BugTracker-2017/Tests/case.Bug-6386.sql
sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.err
sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.out
sql/test/BugTracker-2017/Tests/exists.Bug-6392.sql
sql/test/BugTracker-2017/Tests/exists.Bug-6392.stable.err
sql/test/BugTracker-2017/Tests/exists.Bug-6392.stable.out
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql_rank.mal
sql/server/sql_semantic.c
sql/test/BugTracker-2017/Tests/All
sql/test/Tests/coalesce.stable.out
Branch: Jul2017
Log Message:
fixed bugs 6386 and 6392
diffs (truncated from 357 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -95,7 +95,7 @@ Ready.
[ "aggr", "covar", "function aggr.covar(e1:bat[:sht],
e2:bat[:sht]):sht;", "", "" ]
[ "aggr", "exist", "command aggr.exist(b:bat[:any_2], h:any_1):bit
", "ALGexist;", "" ]
[ "aggr", "exist", "command aggr.exist(b:bat[:any_2]):bit ",
"SQLexist;", "" ]
-[ "aggr", "exist", "command aggr.exist(v:any_2):bit ",
"SQLexist_val;", "" ]
+[ "aggr", "exist", "pattern aggr.exist(v:any_2):bit ",
"SQLexist_val;", "" ]
[ "aggr", "jsonaggr", "command aggr.jsonaggr(val:bat[:dbl]):str ",
"JSONgroupStr;", "Aggregate the double values to array." ]
[ "aggr", "jsonaggr", "command aggr.jsonaggr(val:bat[:str]):str ",
"JSONgroupStr;", "Aggregate the string values to array." ]
[ "aggr", "max", "command aggr.max(b:bat[:any_1], g:bat[:oid],
e:bat[:any_2]):bat[:any_1] ", "AGGRmax3;", "" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -103,7 +103,7 @@ Ready.
[ "aggr", "covar", "function aggr.covar(e1:bat[:sht],
e2:bat[:sht]):sht;", "", "" ]
[ "aggr", "exist", "command aggr.exist(b:bat[:any_2], h:any_1):bit
", "ALGexist;", "" ]
[ "aggr", "exist", "command aggr.exist(b:bat[:any_2]):bit ",
"SQLexist;", "" ]
-[ "aggr", "exist", "command aggr.exist(v:any_2):bit ",
"SQLexist_val;", "" ]
+[ "aggr", "exist", "pattern aggr.exist(v:any_2):bit ",
"SQLexist_val;", "" ]
[ "aggr", "jsonaggr", "command aggr.jsonaggr(val:bat[:dbl]):str ",
"JSONgroupStr;", "Aggregate the double values to array." ]
[ "aggr", "jsonaggr", "command aggr.jsonaggr(val:bat[:str]):str ",
"JSONgroupStr;", "Aggregate the string values to array." ]
[ "aggr", "max", "command aggr.max(b:bat[:any_1], g:bat[:oid],
e:bat[:any_2]):bat[:any_1] ", "AGGRmax3;", "" ]
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -4602,9 +4602,14 @@ SQLflush_log(void *ret)
}
str
-SQLexist_val(bit *res, void *v)
+SQLexist_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
- if (v)
+ bit *res = getArgReference_bit(stk, pci, 0);
+ ptr v = getArgReference(stk, pci, 1);
+ int mtype = getArgType(mb, pci, 1);
+
+ (void)cntxt;
+ if (ATOMcmp(mtype, v, ATOMnilptr(mtype)) != 0)
*res = TRUE;
else
*res = FALSE;
diff --git a/sql/backends/monet5/sql.h b/sql/backends/monet5/sql.h
--- a/sql/backends/monet5/sql.h
+++ b/sql/backends/monet5/sql.h
@@ -316,6 +316,6 @@ sql5_export str BATSTRstrings(bat *res,
sql5_export str SQLflush_log(void *ret);
sql5_export str SQLexist(bit *res, bat *id);
-sql5_export str SQLexist_val(bit *res, void *val);
+sql5_export str SQLexist_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
#endif /* _SQL_H */
diff --git a/sql/backends/monet5/sql_rank.mal b/sql/backends/monet5/sql_rank.mal
--- a/sql/backends/monet5/sql_rank.mal
+++ b/sql/backends/monet5/sql_rank.mal
@@ -53,5 +53,5 @@ address ALGexist;
command aggr.exist(b:bat[:any_2]):bit
address SQLexist;
-command aggr.exist(v:any_2):bit
+pattern aggr.exist(v:any_2):bit
address SQLexist_val;
diff --git a/sql/server/sql_semantic.c b/sql/server/sql_semantic.c
--- a/sql/server/sql_semantic.c
+++ b/sql/server/sql_semantic.c
@@ -200,11 +200,12 @@ supertype(sql_subtype *super, sql_subtyp
int idigits = i->digits;
int rdigits = r->digits;
unsigned int scale = sql_max(i->scale, r->scale);
+ sql_subtype lsuper;
- *super = *r;
+ lsuper = *r;
if (i->type->base.id > r->type->base.id ||
(EC_VARCHAR(i->type->eclass) && !EC_VARCHAR(r->type->eclass))) {
- *super = *i;
+ lsuper = *i;
radix = i->type->radix;
tpe = i->type->sqlname;
}
@@ -226,11 +227,12 @@ supertype(sql_subtype *super, sql_subtyp
}
}
if (scale == 0 && (idigits == 0 || rdigits == 0)) {
- sql_find_subtype(super, tpe, 0, 0);
+ sql_find_subtype(&lsuper, tpe, 0, 0);
} else {
digits = sql_max(idigits - i->scale, rdigits - r->scale);
- sql_find_subtype(super, tpe, digits+scale, scale);
+ sql_find_subtype(&lsuper, tpe, digits+scale, scale);
}
+ *super = lsuper;
return super;
}
diff --git a/sql/test/BugTracker-2017/Tests/All
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -63,3 +63,5 @@ handle-values-subqueries.Bug-6336
spurious_errors.Bug-6344
caching_stats_bug.6374
HAVE_LIBPY?aggr_udf_with_more_than_2params.Bug-6385
+exists.Bug-6392
+case.Bug-6386
diff --git a/sql/test/BugTracker-2017/Tests/case.Bug-6386.sql
b/sql/test/BugTracker-2017/Tests/case.Bug-6386.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/case.Bug-6386.sql
@@ -0,0 +1,1 @@
+select case name when 'types' then 1 when 'args' then 60.3281 when 'keys' then
0.8415381117315 else 0 end as t1 from tables;
diff --git a/sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.err
b/sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'case.Bug-6386` in directory 'sql/test/BugTracker-2017` itself:
+
+
+# 18:14:34 >
+# 18:14:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33907" "--set"
"mapi_usock=/var/tmp/mtest-10620/.s.monetdb.33907" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 18:14:34 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/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 = 33907
+# cmdline opt mapi_usock = /var/tmp/mtest-10620/.s.monetdb.33907
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 18:14:35 >
+# 18:14:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10620" "--port=33907"
+# 18:14:35 >
+
+
+# 18:14:35 >
+# 18:14:35 > "Done."
+# 18:14:35 >
+
diff --git a/sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.out
b/sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.out
@@ -0,0 +1,97 @@
+stdout of test 'case.Bug-6386` in directory 'sql/test/BugTracker-2017` itself:
+
+
+# 18:14:34 >
+# 18:14:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33907" "--set"
"mapi_usock=/var/tmp/mtest-10620/.s.monetdb.33907" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 18:14:34 >
+
+# MonetDB 5 server v11.27.4
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.331 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:33907/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-10620/.s.monetdb.33907
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 18:14:35 >
+# 18:14:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10620" "--port=33907"
+# 18:14:35 >
+
+#select case name when 'types' then 1 when 'args' then 60.3281 when 'keys'
then 0.8415381117315 else 0 end as t1 from tables;
+% .L40 # table_name
+% t1 # name
+% decimal # type
+% 18 # length
+[ 0.0000000000000 ]
+[ 1.0000000000000 ]
+[ 0.0000000000000 ]
+[ 60.3281000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.8415381117315 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.8415381117315 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+[ 0.0000000000000 ]
+
+# 18:14:35 >
+# 18:14:35 > "Done."
+# 18:14:35 >
+
diff --git a/sql/test/BugTracker-2017/Tests/exists.Bug-6392.sql
b/sql/test/BugTracker-2017/Tests/exists.Bug-6392.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/exists.Bug-6392.sql
@@ -0,0 +1,3 @@
+CREATE TABLE foo(i INT);
+SELECT EXISTS (SELECT i FROM foo WHERE FALSE);
+DROP table foo;
diff --git a/sql/test/BugTracker-2017/Tests/exists.Bug-6392.stable.err
b/sql/test/BugTracker-2017/Tests/exists.Bug-6392.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/exists.Bug-6392.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'exists.Bug-6392` in directory 'sql/test/BugTracker-2017`
itself:
+
+
+# 18:14:34 >
+# 18:14:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33907" "--set"
"mapi_usock=/var/tmp/mtest-10620/.s.monetdb.33907" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 18:14:34 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/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 = 33907
+# cmdline opt mapi_usock = /var/tmp/mtest-10620/.s.monetdb.33907
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 18:14:34 >
+# 18:14:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10620" "--port=33907"
+# 18:14:34 >
+
+
+# 18:14:34 >
+# 18:14:34 > "Done."
+# 18:14:34 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
