Changeset: 04c90cd2bc9a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/04c90cd2bc9a
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (truncated from 12854 to 300 lines):
diff --git a/geom/sql/functions/Tests/geomcasts.test
b/geom/sql/functions/Tests/geomcasts.test
--- a/geom/sql/functions/Tests/geomcasts.test
+++ b/geom/sql/functions/Tests/geomcasts.test
@@ -40,4 +40,3 @@ POINT (1 1)
POINT (2 2)
POINT (3 3)
-
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi14.test
b/sql/backends/monet5/UDF/capi/Tests/capi14.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi14.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi14.test
@@ -31,7 +31,7 @@ CREATE TABLE vals(i INTEGER, j REAL, k D
statement ok
INSERT INTO vals VALUES (1, NULL, 1), (NULL, 2, 2), (3, 3, NULL), (NULL, NULL,
NULL), (5, 5, 5)
-query ITRR rowsort
+query IRRR rowsort
SELECT i, j, k, capi14(i, j, k) FROM vals
----
1
@@ -39,15 +39,15 @@ NULL
1.000
1.000
3
-3.0
+3.000
NULL
5.000
5
-5.0
+5.000
5.000
15.000
NULL
-2.0
+2.000
2.000
3.000
NULL
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.test
b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.test
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.test
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.test
@@ -14,13 +14,13 @@ language P
return [True] * 4
}
-query T rowsort
+query I rowsort
SELECT pyapi04() FROM dval
----
-True
-True
-True
-True
+1
+1
+1
+1
statement ok
DROP FUNCTION pyapi04
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.test
b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.test
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.test
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.test
@@ -19,10 +19,10 @@ language P
return True
}
-query T rowsort
+query I rowsort
SELECT * FROM pyapi16( (SELECT * FROM vals) )
----
-True
+1
statement ok
DROP FUNCTION pyapi16
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.test
b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.test
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.test
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.test
@@ -13,13 +13,13 @@ language P
return retval
}
-query TTIT rowsort
+query TTII rowsort
SELECT * FROM pyapi17()
----
foo
bar
0
-True
+1
statement ok
DROP FUNCTION pyapi17
@@ -37,13 +37,13 @@ language P
return retval
}
-query TTIT rowsort
+query TTII rowsort
SELECT * FROM pyapi17()
----
foo
bar
0
-True
+1
statement ok
DROP FUNCTION pyapi17
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.test
b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.test
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.test
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.test
@@ -29,10 +29,10 @@ LANGUAGE P
statement ok
CREATE TABLE python_objects AS SELECT * FROM pyapi21_create() WITH DATA
-query T rowsort
+query I rowsort
SELECT pyapi21_load(s) FROM python_objects
----
-True
+1
statement ok
DROP FUNCTION pyapi21_create; DROP FUNCTION pyapi21_load; DROP TABLE
python_objects
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_28.test
b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_28.test
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_28.test
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_28.test
@@ -13,10 +13,10 @@ CREATE FUNCTION test_duplicates(s STRING
return True
}
-query T rowsort
+query I rowsort
SELECT test_duplicates(s) FROM duplicate_strings()
----
-True
+1
statement ok
ROLLBACK
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_32.test
b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_32.test
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_32.test
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_32.test
@@ -22,7 +22,106 @@ CREATE TABLE integers AS SELECT * FROM p
query I rowsort
SELECT pyapi32_function(i) FROM integers
----
-100 values hashing to c3672f1a3cbe048603a97455a52b9231
+0
+10
+100
+102
+104
+106
+108
+110
+112
+114
+116
+118
+12
+120
+122
+124
+126
+128
+130
+132
+134
+136
+138
+14
+140
+142
+144
+146
+148
+150
+152
+154
+156
+158
+16
+160
+162
+164
+166
+168
+170
+172
+174
+176
+178
+18
+180
+182
+184
+186
+188
+190
+192
+194
+196
+198
+2
+20
+22
+24
+26
+28
+30
+32
+34
+36
+38
+4
+40
+42
+44
+46
+48
+50
+52
+54
+56
+58
+6
+60
+62
+64
+66
+68
+70
+72
+74
+76
+78
+8
+80
+82
+84
+86
+88
+90
+92
+94
+96
+98
query I rowsort
SELECT pyapi32_function(i) FROM integers WHERE i > 50
@@ -80,7 +179,106 @@ 198
query I rowsort
SELECT pyapi32_function_mapped(i) FROM integers
----
-100 values hashing to c3672f1a3cbe048603a97455a52b9231
+0
+10
+100
+102
+104
+106
+108
+110
+112
+114
+116
+118
+12
+120
+122
+124
+126
+128
+130
+132
+134
+136
+138
+14
+140
+142
+144
+146
+148
+150
+152
+154
+156
+158
+16
+160
+162
+164
+166
+168
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
