Changeset: eaa9ea6a339c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eaa9ea6a339c
Modified Files:
monetdb5/optimizer/opt_mitosis.c
sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.err
sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.out
sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.err
sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.out
Branch: python3udf
Log Message:
No parallel aggregations for pyapi3 as well.
diffs (98 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
@@ -66,7 +66,7 @@ OPTmitosisImplementation(Client cntxt, M
getFunctionId(p) != subprodRef)
return 0;
- if (p->argc > 2 && (getModuleId(p) == rapiRef || getModuleId(p)
== pyapiRef) &&
+ if (p->argc > 2 && (getModuleId(p) == rapiRef || getModuleId(p)
== pyapiRef || getModuleId(p) == pyapi3Ref) &&
getFunctionId(p) == subeval_aggrRef)
return 0;
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.err
b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.err
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.err
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'pyapi06` in directory 'sql/backends/monet5` itself:
+stderr of test 'pyapi3_06` in directory 'sql/backends/monet5/UDF/pyapi3`
itself:
# 22:40:27 >
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.out
b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.out
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.out
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'pyapi06` in directory 'sql/backends/monet5` itself:
+stdout of test 'pyapi3_06` in directory 'sql/backends/monet5/UDF/pyapi3`
itself:
# 22:40:27 >
@@ -40,14 +40,14 @@ Ready.
# return(numpy.median(val))
#};
#SELECT aggrmedian(datacol) FROM rval;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
% int # type
% 2 # length
[ 42 ]
#SELECT groupcol,aggrmedian(datacol) FROM rval GROUP BY groupcol;
-% sys.rval, sys.L2 # table_name
-% groupcol, L1 # name
+% sys.rval, sys.L4 # table_name
+% groupcol, L3 # name
% int, int # type
% 1, 2 # length
[ 1, 63 ]
@@ -67,8 +67,8 @@ Ready.
# return x
#};
#SELECT groupcol,secondgroupcol,aggrsum(datacol) FROM rval GROUP BY
groupcol,secondgroupcol;
-% sys.rval, sys.rval, sys.L2 # table_name
-% groupcol, secondgroupcol, L1 # name
+% sys.rval, sys.rval, sys.L5 # table_name
+% groupcol, secondgroupcol, L4 # name
% int, int, int # type
% 1, 1, 2 # length
[ 0, 0, 3 ]
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.err
b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.err
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.err
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'pyapi23` in directory 'sql/backends/monet5` itself:
+stderr of test 'pyapi3_23` in directory 'sql/backends/monet5/UDF/pyapi3`
itself:
# 15:43:46 >
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.out
b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.out
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.out
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'pyapi23` in directory 'sql/backends/monet5` itself:
+stdout of test 'pyapi3_23` in directory 'sql/backends/monet5/UDF/pyapi3`
itself:
# 15:43:46 >
@@ -49,15 +49,15 @@ Ready.
#};
#CREATE TABLE pyapi23table as select * from pyapi23datagen() with data;
#select g, pyapi23(n) from pyapi23datagen() group by g;
-% .L1, .L3 # table_name
-% g, L2 # name
+% .L1, .L5 # table_name
+% g, L4 # name
% int, int # type
% 1, 3 # length
[ 0, 100 ]
[ 1, 100 ]
#select g, pyapi23(n) from pyapi23table group by g;
-% sys.pyapi23table, sys.L2 # table_name
-% g, L1 # name
+% sys.pyapi23table, sys.L4 # table_name
+% g, L3 # name
% int, int # type
% 1, 3 # length
[ 0, 100 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
