MonetDB: trails - Small corrections

[Pedro Ferreira]

Changeset: 7240f9be962d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7240f9be962d
Modified Files:
        sql/backends/monet5/sql_cquery.c
Branch: trails
Log Message:

Small corrections


diffs (55 lines):

diff --git a/sql/backends/monet5/sql_cquery.c b/sql/backends/monet5/sql_cquery.c
--- a/sql/backends/monet5/sql_cquery.c
+++ b/sql/backends/monet5/sql_cquery.c
@@ -452,7 +452,7 @@ CQregister(Client cntxt, str sname, str 
        MalBlkPtr mb = NULL, prev;
        const char* err_message = (which & mod_continuous_function) ? 
"function" : "procedure";
        char* cq_id = NULL;
-       int i, idx, varid;
+       int i, idx, varid, cid;
        char buffer[IDLENGTH];
        backend* be = (backend*) cntxt->sqlcontext;
        mvc *m = be->mvc;
@@ -493,6 +493,13 @@ CQregister(Client cntxt, str sname, str 
                goto finish;
        }
 
+       //Find the UDF
+       f = sql_find_func(m->sa, s, fname, argc > 0 ? argc : -1, (which & 
mod_continuous_function) ? F_FUNC : F_PROC, NULL);
+       if(!f) {
+               msg = createException(SQL,"cquery.register",SQLSTATE(3F000) 
"Failed to bind %s %s.%s\n", err_message, sname, fname);
+               GDKfree(ralias);
+               goto finish;
+       }
        if((l = list_create(NULL)) == NULL) {
                FREE_CQ_MB(finish)
        }
@@ -500,16 +507,6 @@ CQregister(Client cntxt, str sname, str 
                atom *a = args[i];
                list_append(l, stmt_varnr(be, i, &a->tpe));
        }
-       if(argc)
-               f = sql_find_func(m->sa, s, fname, argc, (which & 
mod_continuous_function) ? F_FUNC : F_PROC, NULL); //bind the UDF
-       else
-               f = sql_bind_func_(m->sa, s, fname, l, (which & 
mod_continuous_function) ? F_FUNC : F_PROC);
-       if(!f) {
-               msg = createException(SQL,"cquery.register",SQLSTATE(3F000) 
"Failed to bind %s %s.%s\n", err_message, sname, fname);
-               GDKfree(ralias);
-               list_destroy(l);
-               goto finish;
-       }
        if (backend_create_subfunc(be, f, l) < 0) { //create the backend 
function
                msg = createException(SQL,"cquery.register",SQLSTATE(3F000) 
"Failed to generate backend function\n");
                GDKfree(ralias);
@@ -518,7 +515,10 @@ CQregister(Client cntxt, str sname, str 
        }
        list_destroy(l);
 
-       (void) snprintf(buffer, sizeof(buffer), "cq_%d", ++CQ_counter); //set 
the CQ ID
+       MT_lock_set(&ttrLock);
+       cid = ++CQ_counter;
+       MT_lock_unset(&ttrLock);
+       (void) snprintf(buffer, sizeof(buffer), "cq_%d", cid); //set the CQ ID
        if((cq_id = GDKstrdup(buffer)) == NULL) {
                FREE_CQ_MB(finish)
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list