Changeset: cbb41ca65789 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cbb41ca65789
Modified Files:
configure.ag
monetdb5/extras/pyapi3/Tests/pyapi3_06.stable.err
monetdb5/extras/pyapi3/Tests/pyapi3_06.stable.out
monetdb5/extras/pyapi3/Tests/pyapi3_07.sql
monetdb5/extras/pyapi3/Tests/pyapi3_07.stable.err
monetdb5/extras/pyapi3/Tests/pyapi3_07.stable.out
monetdb5/extras/pyapi3/Tests/pyapi3_23.stable.err
monetdb5/extras/pyapi3/Tests/pyapi3_23.stable.out
monetdb5/extras/pyapi3/Tests/pyapi3_27.stable.err
monetdb5/extras/pyapi3/Tests/pyapi3_27.stable.out
monetdb5/optimizer/opt_mitosis.c
sql/backends/monet5/sql_gencode.c
Branch: python3udf
Log Message:
Fix for python3 aggregations.
diffs (119 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2483,7 +2483,6 @@ if test "x$enable_py3integration" != xno
# we can't have symlinks (because Windows) but we need
the files from /pyapi/ in the /pyapi3/ folder, so we just copy them
cp monetdb5/extras/pyapi/*.c monetdb5/extras/pyapi3/
cp monetdb5/extras/pyapi/*.h monetdb5/extras/pyapi3/
- AC_MSG_ERROR("Hello")
AC_DEFINE(HAVE_LIBPY3, 1, [Define if we can link to
python])
AC_SUBST(libpy3_CFLAGS, $libpy3_CFLAGS)
AC_SUBST(libpy3_LIBS, $libpy3_LIBS)
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_06.stable.err
b/monetdb5/extras/pyapi3/Tests/pyapi3_06.stable.err
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_06.stable.err
+++ b/monetdb5/extras/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 'monetdb5/extras/pyapi3` itself:
# 22:40:27 >
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_06.stable.out
b/monetdb5/extras/pyapi3/Tests/pyapi3_06.stable.out
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_06.stable.out
+++ b/monetdb5/extras/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 'monetdb5/extras/pyapi3` itself:
# 22:40:27 >
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_07.sql
b/monetdb5/extras/pyapi3/Tests/pyapi3_07.sql
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_07.sql
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_07.sql
@@ -7,7 +7,7 @@ INSERT INTO rval VALUES (33078.94),(3830
# [ 3824, 78690 ]
-CREATE AGGREGATE rquantile(v double, q double) RETURNS integer LANGUAGE
PYTHON3YTHON3
+CREATE AGGREGATE rquantile(v double, q double) RETURNS integer LANGUAGE PYTHON3
{
return numpy.percentile(v,q[0] * 100)
};
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_07.stable.err
b/monetdb5/extras/pyapi3/Tests/pyapi3_07.stable.err
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_07.stable.err
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_07.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'pyapi07` in directory 'sql/backends/monet5` itself:
+stderr of test 'pyapi3_07` in directory 'monetdb5/extras/pyapi3` itself:
# 22:40:27 >
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_07.stable.out
b/monetdb5/extras/pyapi3/Tests/pyapi3_07.stable.out
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_07.stable.out
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_07.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'pyapi07` in directory 'sql/backends/monet5` itself:
+stdout of test 'pyapi3_07` in directory 'monetdb5/extras/pyapi3` itself:
# 22:40:27 >
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_23.stable.err
b/monetdb5/extras/pyapi3/Tests/pyapi3_23.stable.err
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_23.stable.err
+++ b/monetdb5/extras/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 'monetdb5/extras/pyapi3` itself:
# 15:43:46 >
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_23.stable.out
b/monetdb5/extras/pyapi3/Tests/pyapi3_23.stable.out
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_23.stable.out
+++ b/monetdb5/extras/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 'monetdb5/extras/pyapi3` itself:
# 15:43:46 >
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_27.stable.err
b/monetdb5/extras/pyapi3/Tests/pyapi3_27.stable.err
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_27.stable.err
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_27.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'pyapi27` in directory 'sql/backends/monet5` itself:
+stderr of test 'pyapi3_27` in directory 'monetdb5/extras/pyapi3` itself:
# 11:45:17 >
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_27.stable.out
b/monetdb5/extras/pyapi3/Tests/pyapi3_27.stable.out
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_27.stable.out
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_27.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'pyapi27` in directory 'sql/backends/monet5` itself:
+stdout of test 'pyapi3_27` in directory 'monetdb5/extras/pyapi3` itself:
# 11:45:17 >
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
@@ -62,7 +62,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/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -2234,7 +2234,7 @@ static int
if (LANG_EXT(s->op4.aggrval->aggr->lang))
q = pushPtr(mb, q, s->op4.aggrval->aggr);
- if (s->op4.aggrval->aggr->lang == FUNC_LANG_R ||
s->op4.aggrval->aggr->lang == FUNC_LANG_PY || s->op4.aggrval->aggr->lang ==
FUNC_LANG_MAP_PY){
+ if (s->op4.aggrval->aggr->lang == FUNC_LANG_R ||
s->op4.aggrval->aggr->lang == FUNC_LANG_PY || s->op4.aggrval->aggr->lang ==
FUNC_LANG_MAP_PY || s->op4.aggrval->aggr->lang == FUNC_LANG_PY3 ||
s->op4.aggrval->aggr->lang == FUNC_LANG_MAP_PY3){
if (!g) {
setVarType(mb, getArg(q, 0), restype);
setVarUDFtype(mb, getArg(q, 0));
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
