Changeset: 106db249ceb9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=106db249ceb9
Added Files:
sql/backends/monet5/Tests/rapi18.stable.err
sql/backends/monet5/Tests/rapi18.stable.out
Modified Files:
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_support.c
Branch: default
Log Message:
don't use mitosis on rapi.subeval_aggr
diffs (truncated from 1179 to 300 lines):
diff --git a/monetdb5/optimizer/opt_mitosis.c b/monetdb5/optimizer/opt_mitosis.c
--- a/monetdb5/optimizer/opt_mitosis.c
+++ b/monetdb5/optimizer/opt_mitosis.c
@@ -88,6 +88,11 @@ OPTmitosisImplementation(Client cntxt, M
getFunctionId(p) != subsumRef &&
getFunctionId(p) != subprodRef)
return 0;
+
+ if (p->argc > 2 && getModuleId(p) == rapiRef &&
+ getFunctionId(p) == subeval_aggrRef)
+ return 0;
+
/* Mergetable cannot handle intersect/except's for now */
if (getModuleId(p) == algebraRef && getFunctionId(p) ==
groupbyRef)
return 0;
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -176,6 +176,8 @@ str putRef;
str querylogRef;
str queryRef;
str rapiRef;
+str batrapiRef;
+str subeval_aggrRef;
str rankRef;
str dense_rankRef;
str reconnectRef;
@@ -397,7 +399,9 @@ void optimizerInit(void)
putRef = putName("put",3);
querylogRef = putName("querylog",8);
queryRef = putName("query",5);
- rapiRef = putName("batrapi", 7);
+ rapiRef = putName("rapi", 4);
+ batrapiRef = putName("batrapi", 7);
+ subeval_aggrRef = putName("subeval_aggr", 12);
rankRef = putName("rank", 4);
dense_rankRef = putName("dense_rank", 10);
reconnectRef = putName("reconnect",9);
diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h
--- a/monetdb5/optimizer/opt_prelude.h
+++ b/monetdb5/optimizer/opt_prelude.h
@@ -169,6 +169,8 @@ opt_export str putRef;
opt_export str querylogRef;
opt_export str queryRef;
opt_export str rapiRef;
+opt_export str batrapiRef;
+opt_export str subeval_aggrRef;
opt_export str rankRef;
opt_export str dense_rankRef;
opt_export str reconnectRef;
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
@@ -665,7 +665,7 @@ int isMapOp(InstrPtr p){
(getModuleId(p) == batcalcRef) ||
(getModuleId(p) != batcalcRef && getModuleId(p) != batRef &&
strncmp(getModuleId(p), "bat", 3) == 0) ||
(getModuleId(p) == mkeyRef)) && !isOrderDepenent(p) &&
- getModuleId(p) != rapiRef;
+ getModuleId(p) != batrapiRef;
}
int isLikeOp(InstrPtr p){
diff --git a/sql/backends/monet5/Tests/rapi18.stable.err
b/sql/backends/monet5/Tests/rapi18.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/rapi18.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'rapi18` in directory 'sql/backends/monet5` itself:
+
+
+# 10:13:24 >
+# 10:13:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31229" "--set"
"mapi_usock=/var/tmp/mtest-17804/.s.monetdb.31229" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 10:13:24 >
+
+# builtin opt gdk_dbpath =
/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 = 31229
+# cmdline opt mapi_usock = /var/tmp/mtest-17804/.s.monetdb.31229
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 10:13:25 >
+# 10:13:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17804" "--port=31229"
+# 10:13:25 >
+
+
+# 10:13:26 >
+# 10:13:26 > "Done."
+# 10:13:26 >
+
diff --git a/sql/backends/monet5/Tests/rapi18.stable.out
b/sql/backends/monet5/Tests/rapi18.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/rapi18.stable.out
@@ -0,0 +1,1070 @@
+stdout of test 'rapi18` in directory 'sql/backends/monet5` itself:
+
+
+# 10:13:24 >
+# 10:13:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31229" "--set"
"mapi_usock=/var/tmp/mtest-17804/.s.monetdb.31229" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 10:13:24 >
+
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.333 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:31229/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17804/.s.monetdb.31229
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 10:13:25 >
+# 10:13:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17804" "--port=31229"
+# 10:13:25 >
+
+#START TRANSACTION;
+#CREATE AGGREGATE rapi18(n int) RETURNS DOUBLE LANGUAGE R {
+# sow_aggr <- function(df) { 42.0 }
+# aggregate(n, list(aggr_group), sow_aggr)$x
+#};
+#CREATE FUNCTION rapi18datagen() RETURNS TABLE (g int, n int) LANGUAGE R {
+# g <- rep(1:500, rep(400,500))
+# data.frame(g, 10L)
+#};
+#CREATE TABLE rapi18good as select * from rapi18datagen() limit 199999 with
data;
+#CREATE TABLE rapi18bad as select * from rapi18datagen() limit 200000 with
data;
+#select count(distinct g) from rapi18good;
+% sys.L1 # table_name
+% L1 # name
+% wrd # type
+% 3 # length
+[ 500 ]
+#select count(distinct g) from rapi18bad;
+% sys.L1 # table_name
+% L1 # name
+% wrd # type
+% 3 # length
+[ 500 ]
+#select g, rapi18(n) from rapi18good group by g;
+% sys.rapi18good, sys.L1 # table_name
+% g, L1 # name
+% int, double # type
+% 3, 24 # length
+[ 1, 42 ]
+[ 2, 42 ]
+[ 3, 42 ]
+[ 4, 42 ]
+[ 5, 42 ]
+[ 6, 42 ]
+[ 7, 42 ]
+[ 8, 42 ]
+[ 9, 42 ]
+[ 10, 42 ]
+[ 11, 42 ]
+[ 12, 42 ]
+[ 13, 42 ]
+[ 14, 42 ]
+[ 15, 42 ]
+[ 16, 42 ]
+[ 17, 42 ]
+[ 18, 42 ]
+[ 19, 42 ]
+[ 20, 42 ]
+[ 21, 42 ]
+[ 22, 42 ]
+[ 23, 42 ]
+[ 24, 42 ]
+[ 25, 42 ]
+[ 26, 42 ]
+[ 27, 42 ]
+[ 28, 42 ]
+[ 29, 42 ]
+[ 30, 42 ]
+[ 31, 42 ]
+[ 32, 42 ]
+[ 33, 42 ]
+[ 34, 42 ]
+[ 35, 42 ]
+[ 36, 42 ]
+[ 37, 42 ]
+[ 38, 42 ]
+[ 39, 42 ]
+[ 40, 42 ]
+[ 41, 42 ]
+[ 42, 42 ]
+[ 43, 42 ]
+[ 44, 42 ]
+[ 45, 42 ]
+[ 46, 42 ]
+[ 47, 42 ]
+[ 48, 42 ]
+[ 49, 42 ]
+[ 50, 42 ]
+[ 51, 42 ]
+[ 52, 42 ]
+[ 53, 42 ]
+[ 54, 42 ]
+[ 55, 42 ]
+[ 56, 42 ]
+[ 57, 42 ]
+[ 58, 42 ]
+[ 59, 42 ]
+[ 60, 42 ]
+[ 61, 42 ]
+[ 62, 42 ]
+[ 63, 42 ]
+[ 64, 42 ]
+[ 65, 42 ]
+[ 66, 42 ]
+[ 67, 42 ]
+[ 68, 42 ]
+[ 69, 42 ]
+[ 70, 42 ]
+[ 71, 42 ]
+[ 72, 42 ]
+[ 73, 42 ]
+[ 74, 42 ]
+[ 75, 42 ]
+[ 76, 42 ]
+[ 77, 42 ]
+[ 78, 42 ]
+[ 79, 42 ]
+[ 80, 42 ]
+[ 81, 42 ]
+[ 82, 42 ]
+[ 83, 42 ]
+[ 84, 42 ]
+[ 85, 42 ]
+[ 86, 42 ]
+[ 87, 42 ]
+[ 88, 42 ]
+[ 89, 42 ]
+[ 90, 42 ]
+[ 91, 42 ]
+[ 92, 42 ]
+[ 93, 42 ]
+[ 94, 42 ]
+[ 95, 42 ]
+[ 96, 42 ]
+[ 97, 42 ]
+[ 98, 42 ]
+[ 99, 42 ]
+[ 100, 42 ]
+[ 101, 42 ]
+[ 102, 42 ]
+[ 103, 42 ]
+[ 104, 42 ]
+[ 105, 42 ]
+[ 106, 42 ]
+[ 107, 42 ]
+[ 108, 42 ]
+[ 109, 42 ]
+[ 110, 42 ]
+[ 111, 42 ]
+[ 112, 42 ]
+[ 113, 42 ]
+[ 114, 42 ]
+[ 115, 42 ]
+[ 116, 42 ]
+[ 117, 42 ]
+[ 118, 42 ]
+[ 119, 42 ]
+[ 120, 42 ]
+[ 121, 42 ]
+[ 122, 42 ]
+[ 123, 42 ]
+[ 124, 42 ]
+[ 125, 42 ]
+[ 126, 42 ]
+[ 127, 42 ]
+[ 128, 42 ]
+[ 129, 42 ]
+[ 130, 42 ]
+[ 131, 42 ]
+[ 132, 42 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
