Changeset: 790e0bdfaada for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=790e0bdfaada
Modified Files:
        sql/backends/monet5/UDF/capi/Tests/capi00.test
        sql/backends/monet5/UDF/capi/Tests/capi01.test
        sql/backends/monet5/UDF/capi/Tests/capi02.test
        sql/backends/monet5/UDF/capi/Tests/capi03.test
        sql/backends/monet5/UDF/capi/Tests/capi04.test
        sql/backends/monet5/UDF/capi/Tests/capi05.test
        sql/backends/monet5/UDF/capi/Tests/capi06.test
        sql/backends/monet5/UDF/capi/Tests/capi07.test
        sql/backends/monet5/UDF/capi/Tests/capi08.test
        sql/backends/monet5/UDF/capi/Tests/capi09.test
        sql/backends/monet5/UDF/capi/Tests/capi10.test
        sql/backends/monet5/UDF/capi/Tests/capi11.test
        sql/backends/monet5/UDF/capi/Tests/capi13.test
        sql/backends/monet5/UDF/capi/Tests/capi14.test
        sql/backends/monet5/UDF/capi/Tests/capi15.test
        sql/backends/monet5/UDF/capi/Tests/capi16.test
        sql/backends/monet5/UDF/capi/Tests/capi18.test
Branch: mtest
Log Message:

Redid capi, now without manual intervention.
This changes some types to R (real) and even adds an #include that
went AWOL.


diffs (263 lines):

diff --git a/sql/backends/monet5/UDF/capi/Tests/capi00.test 
b/sql/backends/monet5/UDF/capi/Tests/capi00.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi00.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi00.test
@@ -19,19 +19,15 @@ INSERT INTO integers VALUES (1), (2), (3
 query II rowsort
 SELECT i, capi00(i) FROM integers
 ----
-1
-2
-2
-4
-3
-6
-4
-8
-5
-10
+10 values hashing to 47508a3b5b0c8425b9d1ff6d66c9e7b0
 
 statement ok
 DROP FUNCTION capi00
 
 statement ok
 DROP TABLE integers
+
+statement ok
+ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi01.test 
b/sql/backends/monet5/UDF/capi/Tests/capi01.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi01.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi01.test
@@ -14,12 +14,12 @@ language C
         i->data[j] = j;
         d->data[j] = round(j > 0 ? 42.0 / j : 42.0);
     }
-};
+}
 
-query II rowsort
+query IR rowsort
 SELECT i,d FROM capi01(42) AS R
 ----
-84 values hashing to 5bb395f601dde2dc995b28f19ffe7d50
+84 values hashing to 521e7bcb7e89afd2b94fc0c2e54a3e48
 
 statement ok
 DROP FUNCTION capi01
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi02.test 
b/sql/backends/monet5/UDF/capi/Tests/capi02.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi02.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi02.test
@@ -117,3 +117,5 @@ DROP TABLE times
 
 statement ok
 ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi03.test 
b/sql/backends/monet5/UDF/capi/Tests/capi03.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi03.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi03.test
@@ -25,7 +25,6 @@ START TRANSACTION
 
 statement ok
 CREATE FUNCTION capi03(inp INTEGER) RETURNS INTEGER LANGUAGE C {
-    
 }
 
 statement ok
@@ -59,3 +58,5 @@ SELECT capi03(i) FROM integers
 
 statement ok
 ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi04.test 
b/sql/backends/monet5/UDF/capi/Tests/capi04.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi04.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi04.test
@@ -72,3 +72,5 @@ hello
 
 statement ok
 ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi05.test 
b/sql/backends/monet5/UDF/capi/Tests/capi05.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi05.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi05.test
@@ -28,3 +28,5 @@ 8
 
 statement ok
 ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi06.test 
b/sql/backends/monet5/UDF/capi/Tests/capi06.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi06.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi06.test
@@ -34,3 +34,5 @@ 5
 
 statement ok
 ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi07.test 
b/sql/backends/monet5/UDF/capi/Tests/capi07.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi07.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi07.test
@@ -25,3 +25,5 @@ 21
 
 statement ok
 ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi08.test 
b/sql/backends/monet5/UDF/capi/Tests/capi08.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi08.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi08.test
@@ -25,7 +25,6 @@ 4
 6
 8
 
-
 query I rowsort
 SELECT capi08(i) FROM integers
 ----
@@ -47,23 +46,23 @@ CREATE FUNCTION capi08(inp DOUBLE) RETUR
     }
 }
 
-query I rowsort
+query R rowsort
 SELECT capi08(i) FROM integers
 ----
-10
-2
-4
-6
-8
+10.000
+2.000
+4.000
+6.000
+8.000
 
-query I rowsort
+query R rowsort
 SELECT capi08(i) FROM integers
 ----
-10
-2
-4
-6
-8
+10.000
+2.000
+4.000
+6.000
+8.000
 
 statement ok
 DROP FUNCTION capi08
@@ -109,3 +108,5 @@ 2
 
 statement ok
 ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi09.test 
b/sql/backends/monet5/UDF/capi/Tests/capi09.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi09.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi09.test
@@ -34,3 +34,5 @@ DROP TABLE uuids
 
 statement ok
 ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi10.test 
b/sql/backends/monet5/UDF/capi/Tests/capi10.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi10.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi10.test
@@ -34,3 +34,5 @@ DROP FUNCTION capi10
 
 statement ok
 ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi11.test 
b/sql/backends/monet5/UDF/capi/Tests/capi11.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi11.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi11.test
@@ -82,3 +82,5 @@ 10.700
 
 statement ok
 ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi13.test 
b/sql/backends/monet5/UDF/capi/Tests/capi13.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi13.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi13.test
@@ -3,6 +3,7 @@ START TRANSACTION
 
 statement ok
 CREATE AGGREGATE capi13(inp INTEGER) RETURNS BIGINT LANGUAGE C {
+#include <string.h>
        // initialize one aggregate per group
        result->initialize(result, aggr_group.count);
        // zero initialize the sums
@@ -40,3 +41,5 @@ DROP TABLE vals
 
 statement ok
 ROLLBACK
+
+
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
@@ -44,3 +44,5 @@ DROP TABLE vals
 
 statement ok
 ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi15.test 
b/sql/backends/monet5/UDF/capi/Tests/capi15.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi15.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi15.test
@@ -26,3 +26,5 @@ DROP FUNCTION capi16
 
 statement ok
 ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi16.test 
b/sql/backends/monet5/UDF/capi/Tests/capi16.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi16.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi16.test
@@ -16,10 +16,10 @@ LANGUAGE C {
         }
         result->data[i][len] = '\0';
     }
-};
+}
 
 query TT rowsort
-SELECT 'hello', string_reverse('hello');
+SELECT 'hello', string_reverse('hello')
 ----
 hello
 olleh
@@ -133,3 +133,5 @@ 1993-09-20 10:34:34.234000
 
 statement ok
 ROLLBACK
+
+
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi18.test 
b/sql/backends/monet5/UDF/capi/Tests/capi18.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi18.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi18.test
@@ -1,5 +1,5 @@
 statement ok
-START TRANSACTION;
+START TRANSACTION
 
 statement ok
 CREATE FUNCTION capi00(inp INTEGER) RETURNS INTEGER LANGUAGE C {
@@ -45,3 +45,5 @@ DROP TABLE integers
 
 statement ok
 ROLLBACK
+
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to