Changeset: 17dba39a115b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=17dba39a115b
Modified Files:
monetdb5/extras/pyapi/Tests/pyapi_modify_input.stable.err
monetdb5/extras/pyapi/Tests/pyapi_returntypes.stable.err
sql/backends/monet5/Tests/pyapi09.stable.err
sql/backends/monet5/Tests/pyapi09.stable.out
sql/backends/monet5/Tests/pyapi10.stable.err
Branch: pyapi
Log Message:
Approve modified test output.
diffs (223 lines):
diff --git a/monetdb5/extras/pyapi/Tests/pyapi_modify_input.stable.err
b/monetdb5/extras/pyapi/Tests/pyapi_modify_input.stable.err
--- a/monetdb5/extras/pyapi/Tests/pyapi_modify_input.stable.err
+++ b/monetdb5/extras/pyapi/Tests/pyapi_modify_input.stable.err
@@ -31,45 +31,45 @@ stderr of test 'pyapi_modify_input` in d
# 12:27:29 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30203" "--port=31030"
# 12:27:29 >
-MAPI = (monetdb) /var/tmp/mtest-14033/.s.monetdb.39892
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = rstr:bat[:oid,:str] :=
pyapi.eval(nil:ptr,"arg1[0].__setitem__(0,'a')\nreturn(arg1)",bstr);
ERROR = !MALException:pyapi.eval:Python exception
- ! 1. def pyfun(arg1,_columns,_column_types,_values):
+ ! 1. def pyfun(arg1,_columns,_column_types,_values,_conn):
!> 2. arg1[0].__setitem__(0,'a')
! 3. return(arg1)
!'numpy.string_' object has no attribute '__setitem__'
-MAPI = (monetdb) /var/tmp/mtest-14033/.s.monetdb.39892
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = rstr:bat[:oid,:str] :=
pyapi.eval(nil:ptr,"arg1[0][0]='d'\nreturn(arg1)",bstr);
ERROR = !MALException:pyapi.eval:Python exception
- ! 1. def pyfun(arg1,_columns,_column_types,_values):
+ ! 1. def pyfun(arg1,_columns,_column_types,_values,_conn):
!> 2. arg1[0][0]='d'
! 3. return(arg1)
!'numpy.string_' object does not support item assignment
-MAPI = (monetdb) /var/tmp/mtest-14033/.s.monetdb.39892
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = rstr:bat[:oid,:str] :=
pyapi.eval(nil:ptr,"arg1[0].reverse()\nreturn(arg1)",bstr);
ERROR = !MALException:pyapi.eval:Python exception
- ! 1. def pyfun(arg1,_columns,_column_types,_values):
+ ! 1. def pyfun(arg1,_columns,_column_types,_values,_conn):
!> 2. arg1[0].reverse()
! 3. return(arg1)
!'numpy.string_' object has no attribute 'reverse'
-MAPI = (monetdb) /var/tmp/mtest-14033/.s.monetdb.39892
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = rstr:bat[:oid,:str] := pyapi.eval(nil:ptr,"a =
arg1[0].remove('a')\nreturn(arg1)",bstr);
ERROR = !MALException:pyapi.eval:Python exception
- ! 1. def pyfun(arg1,_columns,_column_types,_values):
+ ! 1. def pyfun(arg1,_columns,_column_types,_values,_conn):
!> 2. a = arg1[0].remove('a')
! 3. return(arg1)
!'numpy.string_' object has no attribute 'remove'
-MAPI = (monetdb) /var/tmp/mtest-14033/.s.monetdb.39892
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = rstr:bat[:oid,:str] := pyapi.eval(nil:ptr,"a =
arg1[0].pop()\nreturn(arg1)",bstr);
ERROR = !MALException:pyapi.eval:Python exception
- ! 1. def pyfun(arg1,_columns,_column_types,_values):
+ ! 1. def pyfun(arg1,_columns,_column_types,_values,_conn):
!> 2. a = arg1[0].pop()
! 3. return(arg1)
!'numpy.string_' object has no attribute 'pop'
-MAPI = (monetdb) /var/tmp/mtest-14033/.s.monetdb.39892
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = result:bat[:oid,:int] := pyapi.eval(nil:ptr,
"arg1[0]=4\nreturn(arg1)", a);
ERROR = !MALException:pyapi.eval:Python exception
- ! 1. def pyfun(arg1,_columns,_column_types,_values):
+ ! 1. def pyfun(arg1,_columns,_column_types,_values,_conn):
!> 2. arg1[0]=4
! 3. return(arg1)
!assignment destination is read-only
diff --git a/monetdb5/extras/pyapi/Tests/pyapi_returntypes.stable.err
b/monetdb5/extras/pyapi/Tests/pyapi_returntypes.stable.err
--- a/monetdb5/extras/pyapi/Tests/pyapi_returntypes.stable.err
+++ b/monetdb5/extras/pyapi/Tests/pyapi_returntypes.stable.err
@@ -31,45 +31,45 @@ stderr of test 'pyapi_returntypes` in di
# 23:33:07 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20340" "--port=36739"
# 23:33:07 >
-MAPI = (monetdb) /var/tmp/mtest-17300/.s.monetdb.30259
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = r:bat[:oid,:int] := pyapi.eval(nil:ptr,"return(\"Test\")");
ERROR = !MALException:pyapi.eval:Could not convert from type STRING to type int
-MAPI = (monetdb) /var/tmp/mtest-17300/.s.monetdb.30259
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = (r:bat[:oid,:int], s:bat[:oid,:int]) := pyapi.eval(nil:ptr,"class
NewClass:\n x = 5\n\nreturn(NewClass())");
ERROR = !MALException:pyapi.eval:Unsupported result object. Expected either a
list, dictionary, a numpy array, a numpy masked array or a pandas data frame,
but received an object of type "<type 'instance'>"
-MAPI = (monetdb) /var/tmp/mtest-17300/.s.monetdb.30259
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = (r:bat[:oid,:int], s:bat[:oid,:int]) :=
pyapi.eval(nil:ptr,"return(12)");
ERROR = !MALException:pyapi.eval:A single scalar was returned, yet we expect a
list of 2 columns. We can only convert a single scalar into a single column,
thus the result is invalid.
-MAPI = (monetdb) /var/tmp/mtest-17300/.s.monetdb.30259
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = (r:bat[:oid,:int], s:bat[:oid,:int]) :=
pyapi.eval(nil:ptr,"return(numpy.array([12]))");
ERROR = !MALException:pyapi.eval:A single array was returned, yet we expect a
list of 2 columns. The result is invalid.
-MAPI = (monetdb) /var/tmp/mtest-17300/.s.monetdb.30259
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = (r:bat[:oid,:int], s:bat[:oid,:int]) :=
pyapi.eval(nil:ptr,"return([12])");
ERROR = !MALException:pyapi.eval:A single array was returned, yet we expect a
list of 2 columns. The result is invalid.
-MAPI = (monetdb) /var/tmp/mtest-17300/.s.monetdb.30259
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = r:bat[:oid,:int] := pyapi.eval(nil:ptr,"return([[33,24,55],
[44,66,345]])");
ERROR = !MALException:pyapi.eval:An array of size 2 was returned, yet we
expect a list of 1 columns. The result is invalid.
-MAPI = (monetdb) /var/tmp/mtest-17300/.s.monetdb.30259
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = a:bat[:oid,:str] := pyapi.eval(nil:ptr,"x =
unicode(\"hello\")\nreturn(x.encode(\"utf32\"))");
ERROR = !MALException:pyapi.eval:Invalid string encoding used. Please return a
regular ASCII string, or a Numpy_Unicode object.
-MAPI = (monetdb) /var/tmp/mtest-17300/.s.monetdb.30259
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = bb:bat[:oid,:int] := pyapi.eval(nil:ptr,"return (1");
ERROR = !MALException:pyapi.eval:Could not parse Python code
- ! 1. def pyfun(_columns,_column_types,_values):
+ ! 1. def pyfun(_columns,_column_types,_values,_conn):
!> 2. return (1
!invalid syntax (<string>, line 2)
-MAPI = (monetdb) /var/tmp/mtest-17300/.s.monetdb.30259
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = cc:bat[:oid,:int] := pyapi.eval(nil:ptr,"x = 4\n x++\n\treturn (x)");
ERROR = !MALException:pyapi.eval:Could not parse Python code
- ! 1. def pyfun(_columns,_column_types,_values):
+ ! 1. def pyfun(_columns,_column_types,_values,_conn):
! 2. x = 4
!> 3. x++
! 4. return (x)
!unexpected indent (<string>, line 3)
-MAPI = (monetdb) /var/tmp/mtest-17300/.s.monetdb.30259
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = (str1:bat[:oid,:str], str2:bat[:oid,:str]) := pyapi.eval(nil:ptr,"x =
unicode(\"hello\")\nreturn(numpy.array([[x.encode(\"utf32\")],
[x.encode(\"utf32\")]]))");
ERROR = !MALException:pyapi.eval:Invalid string encoding used. Please return a
regular ASCII string, or a Numpy_Unicode object.
-MAPI = (monetdb) /var/tmp/mtest-17300/.s.monetdb.30259
+MAPI = (monetdb) /var/tmp/mtest-26471/.s.monetdb.31185
QUERY = (str1:bat[:oid,:str], str2:bat[:oid,:str]) :=
pyapi.eval(nil:ptr,"return(numpy.array([[\"Hëllo\", \"Hello Again\"], [\"Hello
Again Again\",\"That's quite enough.\"]]))");
ERROR = !MALException:pyapi.eval:Invalid string encoding used. Please return a
regular ASCII string, or a Numpy_Unicode object.
diff --git a/sql/backends/monet5/Tests/pyapi09.stable.err
b/sql/backends/monet5/Tests/pyapi09.stable.err
--- a/sql/backends/monet5/Tests/pyapi09.stable.err
+++ b/sql/backends/monet5/Tests/pyapi09.stable.err
@@ -31,6 +31,22 @@ stderr of test 'pyapi09` in directory 's
# 14:42:12 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30058" "--port=35977"
# 14:42:12 >
+MAPI = (monetdb) /var/tmp/mtest-25654/.s.monetdb.32235
+QUERY = SELECT * FROM pyapi09();
+ERROR = !SELECT: no such table 'unknown_table'
+ !Python exception
+ !
+ ! 1. def pyfun(_columns,_column_types,_values,_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-25654/.s.monetdb.32235
+QUERY = SELECT * FROM pyapi09();
+ERROR = !SELECT: no such table 'unknown_table'
+MAPI = (monetdb) /var/tmp/mtest-25654/.s.monetdb.32235
+QUERY = SELECT 1; # yes it does...
+ERROR = !current transaction is aborted (please ROLLBACK)
# 14:42:12 >
# 14:42:12 > "Done."
diff --git a/sql/backends/monet5/Tests/pyapi09.stable.out
b/sql/backends/monet5/Tests/pyapi09.stable.out
--- a/sql/backends/monet5/Tests/pyapi09.stable.out
+++ b/sql/backends/monet5/Tests/pyapi09.stable.out
@@ -117,6 +117,39 @@ Ready.
[ 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)
+#};
+#ROLLBACK;
+#START TRANSACTION;
+#CREATE FUNCTION pyapi09() returns TABLE(i INTEGER)
+#language P
+#{
+# try: res = _conn.execute('SELECT * FROM unknown_table;')
+# except: pass
+# return numpy.arange(10)
+#};
+#SELECT * FROM pyapi09();
+% . # table_name
+% i # name
+% int # type
+% 1 # length
+[ 0 ]
+[ 1 ]
+[ 2 ]
+[ 3 ]
+[ 4 ]
+[ 5 ]
+[ 6 ]
+[ 7 ]
+[ 8 ]
+[ 9 ]
#ROLLBACK;
# 14:42:12 >
diff --git a/sql/backends/monet5/Tests/pyapi10.stable.err
b/sql/backends/monet5/Tests/pyapi10.stable.err
--- a/sql/backends/monet5/Tests/pyapi10.stable.err
+++ b/sql/backends/monet5/Tests/pyapi10.stable.err
@@ -31,15 +31,15 @@ stderr of test 'pyapi10` in directory 's
# 15:32:31 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27693" "--port=33372"
# 15:32:31 >
-MAPI = (monetdb) /var/tmp/mtest-24315/.s.monetdb.30457
+MAPI = (monetdb) /var/tmp/mtest-25654/.s.monetdb.32235
QUERY = SELECT AVG(pyapi10_error(i,j)) FROM pyapi10_random_table_nulls(5000);
ERROR = !MALException:pyapi.eval:Could not parse Python code
!
- ! 1. def pyfun(i,j,_columns,_column_types,_values):
+ ! 1. def pyfun(i,j,_columns,_column_types,_values,_conn):
!> 2. return(i*j
! 3.
!invalid syntax (<string>, line 2)
-MAPI = (monetdb) /var/tmp/mtest-24315/.s.monetdb.30457
+MAPI = (monetdb) /var/tmp/mtest-25654/.s.monetdb.32235
QUERY = SELECT AVG(pyapi10_indentation_error(i,j)) FROM
pyapi10_random_table_nulls(5000);
ERROR = !MALException:pyapi.eval:Could not parse Python code
! 7. f = 6
@@ -48,7 +48,7 @@ ERROR = !MALException:pyapi.eval:Could n
! 10. i = 9
! 11. j = 10
!unexpected indent (<string>, line 9)
-MAPI = (monetdb) /var/tmp/mtest-24315/.s.monetdb.30457
+MAPI = (monetdb) /var/tmp/mtest-25654/.s.monetdb.32235
QUERY = SELECT AVG(pyapi10_runtime_exception(i,j)) FROM
pyapi10_random_table_nulls(5000);
ERROR = !MALException:pyapi.eval:Python exception
! 4. mydivision = 0
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
