Changeset: 8c6954c0cdcd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c6954c0cdcd
Modified Files:
monetdb5/extras/pyapi/Tests/All
sql/backends/monet5/Tests/pyapi19.sql
sql/backends/monet5/Tests/pyapi19.stable.out
Branch: pythonudf
Log Message:
Fix tests for systems without HUGE.
diffs (51 lines):
diff --git a/monetdb5/extras/pyapi/Tests/All b/monetdb5/extras/pyapi/Tests/All
--- a/monetdb5/extras/pyapi/Tests/All
+++ b/monetdb5/extras/pyapi/Tests/All
@@ -1,6 +1,6 @@
-HAVE_LIBPY?pyapi_types_huge
+HAVE_LIBPY&HAVE_HGE?pyapi_types_huge
HAVE_LIBPY?pyapi_returntypes
HAVE_LIBPANDAS?pyapi_pandas
HAVE_LIBPY?pyapi_types_string
diff --git a/sql/backends/monet5/Tests/pyapi19.sql
b/sql/backends/monet5/Tests/pyapi19.sql
--- a/sql/backends/monet5/Tests/pyapi19.sql
+++ b/sql/backends/monet5/Tests/pyapi19.sql
@@ -73,21 +73,21 @@ ROLLBACK;
START TRANSACTION;
# try multiple columns of different types
-CREATE FUNCTION pyapi19_create_table() returns table (i integer, j integer, k
double, l float, m hugeint, n bigint, o STRING, p DECIMAL) LANGUAGE P
+CREATE FUNCTION pyapi19_create_table() returns table (i integer, j integer, k
double, l float, m smallint, n bigint, o STRING, p DECIMAL) LANGUAGE P
{
result = dict();
result['i'] = numpy.arange(100000, 0, -1);
result['j'] = numpy.arange(100000, 0 , -1);
result['k'] = numpy.arange(100000);
result['l'] = numpy.arange(100000, 0 , -1);
- result['m'] = numpy.arange(100000);
+ result['m'] = numpy.tile(numpy.arange(100), 1000)
result['n'] = numpy.arange(100000, 0 , -1);
result['o'] = numpy.arange(100000);
result['p'] = numpy.arange(100000);
return result
};
-CREATE FUNCTION pyapi19_load_table() returns table (i integer, j integer, k
double, l float, m hugeint, n bigint, o STRING, p DECIMAL) LANGUAGE PYTHON_MAP
+CREATE FUNCTION pyapi19_load_table() returns table (i integer, j integer, k
double, l float, m smallint, n bigint, o STRING, p DECIMAL) LANGUAGE PYTHON_MAP
{
res = _conn.execute('SELECT * FROM pyapi19_integers;')
return res
diff --git a/sql/backends/monet5/Tests/pyapi19.stable.out
b/sql/backends/monet5/Tests/pyapi19.stable.out
--- a/sql/backends/monet5/Tests/pyapi19.stable.out
+++ b/sql/backends/monet5/Tests/pyapi19.stable.out
@@ -139,7 +139,7 @@ Ready.
#SELECT * FROM pyapi19_load_table() LIMIT 100;
% ., ., ., ., ., ., ., . # table_name
% i, j, k, l, m, n, o, p # name
-% int, int, double, double, hugeint, bigint, clob, decimal # type
+% int, int, double, double, smallint, bigint, clob, decimal # type
% 6, 6, 24, 24, 2, 6, 2, 20 # length
[ 100000, 100000, 0, 1e+05, 0, 100000, "0", 0.000 ]
[ 99999, 99999, 1, 99999, 1, 99999, "1", 1.000 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
