MonetDB: RIntegration - Accept the erroneous rapi test

[Martin Kersten]

Changeset: ad6540d951c4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad6540d951c4
Modified Files:
        monetdb5/extras/rapi/rapi.c
        sql/backends/monet5/Tests/rapi01.sql
        sql/backends/monet5/Tests/rapi02.sql
Branch: RIntegration
Log Message:

Accept the erroneous rapi test


diffs (50 lines):

diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -202,6 +202,7 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
                        else BUNappend(b, getArgReference(stk,pci,i), FALSE);
                        BATsetcount(b,1);
                        BATseqbase(b,0);
+                       BATsettrivprop(b);
                } else {
                        b = BATdescriptor(*(int*) getArgReference(stk, pci, i));
                        if (b == NULL){
@@ -424,7 +425,7 @@ str RAPIevalScalar(Client cntxt, MalBlkP
        int ret_cols = 0; /* int because pci->retc is int, too*/
        str *args;
        int evalErr;
-       char *msg = createException(MAL, "rapi.scalar", "NYI");
+       char *msg = MAL_SUCCEED; 
        BAT *b;
        BUN cnt;
 
diff --git a/sql/backends/monet5/Tests/rapi01.sql 
b/sql/backends/monet5/Tests/rapi01.sql
--- a/sql/backends/monet5/Tests/rapi01.sql
+++ b/sql/backends/monet5/Tests/rapi01.sql
@@ -23,6 +23,7 @@ language R {
 select * from functions where name = 'rapi01';
 
 explain select * from rapi01(0.01) as R;
+select * from rapi01(0.01) as R;
 
 drop function rapi01;
 drop table rapitable;
diff --git a/sql/backends/monet5/Tests/rapi02.sql 
b/sql/backends/monet5/Tests/rapi02.sql
--- a/sql/backends/monet5/Tests/rapi02.sql
+++ b/sql/backends/monet5/Tests/rapi02.sql
@@ -1,7 +1,7 @@
 -- MonetDB R interface
 
 -- testing robustness, should not cause a segfault
-create function rapi02(i integer) returns table (d float)
+create function rapi02() returns table (d float)
 language R {
        arg1 <- c(1804289383, 846930886, 1681692777, 1714636915, 1957747793, 
424238335, 719885386, 1649760492, 596516649, 1189641421);
        someval <- Re(fft(arg1)); return(someval);
@@ -10,5 +10,6 @@ language R {
 select * from functions where name = 'rapi02';
 
 explain select * from rapi02() as R;
+select * from rapi02() as R;
 
 drop function rapi02;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list