MonetDB: headless - Fix compilation

[mk]

Changeset: 0c8ab1cc79c0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c8ab1cc79c0
Modified Files:
        monetdb5/scheduler/run_octopus.c
Branch: headless
Log Message:

Fix compilation
and put aside because it depends on remote.


diffs (39 lines):

diff --git a/monetdb5/scheduler/run_octopus.c b/monetdb5/scheduler/run_octopus.c
--- a/monetdb5/scheduler/run_octopus.c
+++ b/monetdb5/scheduler/run_octopus.c
@@ -197,11 +197,10 @@
 
 static str
 OCTOPUSdiscover(Client cntxt){
-       bat bid = 0;
-       BAT *b;
-       BUN p,q;
+       int bid = 0;
+       COL *b;
+       oid o;
        str msg = MAL_SUCCEED;
-       COLiter bi;
        int i;
        char buf[BUFSIZ]= "*/octopus", *s= buf;
 
@@ -214,9 +213,8 @@
        if ( msg == MAL_SUCCEED) {
                b = COLdescriptor(bid);
                if ( b != NULL && COLcount(b) > 0 ) {
-                       bi = col_iterator(b);
-                       COLloop(b,p,q){
-                               str t= (str) BUNtail(bi,p);
+                       COLforloop(b,o){
+                               str t= COLget_str(b,o);
 
                                workers[nrworkers].pnum = OCTOPUSgetPeer(t); 
/*ref to peers registry*/
                                snprintf(buf,BUFSIZ,"worker_%d",nrworkers);
@@ -228,7 +226,7 @@
                                nrworkers++;
                        }
                }
-               CBPreleaseref(bid);
+               CBPreleaseref(b);
        }
 
        if ( !nrworkers  ) {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list