MonetDB: jitudf - Fixes after merge.

[Mark Raasveldt]

Changeset: 7a364f69e1c7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a364f69e1c7
Modified Files:
        gdk/gdk_utils.c
        gdk/gdk_utils.h
        sql/backends/monet5/UDF/capi/capi.c
        sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.err
        sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
        sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.err
        sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out
Branch: jitudf
Log Message:

Fixes after merge.


diffs (119 lines):

diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -101,25 +101,26 @@ GDKgetenv(const char *name)
 }
 
 int
-GDKgetenv_isyes(const char *name)
+GDKgetenv_istext(const char *name, const char* text)
 {
        char *val = GDKgetenv(name);
 
-       if (val && strcasecmp(val, "yes") == 0) {
+       if (val && strcasecmp(val, text) == 0) {
                return 1;
        }
        return 0;
 }
 
 int
+GDKgetenv_isyes(const char *name)
+{
+       return GDKgetenv_istext(name, "yes");
+}
+
+int
 GDKgetenv_istrue(const char *name)
 {
-       char *val = GDKgetenv(name);
-
-       if (val && strcasecmp(val, "true") == 0) {
-               return 1;
-       }
-       return 0;
+       return GDKgetenv_istext(name, "true");
 }
 
 int
diff --git a/gdk/gdk_utils.h b/gdk/gdk_utils.h
--- a/gdk/gdk_utils.h
+++ b/gdk/gdk_utils.h
@@ -17,8 +17,8 @@ gdk_export BAT *GDKval;
 
 gdk_export char *GDKgetenv(const char *name);
 
+gdk_export int GDKgetenv_istext(const char *name, const char* text);
 gdk_export int GDKgetenv_isyes(const char *name);
-
 gdk_export int GDKgetenv_istrue(const char *name);
 
 gdk_export int GDKgetenv_int(const char *name, int def);
diff --git a/sql/backends/monet5/UDF/capi/capi.c 
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -62,6 +62,7 @@ typedef struct _cached_functions {
 
 static cached_functions *function_cache[FUNCTION_CACHE_SIZE];
 static MT_Lock cache_lock;
+static int cudf_initialized = 0;
 
 static str CUDFeval(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci,
                                        bit grouped);
@@ -79,7 +80,10 @@ str CUDFevalAggr(Client cntxt, MalBlkPtr
 str CUDFprelude(void *ret)
 {
        (void)ret;
-       MT_lock_init(&cache_lock, "cache_lock");
+       if (!cudf_initialized) {
+               MT_lock_init(&cache_lock, "cache_lock");
+               cudf_initialized = true;
+       }
        return MAL_SUCCEED;
 }
 
@@ -1455,7 +1459,7 @@ static str CUDFeval(Client cntxt, MalBlk
                // return the BAT from the function
                if (isaBatType(getArgType(mb, pci, i))) {
                        *getArgReference_bat(stk, pci, i) = b->batCacheid;
-                       // BBPkeepref(b->batCacheid);
+                       BBPkeepref(b->batCacheid);
                } else {
                        // single value return, only for non-grouped 
aggregations
                        BATiter li = bat_iterator(b);
diff --git a/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.err 
b/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.err
--- a/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.err
+++ b/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'udf-fuse` in directory 'sql/backends/monet5/UDF/cudf` itself:
+stderr of test 'udf-fuse` in directory 'sql/backends/monet5/UDF/udf` itself:
 
 
 # 18:49:07 >  
diff --git a/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out 
b/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'udf-fuse` in directory 'sql/backends/monet5/UDF/cudf` itself:
+stdout of test 'udf-fuse` in directory 'sql/backends/monet5/UDF/udf` itself:
 
 
 # 18:49:07 >  
diff --git a/sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.err 
b/sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.err
--- a/sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.err
+++ b/sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'udf-reverse` in directory 'sql/backends/monet5/UDF/cudf` 
itself:
+stderr of test 'udf-reverse` in directory 'sql/backends/monet5/UDF/udf` itself:
 
 
 # 18:44:21 >  
diff --git a/sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out 
b/sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out
--- a/sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out
+++ b/sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'udf-reverse` in directory 'sql/backends/monet5/UDF/cudf` 
itself:
+stdout of test 'udf-reverse` in directory 'sql/backends/monet5/UDF/udf` itself:
 
 
 # 18:44:21 >  
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list