MonetDB: default - fixed rapi14/03 ie use TYPE_bit for boolean n...

[Niels Nes]

Changeset: b462ae815933 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b462ae815933
Modified Files:
        monetdb5/extras/rapi/rapi.c
        sql/backends/monet5/Tests/rapi14.sql
        sql/backends/monet5/Tests/rapi14.stable.err
        sql/backends/monet5/Tests/rapi14.stable.out
Branch: default
Log Message:

fixed rapi14/03 ie use TYPE_bit for boolean not bte


diffs (69 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
@@ -499,6 +499,9 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
                varname = PROTECT(Rf_install(args[i]));
 
                switch (ATOMstorage(getColumnType(getArgType(mb,pci,i)))) {
+               case TYPE_bit:
+                       BAT_TO_INTSXP(b, bit, varvalue);
+                       break;
                case TYPE_bte:
                        BAT_TO_INTSXP(b, bte, varvalue);
                        break;
@@ -668,6 +671,7 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
                                                                        i, 
rtypename(TYPEOF(ret_col)));
                                goto wrapup;
                        }
+                       bat_type = TYPE_bit;
                        SXP_TO_BAT(bit, LOGICAL_POINTER, *p==NA_LOGICAL);
                        break;
                }
diff --git a/sql/backends/monet5/Tests/rapi14.sql 
b/sql/backends/monet5/Tests/rapi14.sql
--- a/sql/backends/monet5/Tests/rapi14.sql
+++ b/sql/backends/monet5/Tests/rapi14.sql
@@ -11,8 +11,8 @@ language R
 
 SELECT rapi14() FROM dval;
 
---DROP FUNCTION rapi14;
---DROP TABLE dval;
+DROP FUNCTION rapi14;
+DROP TABLE dval;
 
 ROLLBACK;
 
diff --git a/sql/backends/monet5/Tests/rapi14.stable.err 
b/sql/backends/monet5/Tests/rapi14.stable.err
--- a/sql/backends/monet5/Tests/rapi14.stable.err
+++ b/sql/backends/monet5/Tests/rapi14.stable.err
@@ -30,9 +30,6 @@ stderr of test 'rapi14` in directory 'sq
 # 10:57:32 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-36459" "--port=30595"
 # 10:57:32 >  
 
-MAPI  = (monetdb) /var/tmp/mtest-36459/.s.monetdb.30595
-QUERY = SELECT rapi14() FROM dval;
-ERROR = !Unknown return value, possibly projecting with no parameters.
 
 # 10:57:33 >  
 # 10:57:33 >  "Done."
diff --git a/sql/backends/monet5/Tests/rapi14.stable.out 
b/sql/backends/monet5/Tests/rapi14.stable.out
--- a/sql/backends/monet5/Tests/rapi14.stable.out
+++ b/sql/backends/monet5/Tests/rapi14.stable.out
@@ -70,6 +70,17 @@ Ready.
 #{
 #    rep(T,4)
 #};
+#SELECT rapi14() FROM dval;
+% .L # table_name
+% rapi14 # name
+% boolean # type
+% 5 # length
+[ true ]
+[ true ]
+[ true ]
+[ true ]
+#DROP FUNCTION rapi14;
+#DROP TABLE dval;
 #ROLLBACK;
 
 # 10:57:33 >  
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list