Changeset: b2462f7c01f0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2462f7c01f0
Added Files:
sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.err
sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.out
Modified Files:
sql/backends/monet5/sql_result.c
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Tests/coalesce.stable.out
sql/test/Tests/string.stable.out
Branch: default
Log Message:
merged and approved output
diffs (truncated from 350 to 300 lines):
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1962,7 +1962,7 @@ get_print_width(int mtype, int eclass, i
incr = 2;
mtype = ATOMbasetype(mtype);
if (mtype == TYPE_str) {
- if (eclass == EC_CHAR) {
+ if (eclass == EC_CHAR && digits) {
return digits;
} else {
int l = 0;
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -1135,9 +1135,12 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
sql_exp *e;
e = exp_read(sql, lrel, rrel, pexps, r, pos, 0);
- if (e && e->type == e_cmp)
- return exp_compare2(sql->sa, e->l, exp, e->r,
compare2range(swap_compare((comp_type)f),e->flag));
- else if (e)
+ if (e && e->type == e_cmp) {
+ sql_exp *ne = exp_compare2(sql->sa, e->l, exp,
e->r, compare2range(swap_compare((comp_type)f), e->flag));
+ if (is_anti(exp))
+ set_anti(ne);
+ return ne;
+ } else if (e)
return exp_compare(sql->sa, exp, e, f);
}
}
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
@@ -4435,7 +4435,7 @@ rel_push_semijoin_down(int *changes, mvc
(void)*changes;
/* first push down the expressions involving only A */
- if (is_semi(rel->op) && rel->exps && rel->l) {
+ if (rel->op == op_semi && rel->exps && rel->l) {
list *exps = rel->exps, *nexps = sa_list(sql->sa);
node *n;
@@ -4454,7 +4454,7 @@ rel_push_semijoin_down(int *changes, mvc
}
rel->exps = nexps;
}
- if (is_semi(rel->op) && rel->exps && rel->l) {
+ if (rel->op == op_semi && rel->exps && rel->l) {
operator_type op = rel->op, lop;
node *n;
sql_rel *l = rel->l, *ll = NULL, *lr = NULL;
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
@@ -2054,7 +2054,7 @@ rel_logical_value_exp(mvc *sql, sql_rel
dnode *n = dl->h->next;
sql_rel *left = NULL, *right = NULL, *outer = *rel;
sql_exp *l = NULL, *r = NULL;
- int needproj = 0, vals_only = 1;
+ int needproj = 0, vals_only = 1, is_new = 0;
list *vals = NULL, *pexps = NULL;
if (outer && f == sql_sel && is_project(outer->op) &&
!is_processed(outer) && !list_empty(outer->exps)) {
@@ -2081,6 +2081,7 @@ rel_logical_value_exp(mvc *sql, sql_rel
if (!left || (!left->l && f == sql_sel &&
list_empty(left->exps))) {
needproj = (left != NULL);
left = rel_project_exp(sql->sa, l);
+ is_new = 1;
}
if (left && is_project(left->op) && list_empty(left->exps))
left = left->l;
@@ -2107,6 +2108,11 @@ rel_logical_value_exp(mvc *sql, sql_rel
sql->errstr[0] = 0;
z = left;
+ if (is_new) {
+ l = exp_label(sql->sa, l,
++sql->label);
+ l = exp_column(sql->sa,
exp_relname(l), exp_name(l), exp_subtype(l), l->card, has_nil(l), is_intern(l));
+ is_new = 0;
+ }
r = rel_value_exp(sql, &z, sval, f,
ek);
if (z == left && r) {
if (l && r &&
IS_ANY(st->type->eclass)){
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out
+++
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out
@@ -102,7 +102,7 @@ Ready.
% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables, .tables #
table_name
% table_cat, table_schem, table_name, table_type, remarks,
type_cat, type_schem, type_name, self_referencing_col_name,
ref_generation # name
% char, varchar, varchar, char, char, char, char,
char, char, char # type
-% 4, 3, 8, 12, 0, 4, 4, 4, 2, 6 #
length
+% 4, 3, 8, 12, 222, 4, 4, 4, 2, 6 #
length
[ "null", "sys", "columns", "SYSTEM TABLE", "", "null", "null",
"null", "id", "SYSTEM" ]
[ "null", "sys", "db_scens", "SYSTEM TABLE", "", "null", "null",
"null", "id", "SYSTEM" ]
[ "null", "sys", "db_users", "SYSTEM TABLE", "", "null", "null",
"null", "id", "SYSTEM" ]
diff --git a/sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.err
b/sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'concat-str-int.Bug-6583` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 17:02:05 >
+# 17:02:05 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38716" "--set"
"mapi_usock=/var/tmp/mtest-25700/.s.monetdb.38716" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 17:02:05 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-old/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 = 38716
+# cmdline opt mapi_usock = /var/tmp/mtest-25700/.s.monetdb.38716
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt embedded_c = true
+# cmdline opt gdk_debug = 553648138
+
+# 17:02:06 >
+# 17:02:06 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25700" "--port=38716"
+# 17:02:06 >
+
+
+# 17:02:06 >
+# 17:02:06 > "Done."
+# 17:02:06 >
+
diff --git a/sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.out
b/sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.out
@@ -0,0 +1,55 @@
+stdout of test 'concat-str-int.Bug-6583` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 17:02:05 >
+# 17:02:05 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38716" "--set"
"mapi_usock=/var/tmp/mtest-25700/.s.monetdb.38716" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 17:02:05 >
+
+# MonetDB 5 server v11.29.2
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit
+# Found 15.387 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://xps13:38716/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-25700/.s.monetdb.38716
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 17:02:06 >
+# 17:02:06 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25700" "--port=38716"
+# 17:02:06 >
+
+#select '12345' || 678;
+% .L2 # table_name
+% L2 # name
+% char # type
+% 8 # length
+[ "12345678" ]
+#select 12345 || '678';
+% .L2 # table_name
+% L2 # name
+% clob # type
+% 8 # length
+[ "12345678" ]
+#select '12345' || '678';
+% .L2 # table_name
+% L2 # name
+% varchar # type
+% 8 # length
+[ "12345678" ]
+#select 12345 || 678;
+% .L2 # table_name
+% L2 # name
+% clob # type
+% 8 # length
+[ "12345678" ]
+
+# 17:02:06 >
+# 17:02:06 > "Done."
+# 17:02:06 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.err
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'sqlitelogictest-case-not-in-count.Bug-6587` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 16:09:26 >
+# 16:09:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32327" "--set"
"mapi_usock=/var/tmp/mtest-17756/.s.monetdb.32327" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 16:09:26 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/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 = 32327
+# cmdline opt mapi_usock = /var/tmp/mtest-17756/.s.monetdb.32327
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt embedded_c = true
+# cmdline opt gdk_debug = 553648138
+
+# 16:09:26 >
+# 16:09:26 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17756" "--port=32327"
+# 16:09:26 >
+
+
+# 16:09:26 >
+# 16:09:26 > "Done."
+# 16:09:26 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.out
@@ -0,0 +1,38 @@
+stdout of test 'sqlitelogictest-case-not-in-count.Bug-6587` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 16:09:26 >
+# 16:09:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32327" "--set"
"mapi_usock=/var/tmp/mtest-17756/.s.monetdb.32327" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_c=true"
+# 16:09:26 >
+
+# MonetDB 5 server v11.30.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 15.387 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://xps13:32327/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17756/.s.monetdb.32327
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 16:09:26 >
+# 16:09:26 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17756" "--port=32327"
+# 16:09:26 >
+
+#SELECT ALL + CASE WHEN NOT + - 10 IS NULL AND NULL IS NULL THEN NULL WHEN - -
39 * - 89
+#NOT IN ( - + 51 * - - 45, COUNT ( * ) / + 67 ) THEN + COUNT ( ALL 54 ) END;
+% .L14 # table_name
+% L14 # name
+% bigint # type
+% 1 # length
+[ NULL ]
+
+# 16:09:26 >
+# 16:09:26 > "Done."
+# 16:09:26 >
+
diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out
b/sql/test/Dependencies/Tests/Dependencies.stable.out
--- a/sql/test/Dependencies/Tests/Dependencies.stable.out
+++ b/sql/test/Dependencies/Tests/Dependencies.stable.out
@@ -654,13 +654,13 @@ Cleanup
[ "triggers", "dependency_functions_on_triggers", "DEP_VIEW" ]
[ "functions", "dependency_functions_on_triggers", "DEP_VIEW" ]
[ "idxs", "dependency_tables_on_indexes", "DEP_VIEW" ]
+[ "tables", "dependency_tables_on_indexes", "DEP_VIEW" ]
[ "keys", "dependency_tables_on_indexes", "DEP_VIEW" ]
-[ "tables", "dependency_tables_on_indexes", "DEP_VIEW" ]
[ "columns", "dependency_columns_on_indexes", "DEP_VIEW" ]
[ "idxs", "dependency_columns_on_indexes", "DEP_VIEW" ]
[ "objects", "dependency_columns_on_indexes", "DEP_VIEW" ]
+[ "tables", "dependency_columns_on_indexes", "DEP_VIEW" ]
[ "keys", "dependency_columns_on_indexes", "DEP_VIEW" ]
-[ "tables", "dependency_columns_on_indexes", "DEP_VIEW" ]
[ "keys", "dependency_tables_on_foreignkeys", "DEP_VIEW" ]
[ "tables", "dependency_tables_on_foreignkeys", "DEP_VIEW" ]
[ "keys", "dependency_keys_on_foreignkeys", "DEP_VIEW" ]
diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
--- a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
