Changeset: 47bb3cb873ea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47bb3cb873ea
Added Files:
sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.sql
sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.err
sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.out
sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.sql
sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.stable.err
sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.stable.out
sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.sql
sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.err
sql/test/BugTracker-2017/Tests/incorrect_error.Bug-6141.stable.out
sql/test/BugTracker-2017/Tests/splitpart.Bug-6194.sql
sql/test/BugTracker-2017/Tests/splitpart.Bug-6194.stable.err
sql/test/BugTracker-2017/Tests/splitpart.Bug-6194.stable.out
sql/test/BugTracker-2017/Tests/union_func_crash.Bug-6196.sql
sql/test/BugTracker-2017/Tests/union_func_crash.Bug-6196.stable.err
sql/test/BugTracker-2017/Tests/union_func_crash.Bug-6196.stable.out
Modified Files:
monetdb5/modules/atoms/str.c
monetdb5/modules/kernel/mmath.mal
monetdb5/optimizer/opt_support.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/sql_mvc.h
sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
sql/test/BugTracker-2017/Tests/All
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (truncated from 741 to 300 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
@@ -1863,11 +1863,11 @@ STRsplitpart(str *res, str *haystack, st
}
if (p == 0) {
- len = UTF8_strlen(s);
+ len = strlen(s);
} else if ((p = strstr(s, s2)) != 0) {
len = (int) (p - s);
} else {
- len = UTF8_strlen(s);
+ len = strlen(s);
}
if (len == int_nil || len == 0) {
diff --git a/monetdb5/modules/kernel/mmath.mal
b/monetdb5/modules/kernel/mmath.mal
--- a/monetdb5/modules/kernel/mmath.mal
+++ b/monetdb5/modules/kernel/mmath.mal
@@ -194,7 +194,7 @@ unsafe command rand () :int
address MATHrandint
comment "return a random number";
-command rand (v:int) :int
+unsafe command rand (v:int) :int
address MATHrandintarg
comment "return a random number";
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -277,7 +277,7 @@ isUnsafeFunction(InstrPtr q)
}
/*
- * Instructions are unsafe is one of the arguments is also mentioned
+ * Instructions are unsafe if one of the arguments is also mentioned
* in the result list. Alternatively, the 'unsafe' property is set
* for the function call itself.
*/
diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -591,6 +591,15 @@ alter_table(Client cntxt, mvc *sql, char
sql_column *nc = mvc_bind_column(sql, nt, c->base.name);
if (c->null != nc->null && isTable(nt)) {
+ if (c->null && nt->pkey) { /* check for primary keys
based on this column */
+ node *m;
+ for(m = nt->pkey->k.columns->h; m; m = m->next)
{
+ sql_kc *kc = m->data;
+
+ if (kc->c->base.id == c->base.id)
+ return sql_message("40000!NOT
NULL CONSTRAINT: cannot change NOT NULL CONSTRAINT for column '%s' as its part
of the PRIMARY KEY\n", c->base.name);
+ }
+ }
mvc_null(sql, nc, c->null);
/* for non empty check for nulls */
if (c->null == 0) {
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
@@ -3961,7 +3961,7 @@ rel_push_select_down(int *changes, mvc *
pl = r->l;
/* introduce selects under the project (if needed) */
set_processed(pl);
- if (!is_select(pl->op))
+ if (!is_select(pl->op) || rel_is_ref(pl))
r->l = pl = rel_select(sql->sa, pl, NULL);
/* for each exp check if we can rename it */
@@ -4586,7 +4586,7 @@ rel_push_select_down_union(int *changes,
if (u->op == op_project)
u = u->l;
- if (!u || !is_union(u->op) || !u->exps || rel_is_ref(u))
+ if (!u || !is_union(u->op) || need_distinct(u) || !u->exps ||
rel_is_ref(u))
return rel;
ul = u->l;
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -25,7 +25,8 @@
#include "mal.h" /* for have_hge */
#endif
-#define check_card(card,f) ((card == card_none && !f->res) || (card !=
card_none && (f->res || f->func->type == F_FILT)) || card == card_loader)
+#define VALUE_FUNC(f) (f->func->type == F_FUNC || f->func->type == F_FILT)
+#define check_card(card,f) ((card == card_none && !f->res) ||
(CARD_VALUE(card) && f->res && VALUE_FUNC(f)) || card == card_loader || (card
== card_relation && f->func->type == F_UNION))
static void
rel_setsubquery(sql_rel*r)
@@ -995,10 +996,15 @@ rel_column_ref(mvc *sql, sql_rel **rel,
return rel_var_ref(sql, name, 0);
}
if (!exp && !var) {
- if (rel && *rel && (*rel)->card == CARD_AGGR && f ==
sql_sel)
- return sql_error(sql, 02, "SELECT: cannot use
non GROUP BY column '%s' in query results without an aggregate function", name);
- else
- return sql_error(sql, 02, "SELECT: identifier
'%s' unknown", name);
+ if (rel && *rel && (*rel)->card == CARD_AGGR && f ==
sql_sel) {
+ sql_rel *gb = *rel;
+
+ while(gb->l && !is_groupby(gb->op))
+ gb = gb->l;
+ if (gb && gb->l && rel_bind_column(sql, gb->l,
name, f))
+ return sql_error(sql, 02, "SELECT:
cannot use non GROUP BY column '%s' in query results without an aggregate
function", name);
+ }
+ return sql_error(sql, 02, "SELECT: identifier '%s'
unknown", name);
}
} else if (dlist_length(l) == 2) {
@@ -1026,10 +1032,15 @@ rel_column_ref(mvc *sql, sql_rel **rel,
}
}
if (!exp) {
- if (rel && *rel && (*rel)->card == CARD_AGGR && f ==
sql_sel)
- return sql_error(sql, 02, "SELECT: cannot use
non GROUP BY column '%s.%s' in query results without an aggregate function",
tname, cname);
- else
- return sql_error(sql, 02, "42S22!SELECT: no
such column '%s.%s'", tname, cname);
+ if (rel && *rel && (*rel)->card == CARD_AGGR && f ==
sql_sel) {
+ sql_rel *gb = *rel;
+
+ while(gb->l && !is_groupby(gb->op))
+ gb = gb->l;
+ if (gb && gb->l && rel_bind_column2(sql, gb->l,
tname, cname, f))
+ return sql_error(sql, 02, "SELECT:
cannot use non GROUP BY column '%s.%s' in query results without an aggregate
function", tname, cname);
+ }
+ return sql_error(sql, 02, "42S22!SELECT: no such column
'%s.%s'", tname, cname);
}
} else if (dlist_length(l) >= 3) {
return sql_error(sql, 02, "TODO: column names of level >= 3");
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -30,6 +30,7 @@
#define type_value 0
#define type_predicate 1
+/* todo cleanup card_row and card_set, both seem to be not used */
/* cardinality expected by enclosing operator */
#define card_none -1 /* psm call doesn't return anything */
#define card_value 0
@@ -39,6 +40,7 @@
#define card_relation 4
#define card_loader 5
+#define CARD_VALUE(card) (card == card_value || card == card_row || card ==
card_column || card == card_set)
/* allowed to reduce (in the where and having parts we can reduce) */
diff --git
a/sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
b/sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
--- a/sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
+++ b/sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err
@@ -32,7 +32,7 @@ stderr of test 'too_general_errmsg.Bug-3
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
QUERY = select operatingday, coalesce(gepubliceerd, 0) as gepubliceerd,
coalesce(gereden, 0) as gereden, coalesce(geannuleerd, 0) as geannuleerd,
coalesce(onbekend, 0) as onbekend, coalesce(extra, 0) as extra,
coalesce(tochgezien, 0) as tochgezien from (select operatingday,
count(trip_hash) as gepubliceerd from tt where pointorder = 1 group by
operatingday) as a full outer join (select z.operatingday, count(*) as
geannuleerd from (select trip_hash, operatingday from kv17_canceled except
select trip_hash, operatingday from kv6 where kv6.messagetype = 'ARRIVAL') as u
group by u.operatingday) as e using (operatingday) full outer join (select
o.operatingday, count(trip_hash) as onbekend from (select distinct trip_hash,
operatingday from tt) as o join (select distinct trip_hash from tt where
(epoch(cast(tt.operatingday as timestamp with time zone)) +
cast(split_part(tt.targetarrivaltime, ':', 1) as int) * 3600 +
(cast(split_part(tt.targetarrivaltime, ':', 2) as int) + 10) * 60) < epoch(n
ow()) except (select trip_hash from kv6 where messagetype = 'ARRIVAL' union
all select trip_hash from kv17_canceled)) as p using (trip_hash) group by
operatingday) as f using (operatingday) order by operatingday;
-ERROR = !SELECT: cannot use non GROUP BY column 'z.operatingday' in query
results without an aggregate function
+ERROR = !SELECT: no such column 'z.operatingday'
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
@@ -2,7 +2,12 @@ shutdown.Bug-6182
avggroupbysq.Bug-6178
semijoinunion.Bug-6150
HAVE_LIBZ?heapextend.Bug-6134
+incorrect_error.Bug-6141
empty-interval.Bug-6184
+drop_not_null_on_pkey.Bug-6189
too-large-decimals.Bug-6192
round-or-truncate.Bug-6193
+splitpart.Bug-6194
HAVE_HGE?cast-with-many-decimals.Bug-6195
+union_func_crash.Bug-6196
+complicated_logic.Bug-105
diff --git a/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.sql
b/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.sql
@@ -0,0 +1,5 @@
+CREATE TABLE test (id INT, a INT, b INT);
+INSERT INTO test VALUES (0, 1, 2);
+SELECT COUNT(*) FROM test WHERE (b = 1 OR b = 2) AND (a NOT IN (3, 4) OR b <>
1) AND a = 1;
+SELECT * FROM test WHERE (b = 1 OR b = 2) AND (a NOT IN (3, 4) OR b <> 1) AND
a = 1;
+drop table test;
diff --git
a/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.err
b/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'complicated_logic.Bug-105` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 17:52:48 >
+# 17:52:48 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38831" "--set"
"mapi_usock=/var/tmp/mtest-13806/.s.monetdb.38831" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 17:52:48 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/home/niels/scratch/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 = 38831
+# cmdline opt mapi_usock = /var/tmp/mtest-13806/.s.monetdb.38831
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/export/scratch1/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 17:52:50 >
+# 17:52:50 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-13806" "--port=38831"
+# 17:52:50 >
+
+
+# 17:52:56 >
+# 17:52:56 > "Done."
+# 17:52:56 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.out
b/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.out
@@ -0,0 +1,47 @@
+stdout of test 'complicated_logic.Bug-105` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 17:52:48 >
+# 17:52:48 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38831" "--set"
"mapi_usock=/var/tmp/mtest-13806/.s.monetdb.38831" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 17:52:48 >
+
+# MonetDB 5 server v11.25.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 15.584 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://rocks073.scilens.private:38831/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-13806/.s.monetdb.38831
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 17:52:50 >
+# 17:52:50 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-13806" "--port=38831"
+# 17:52:50 >
+
+#CREATE TABLE test (id INT, a INT, b INT);
+#INSERT INTO test VALUES (0, 1, 2);
+[ 1 ]
+#SELECT COUNT(*) FROM test WHERE (b = 1 OR b = 2) AND (a NOT IN (3, 4) OR b <>
1) AND a = 1;
+% sys.L13 # table_name
+% L12 # name
+% bigint # type
+% 1 # length
+[ 1 ]
+#SELECT * FROM test WHERE (b = 1 OR b = 2) AND (a NOT IN (3, 4) OR b <> 1) AND
a = 1;
+% sys.test, sys.test, sys.test # table_name
+% id, a, b # name
+% int, int, int # type
+% 1, 1, 1 # length
+[ 0, 1, 2 ]
+#drop table test;
+
+# 17:52:56 >
+# 17:52:56 > "Done."
+# 17:52:56 >
+
diff --git a/sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.sql
b/sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.sql
@@ -0,0 +1,39 @@
+CREATE TABLE "PKeyNotNull" (
+ "PK_COL1" varchar(4) NOT NULL,
+ "PK_COL2" varchar(4) NOT NULL,
+ "DataCol" int DEFAULT NULL,
+ PRIMARY KEY ("PK_COL1","PK_COL2") );
+
+\d "PKeyNotNull"
+
+INSERT INTO "PKeyNotNull" values ('C12', NULL, 1);
+-- Error: INSERT INTO: NOT NULL constraint violated for column
PKeyNotNull.PK_COL2
+
+ALTER TABLE "PKeyNotNull" ALTER "PK_COL2" SET NULL;
+-- this is allowed but should NOT be allowed
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
