Changeset: 281addc55025 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=281addc55025
Added Files:
sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.out
Modified Files:
clients/mapiclient/dump.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.sql
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (truncated from 339 to 300 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -963,7 +963,8 @@ describe_table(Mapi mid, const char *sch
"k.name, " /* 1 */
"kc.nr, " /* 2 */
"c.name, " /* 3 */
- "rem.remark " /* 4 */
+ "i.type, " /* 4 */
+ "rem.remark " /* 5 */
"FROM sys.idxs AS i "
"LEFT JOIN sys.keys AS k ON i.name = k.name "
"LEFT OUTER JOIN sys.comments rem ON i.id =
rem.id, "
@@ -978,7 +979,8 @@ describe_table(Mapi mid, const char *sch
"(k.type IS NULL OR k.type = 1) AND "
"t.schema_id = s.id AND "
"s.name = '%s' AND "
- "t.name = '%s' "
+ "t.name = '%s' AND "
+ "i.type in (0, 4, 5) "
"ORDER BY i.name, kc.nr", schema, tname);
if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid))
goto bailout;
@@ -988,7 +990,8 @@ describe_table(Mapi mid, const char *sch
const char *k_name = mapi_fetch_field(hdl, 1);
const char *kc_nr = mapi_fetch_field(hdl, 2);
const char *c_name = mapi_fetch_field(hdl, 3);
- const char *remark = mapi_fetch_field(hdl, 4);
+ const char *i_type = mapi_fetch_field(hdl, 4);
+ const char *remark = mapi_fetch_field(hdl, 5);
if (mapi_error(mid))
goto bailout;
@@ -1000,9 +1003,26 @@ describe_table(Mapi mid, const char *sch
if (strcmp(kc_nr, "0") == 0) {
if (cnt)
mnstr_printf(toConsole, ");\n");
- mnstr_printf(toConsole,
- "CREATE INDEX \"%s\" ON
\"%s\".\"%s\" (",
- i_name, schema, tname);
+ switch (atoi(i_type)) {
+ case 0: /* hash_idx */
+ mnstr_printf(toConsole,
+ "CREATE INDEX \"%s\" ON
\"%s\".\"%s\" (",
+ i_name, schema, tname);
+ break;
+ case 5: /* ordered_idx */
+ mnstr_printf(toConsole,
+ "CREATE ORDERED INDEX
\"%s\" ON \"%s\".\"%s\" (",
+ i_name, schema, tname);
+ break;
+ case 4: /* imprints_idx */
+ mnstr_printf(toConsole,
+ "CREATE IMPRINTS INDEX
\"%s\" ON \"%s\".\"%s\" (",
+ i_name, schema, tname);
+ break;
+ default:
+ /* cannot happen due to WHERE clause */
+ goto bailout;
+ }
append_comment(comments, "INDEX", schema,
i_name, NULL, NULL, remark);
cnt = 1;
} else
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
@@ -2165,10 +2165,16 @@ rel_logical_value_exp(mvc *sql, sql_rel
else
return NULL;
}
- z = NULL;
- } else {
- r = NULL;
+ } else if (r) {
+ sql_rel *gp = z->l;
+ rel_project_add_exp(sql, z, r);
+ reset_processed(gp);
+ r = exp_column(sql->sa,
exp_relname(r), exp_name(r), exp_subtype(r), r->card, has_nil(r), is_intern(r));
+ if (outer)
+ outer->l = z;
+ left = z;
}
+ z = NULL;
}
if (!l || !r || (z && !(r=rel_check_type(sql,
st, r, type_equal)))) {
rel_destroy(right);
@@ -2653,6 +2659,14 @@ rel_logical_exp(mvc *sql, sql_rel *rel,
}
rel = left =
rel_dup(left);
roident = rident =
exp_column(sql->sa, exp_relname(lident), exp_name(lident), exp_subtype(lident),
lident->card, has_nil(lident), is_intern(lident));
+
+ if (!correlated &&
right) {
+ /* union of
values or single value project */
+ sql_rel *in =
rel_crossproduct(sql->sa, rel_dup(left), right, op_join);
+
+ right =
rel_project(sql->sa, in, rel_projections(sql, right, NULL, 1, 1));
+
rel_project_add_exp(sql, right, roident);
+ }
}
r = rel_value_exp(sql, &rel,
sval, f, ek);
if (r && !l_is_value) {
@@ -3557,6 +3571,11 @@ static sql_exp *
if (groupby->l && groupby->op == op_project) {
sql_rel *r = groupby->l;
+ if (!is_processed(r) && f == sql_sel && r->op == op_project) {
+ project = r;
+ r = r->l;
+ }
+
if (f == sql_having)
project = groupby;
if (f == sql_having && r->op == op_select && r->l)
@@ -3570,7 +3589,7 @@ static sql_exp *
groupby = r;
}
- if (groupby->op != op_groupby) /* implicit groupby */
+ if (groupby->op != op_groupby) /* implicit groupby */
*rel = rel_project2groupby(sql, groupby);
if (!*rel)
return NULL;
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -973,6 +973,10 @@ update_table(mvc *sql, dlist *qname, dli
r = rel_logical_exp(sql, res, opt_where,
sql_where);
if (!opt_from && r && is_join(r->op))
r->op = op_semi;
+ else if (r && res && r->nrcols != res->nrcols) {
+ list *exps = rel_projections(sql, res,
NULL, 1, 1);
+ r = rel_project(sql->sa, r, exps);
+ }
}
if (!r)
return NULL;
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.err
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'sqlitelogictest-case-subquery-missing.Bug-6523` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 23:19:10 >
+# 23:19:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35344" "--set"
"mapi_usock=/var/tmp/mtest-28683/.s.monetdb.35344" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 23:19:10 >
+
+# 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 = 35344
+# cmdline opt mapi_usock = /var/tmp/mtest-28683/.s.monetdb.35344
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt gdk_debug = 553648138
+
+# 23:19:11 >
+# 23:19:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28683" "--port=35344"
+# 23:19:11 >
+
+
+# 23:19:11 >
+# 23:19:11 > "Done."
+# 23:19:11 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-subquery-missing.Bug-6523.stable.out
@@ -0,0 +1,37 @@
+stdout of test 'sqlitelogictest-case-subquery-missing.Bug-6523` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 23:19:10 >
+# 23:19:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35344" "--set"
"mapi_usock=/var/tmp/mtest-28683/.s.monetdb.35344" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 23:19:10 >
+
+# MonetDB 5 server v11.27.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.324 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:35344/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28683/.s.monetdb.35344
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 23:19:11 >
+# 23:19:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-28683" "--port=35344"
+# 23:19:11 >
+
+#SELECT CASE WHEN 18 IN ( AVG ( + 12 ) + - + ( - 29 ) + - SUM ( + + 53 ) * - (
73 ) ) THEN NULL WHEN ( - COUNT ( * ) * - SUM ( DISTINCT 80 ) ) IS NOT NULL
THEN 15 END + CASE 27 WHEN - 68 * + CAST ( COALESCE ( 42, + 57 * 20 ) AS
INTEGER ) THEN + 11 * 11 + - CASE - 16 + 25 WHEN 37 + 24 THEN 51 + 41 END / 4
END * + 0 AS col1;
+% .L15 # table_name
+% col1 # name
+% int # type
+% 1 # length
+[ NULL ]
+
+# 23:19:11 >
+# 23:19:11 > "Done."
+# 23:19:11 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.sql
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.sql
---
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.sql
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.sql
@@ -1,4 +1,8 @@
CREATE TABLE tab2(col0 INTEGER, col1 INTEGER, col2 INTEGER);
INSERT INTO tab2 VALUES (64,77,40), (75,67,58), (46,51,23);
SELECT ALL * FROM tab2 WHERE + col0 IN ( - 12, col0, - col1, col1 / + col0,
col1 );
+SELECT ALL * FROM tab2 WHERE + col0 IN ( col0, - col1, col1 / + col0, col1 );
+SELECT ALL * FROM tab2 WHERE + col0 IN ( - col1, col1 / + col0, col1 );
+SELECT ALL * FROM tab2 WHERE + col0 IN ( col1 / + col0, col1 );
+SELECT ALL * FROM tab2 WHERE + col0 IN ( col1 );
DROP TABLE tab2;
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.err
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'sqlitelogictest-in-single-column.Bug-6522` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 18:32:37 >
+# 18:32:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32244" "--set"
"mapi_usock=/var/tmp/mtest-26304/.s.monetdb.32244" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 18:32:37 >
+
+# 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 = 32244
+# cmdline opt mapi_usock = /var/tmp/mtest-26304/.s.monetdb.32244
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt gdk_debug = 553648138
+
+# 18:32:37 >
+# 18:32:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26304" "--port=32244"
+# 18:32:37 >
+
+
+# 18:32:37 >
+# 18:32:37 > "Done."
+# 18:32:37 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-in-single-column.Bug-6522.stable.out
@@ -0,0 +1,66 @@
+stdout of test 'sqlitelogictest-in-single-column.Bug-6522` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 18:32:37 >
+# 18:32:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32244" "--set"
"mapi_usock=/var/tmp/mtest-26304/.s.monetdb.32244" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
+# 18:32:37 >
+
+# MonetDB 5 server v11.27.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.324 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:32244/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26304/.s.monetdb.32244
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 18:32:37 >
+# 18:32:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26304" "--port=32244"
+# 18:32:37 >
+
+#CREATE TABLE tab2(col0 INTEGER, col1 INTEGER, col2 INTEGER);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
