Changeset: 3d82b37fe404 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d82b37fe404
Modified Files:
monetdb5/extras/pyapi3/Tests/All
monetdb5/extras/pyapi3/Tests/pyapi3_09.stable.err
monetdb5/extras/pyapi3/Tests/pyapi3_09.stable.out
monetdb5/extras/pyapi3/Tests/pyapi3_12.sql
monetdb5/extras/pyapi3/Tests/pyapi3_12.stable.err
monetdb5/extras/pyapi3/Tests/pyapi3_12.stable.out
monetdb5/extras/pyapi3/Tests/pyapi3_13.sql
monetdb5/extras/pyapi3/Tests/pyapi3_13.stable.err
monetdb5/extras/pyapi3/Tests/pyapi3_13.stable.out
monetdb5/extras/pyapi3/Tests/pyapi3_15.sql
monetdb5/extras/pyapi3/Tests/pyapi3_16.sql
monetdb5/extras/pyapi3/Tests/pyapi3_16.stable.err
monetdb5/extras/pyapi3/Tests/pyapi3_16.stable.out
monetdb5/extras/pyapi3/Tests/pyapi3_17.sql
monetdb5/extras/pyapi3/Tests/pyapi3_17.stable.err
monetdb5/extras/pyapi3/Tests/pyapi3_17.stable.out
monetdb5/extras/pyapi3/Tests/pyapi3_18.sql
monetdb5/extras/pyapi3/Tests/pyapi3_18.stable.err
monetdb5/extras/pyapi3/Tests/pyapi3_18.stable.out
monetdb5/extras/pyapi3/Tests/pyapi3_20.sql
monetdb5/extras/pyapi3/Tests/pyapi3_20.stable.err
monetdb5/extras/pyapi3/Tests/pyapi3_20.stable.out
monetdb5/extras/pyapi3/Tests/pyapi3_24.sql
monetdb5/extras/pyapi3/Tests/pyapi3_24.stable.err
monetdb5/extras/pyapi3/Tests/pyapi3_24.stable.out
Branch: python3udf
Log Message:
Fix some malformed tests and approve tests.
diffs (truncated from 620 to 300 lines):
diff --git a/monetdb5/extras/pyapi3/Tests/All b/monetdb5/extras/pyapi3/Tests/All
--- a/monetdb5/extras/pyapi3/Tests/All
+++ b/monetdb5/extras/pyapi3/Tests/All
@@ -21,13 +21,11 @@ HAVE_LIBPY3?pyapi3_10
HAVE_LIBPY3?pyapi3_11
HAVE_LIBPY3?pyapi3_12
HAVE_LIBPY3?pyapi3_13
-HAVE_LIBPY3?pyapi3_14
HAVE_LIBPY3?pyapi3_16
HAVE_LIBPY3?pyapi3_17
HAVE_LIBPY3?pyapi3_18
HAVE_LIBPY3?pyapi3_19
HAVE_LIBPY3?pyapi3_20
-HAVE_LIBPY3?pyapi3_21
HAVE_LIBPY3?pyapi3_22
HAVE_LIBPY3?pyapi3_23
HAVE_LIBPY3?pyapi3_24
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_09.stable.err
b/monetdb5/extras/pyapi3/Tests/pyapi3_09.stable.err
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_09.stable.err
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_09.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'pyapi09` in directory 'sql/backends/monet5` itself:
+stderr of test 'pyapi3_09` in directory 'monetdb5/extras/pyapi3` itself:
# 14:42:11 >
@@ -27,21 +27,48 @@ stderr of test 'pyapi09` in directory 's
# cmdline opt embedded_py = true
# cmdline opt gdk_debug = 536870922
-# 14:42:12 >
-# 14:42:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30058" "--port=35977"
-# 14:42:12 >
+# 17:56:49 >
+# 17:56:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17686" "--port=32656"
+# 17:56:49 >
-MAPI = (monetdb) /var/tmp/mtest-28978/.s.monetdb.30135
+MAPI = (monetdb) /var/tmp/mtest-17686/.s.monetdb.32656
+QUERY = CREATE TABLE pyapi09objects AS SELECT * FROM pyapi09create() WITH DATA;
+ERROR = !Invalid string encoding used. Please return a regular ASCII string,
or a Numpy_Unicode object.
+MAPI = (monetdb) /var/tmp/mtest-17686/.s.monetdb.32656
+QUERY = CREATE FUNCTION pyapi09load() returns TABLE(i INTEGER)
+ LANGUAGE PYTHON3
+ {
+ import pickle
+ res = _conn.execute('SELECT s FROM pyapi09objects;')
+ array = pickle.loads(res['s'][0])
+ print array
+ return array[:10]
+ };
+ERROR = !current transaction is aborted (please ROLLBACK)
+MAPI = (monetdb) /var/tmp/mtest-17686/.s.monetdb.32656
+QUERY = SELECT * FROM pyapi09load();
+ERROR = !current transaction is aborted (please ROLLBACK)
+MAPI = (monetdb) /var/tmp/mtest-17686/.s.monetdb.32656
+QUERY = DROP FUNCTION pyapi09create;
+ERROR = !current transaction is aborted (please ROLLBACK)
+MAPI = (monetdb) /var/tmp/mtest-17686/.s.monetdb.32656
+QUERY = DROP FUNCTION pyapi09load;
+ERROR = !current transaction is aborted (please ROLLBACK)
+MAPI = (monetdb) /var/tmp/mtest-17686/.s.monetdb.32656
+QUERY = DROP TABLE pyapi09objects;
+ERROR = !current transaction is aborted (please ROLLBACK)
+MAPI = (monetdb) /var/tmp/mtest-17686/.s.monetdb.32656
+QUERY = CREATE FUNCTION pyapi09() returns TABLE(i INTEGER)
+ LANGUAGE PYTHON3
+ {
+ res = _conn.execute('SELECT * FROM unknown_table;')
+ return numpy.arange(10)
+ };
+ERROR = !current transaction is aborted (please ROLLBACK)
+MAPI = (monetdb) /var/tmp/mtest-17686/.s.monetdb.32656
QUERY = SELECT * FROM pyapi09();
-ERROR = !SELECT: no such table 'unknown_table'
- !Python exception
- !
- ! 1. def pyfun(_columns,_column_types,_conn):
- !> 2. res = _conn.execute('SELECT * FROM unknown_table;')
- ! 3. return numpy.arange(10)
- ! 4.
- !SQL Query Failed: ParseException:SQLparser:42S02!SELECT: no such
table 'unknown_table'
-MAPI = (monetdb) /var/tmp/mtest-28978/.s.monetdb.30135
+ERROR = !current transaction is aborted (please ROLLBACK)
+MAPI = (monetdb) /var/tmp/mtest-17686/.s.monetdb.32656
QUERY = SELECT * FROM pyapi09();
ERROR = !SELECT: no such table 'unknown_table'
MAPI = (monetdb) /var/tmp/mtest-28978/.s.monetdb.30135
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_09.stable.out
b/monetdb5/extras/pyapi3/Tests/pyapi3_09.stable.out
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_09.stable.out
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_09.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'pyapi09` in directory 'sql/backends/monet5` itself:
+stdout of test 'pyapi3_09` in directory 'monetdb5/extras/pyapi3` itself:
# 14:42:11 >
@@ -23,7 +23,6 @@ stdout of test 'pyapi09` in directory 's
# MonetDB/R module loaded
Ready.
-[ 0 1 2 ..., 99997 99998 99999]
# 14:42:12 >
# 14:42:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30058" "--port=35977"
@@ -90,41 +89,7 @@ Ready.
#{
# import cPickle
# result = numpy.arange(100000)
-# return cPickle.dumps(result)
-#};
-#CREATE TABLE pyapi09objects AS SELECT * FROM pyapi09create() WITH DATA;
-#CREATE FUNCTION pyapi09load() returns TABLE(i INTEGER)
-#language P
-#{
-# import cPickle
-# res = _conn.execute('SELECT s FROM pyapi09objects;')
-# array = cPickle.loads(res['s'][0])
-# print array
-# return array[:10]
-#};
-#SELECT * FROM pyapi09load();
-% . # table_name
-% i # name
-% int # type
-% 1 # length
-[ 0 ]
-[ 1 ]
-[ 2 ]
-[ 3 ]
-[ 4 ]
-[ 5 ]
-[ 6 ]
-[ 7 ]
-[ 8 ]
-[ 9 ]
-#DROP FUNCTION pyapi09create;
-#DROP FUNCTION pyapi09load;
-#DROP TABLE pyapi09objects;
-#CREATE FUNCTION pyapi09() returns TABLE(i INTEGER)
-#language P
-#{
-# res = _conn.execute('SELECT * FROM unknown_table;')
-# return numpy.arange(10)
+# return pickle.dumps(result)
#};
#ROLLBACK;
#START TRANSACTION;
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_12.sql
b/monetdb5/extras/pyapi3/Tests/pyapi3_12.sql
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_12.sql
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_12.sql
@@ -8,7 +8,7 @@ CREATE TABLE rval(i integer);
INSERT INTO rval VALUES (1),(2),(3),(4),(-1),(0);
# PYTHON_MAP test in WHERE
-CREATE FUNCTION pyapi12(i integer,z integer) returns boolean language
PYTHON_MAP
+CREATE FUNCTION pyapi12(i integer,z integer) returns boolean LANGUAGE
PYTHON3_MAP
{
return(numpy.greater(i,z))
};
@@ -17,7 +17,7 @@ DROP FUNCTION pyapi12;
# Return NPY_OBJECT test
-CREATE FUNCTION pyapi12(i integer,z integer) returns string language PYTHON_MAP
+CREATE FUNCTION pyapi12(i integer,z integer) returns string LANGUAGE
PYTHON3_MAP
{
return(numpy.array(['Hello'] * len(i), dtype=object))
};
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_12.stable.err
b/monetdb5/extras/pyapi3/Tests/pyapi3_12.stable.err
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_12.stable.err
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_12.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'pyapi12` in directory 'sql/backends/monet5` itself:
+stderr of test 'pyapi3_12` in directory 'monetdb5/extras/pyapi3` itself:
# 17:13:01 >
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_12.stable.out
b/monetdb5/extras/pyapi3/Tests/pyapi3_12.stable.out
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_12.stable.out
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_12.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'pyapi12` in directory 'sql/backends/monet5` itself:
+stdout of test 'pyapi3_12` in directory 'monetdb5/extras/pyapi3` itself:
# 17:13:01 >
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_13.sql
b/monetdb5/extras/pyapi3/Tests/pyapi3_13.sql
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_13.sql
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_13.sql
@@ -28,7 +28,7 @@ SELECT COUNT(pyapi13_mult(i,j)) FROM pya
DROP FUNCTION pyapi13_mult;
#no new line
-CREATE FUNCTION pyapi13_mult(i integer,j integer) returns integer LANGUAGE
PYTHON3YTHON_MAP { return(i*j) };
+CREATE FUNCTION pyapi13_mult(i integer,j integer) returns integer LANGUAGE
PYTHON3 { return(i*j) };
SELECT COUNT(pyapi13_mult(i,j)) FROM pyapi13_random_table_nulls(5000);
DROP FUNCTION pyapi13_mult;
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_13.stable.err
b/monetdb5/extras/pyapi3/Tests/pyapi3_13.stable.err
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_13.stable.err
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_13.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'pyapi13` in directory 'sql/backends/monet5` itself:
+stderr of test 'pyapi3_13` in directory 'monetdb5/extras/pyapi3` itself:
# 18:27:33 >
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_13.stable.out
b/monetdb5/extras/pyapi3/Tests/pyapi3_13.stable.out
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_13.stable.out
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_13.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'pyapi13` in directory 'sql/backends/monet5` itself:
+stdout of test 'pyapi3_13` in directory 'monetdb5/extras/pyapi3` itself:
# 18:27:33 >
@@ -22,53 +22,10 @@ stdout of test 'pyapi13` in directory 's
# MonetDB/R module loaded
Ready.
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 11_times.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_querylog.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 17_temporal.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_functions.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 24_zorder.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 26_sysmon.sql
-# loading sql script: 27_rejects.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 39_analytics_hge.sql
-# loading sql script: 40_json.sql
-# loading sql script: 40_json_hge.sql
-# loading sql script: 41_md5sum.sql
-# loading sql script: 45_uuid.sql
-# loading sql script: 51_sys_schema_extension.sql
-# loading sql script: 75_storagemodel.sql
-# loading sql script: 80_statistics.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 80_udf_hge.sql
-# loading sql script: 90_generator.sql
-# loading sql script: 90_generator_hge.sql
-# loading sql script: 99_system.sql
-test
-testtest
-
-test123
-testtest
-""test2""
-hello world
-
-y is not negative!
-Addition in python is not inconsistent!
-
-# 18:27:33 >
-# 18:27:33 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1088" "--port=37004"
-# 18:27:33 >
+# 17:56:52 >
+# 17:56:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17686" "--port=32656"
+# 17:56:52 >
#START TRANSACTION;
#CREATE FUNCTION pyapi13_random_table_nulls(entries integer) returns table (i
integer, j integer)
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_15.sql
b/monetdb5/extras/pyapi3/Tests/pyapi3_15.sql
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_15.sql
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_15.sql
@@ -6,7 +6,7 @@ INSERT INTO ival VALUES (1, 1), (2, 2),
CREATE FUNCTION pyapi15(i integer, j integer) returns integer
-language P
+LANGUAGE PYTHON3
{
# type <lazyarray>
print(type(i))
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_16.sql
b/monetdb5/extras/pyapi3/Tests/pyapi3_16.sql
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_16.sql
+++ b/monetdb5/extras/pyapi3/Tests/pyapi3_16.sql
@@ -5,7 +5,7 @@ CREATE TABLE vals(a STRING, b STRING, c
INSERT INTO vals VALUES ('foo', 'bar', '123', 33), ('t', 'e', 's', 7), ('f',
'o', 'u', 4), ('i', 'k', 'r', 149);
CREATE FUNCTION pyapi16(a STRING, b string, c STRING, d INTEGER) returns table
(d boolean)
-language P
+LANGUAGE PYTHON3
{
print(_columns['a'])
print(_columns['b'])
diff --git a/monetdb5/extras/pyapi3/Tests/pyapi3_16.stable.err
b/monetdb5/extras/pyapi3/Tests/pyapi3_16.stable.err
--- a/monetdb5/extras/pyapi3/Tests/pyapi3_16.stable.err
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
