Changeset: f3fcfcad3fbc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f3fcfcad3fbc
Added Files:
sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.stable.err
sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.stable.out
Modified Files:
sql/backends/monet5/sql.c
sql/server/rel_optimizer.c
sql/server/rel_partition.c
sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.sql
Branch: Mar2018
Log Message:
fixes for bug 6577 and 6600
diffs (158 lines):
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
@@ -68,7 +68,6 @@ rel_no_mitosis(sql_rel *rel)
if (!rel || is_basetable(rel->op))
return 1;
- //if (is_topn(rel->op) || is_project(rel->op))
if (is_topn(rel->op) || rel->op == op_project)
return rel_no_mitosis(rel->l);
if (is_modify(rel->op) && rel->card <= CARD_AGGR)
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
@@ -2929,6 +2929,7 @@ exp_simplify_math( mvc *sql, sql_exp *e,
sql_exp *lle = l->h->data;
sql_exp *lre = l->h->next->data;
if (!exp_is_atom(lle) &&
exp_is_atom(lre) && exp_is_atom(re)) {
+ sql_subtype et =
*exp_subtype(e);
/* (x*c1)*c2 -> x * (c1*c2) */
list *l = sa_list(sql->sa);
append(l, lre);
@@ -2941,6 +2942,8 @@ exp_simplify_math( mvc *sql, sql_exp *e,
l->h->next->data = le;
e->f = sql_bind_func(sql->sa,
NULL, "sql_mul", exp_subtype(lle), exp_subtype(le), F_FUNC);
exp_sum_scales(e->f, lle, le);
+ if (subtype_cmp(&et,
exp_subtype(e)) != 0)
+ e =
exp_convert(sql->sa, e, exp_subtype(e), &et);
(*changes)++;
return e;
}
diff --git a/sql/server/rel_partition.c b/sql/server/rel_partition.c
--- a/sql/server/rel_partition.c
+++ b/sql/server/rel_partition.c
@@ -142,6 +142,9 @@ rel_partition(mvc *sql, sql_rel *rel)
rel->flag = REL_PARTITION;
} else if ((rel->op == op_topn || rel->op == op_sample || rel->op ==
op_select) && rel->l) {
rel_partition(sql, rel->l);
+ } else if (is_modify(rel->op) && rel->card <= CARD_AGGR) {
+ if (rel->r)
+ rel_partition(sql, rel->r);
} else if (is_project(rel->op) && rel->l) {
rel_partition(sql, rel->l);
} else if (rel->op == op_semi && rel->l && rel->r) {
diff --git a/sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.sql
b/sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.sql
--- a/sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.sql
+++ b/sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.sql
@@ -1,8 +1,8 @@
create or replace function test1() RETURNS TABLE (v0 INT, v1 INT)
LANGUAGE PYTHON {
import numpy as np
- nrows=100000000
- i_var=np.random.randint(1,10000000, (100000000,))
+ nrows=10000000
+ i_var=np.random.randint(1,1000000, (10000000,))
return [[i for i in range(nrows)],i_var]
};
diff --git
a/sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.stable.err
b/sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'temp-table-performance.Bug-6577` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 13:29:35 >
+# 13:29:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39333" "--set"
"mapi_usock=/var/tmp/mtest-22993/.s.monetdb.39333" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_py=true" "--set" "embedded_c=true"
+# 13:29:35 >
+
+# 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 = 39333
+# cmdline opt mapi_usock = /var/tmp/mtest-22993/.s.monetdb.39333
+# 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_py = true
+# cmdline opt embedded_c = true
+# cmdline opt gdk_debug = 553648138
+
+# 13:29:35 >
+# 13:29:35 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-22993" "--port=39333"
+# 13:29:35 >
+
+
+# 13:29:40 >
+# 13:29:40 > "Done."
+# 13:29:40 >
+
diff --git
a/sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.stable.out
b/sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.stable.out
@@ -0,0 +1,54 @@
+stdout of test 'temp-table-performance.Bug-6577` in directory
'sql/test/BugTracker-2018` itself:
+
+
+# 13:29:35 >
+# 13:29:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39333" "--set"
"mapi_usock=/var/tmp/mtest-22993/.s.monetdb.39333" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-old/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_py=true" "--set" "embedded_c=true"
+# 13:29:35 >
+
+# MonetDB 5 server v11.29.4
+# 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.386 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:39333/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-22993/.s.monetdb.39333
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/Python2 module loaded
+
+Ready.
+
+# 13:29:35 >
+# 13:29:35 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-22993" "--port=39333"
+# 13:29:35 >
+
+#create or replace function test1() RETURNS TABLE (v0 INT, v1 INT)
+#LANGUAGE PYTHON {
+# import numpy as np
+# nrows=10000000
+# i_var=np.random.randint(1,1000000, (10000000,))
+# return [[i for i in range(nrows)],i_var]
+#};
+#create table t1 as (select * from test1()) with data;
+#create table t2 as (select distinct v1 from t1) with data;
+#select count(t1.v1) from t1, t2 where t1.v1=t2.v1;
+% sys.L3 # table_name
+% L3 # name
+% bigint # type
+% 8 # length
+[ 10000000 ]
+#create temp table t3 as (select count(t1.v1) from t1, t2 where t1.v1=t2.v1)
on commit preserve rows;
+#drop table t3;
+#create temp table t3 as (select t1.v1 from t1, t2 where t1.v1=t2.v1) on
commit preserve rows;
+#drop table t3;
+#drop function test1;
+#drop table t1;
+#drop table t2;
+
+# 13:29:40 >
+# 13:29:40 > "Done."
+# 13:29:40 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
