MonetDB: sciql - merged from default

[Jennie Zhang]

Changeset: b41c8a019923 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b41c8a019923
Modified Files:
        
Branch: sciql
Log Message:

merged from default


diffs (37 lines):

diff --git a/monetdb5/optimizer/opt_octopus.mx 
b/monetdb5/optimizer/opt_octopus.mx
--- a/monetdb5/optimizer/opt_octopus.mx
+++ b/monetdb5/optimizer/opt_octopus.mx
@@ -181,6 +181,7 @@ opt_export int OPTlegAdviceInternal(MalB
 #include "mal_interpreter.h"   /* for showErrors() */
 #include "mal_builder.h"
 #include "mal_sabaoth.h"
+#include "remote.h"
 #include "mal_recycle.h"
 
 typedef struct MALPART {
@@ -1304,11 +1305,23 @@ cleanup:
 int 
 OPTlegAdviceInternal(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
+       bat bid = 0;
+       BAT *b;
+       char buf[BUFSIZ]= "*/octopus", *s= buf;
+       str msg = MAL_SUCCEED;
 
        (void) stk;
        (void) pci;
-       if ( isOptimizerEnabled(mb,octopusRef) )
-               return GDKnr_threads;
+       if ( isOptimizerEnabled(mb,octopusRef) ){
+
+               msg = RMTresolve(&bid,&s);
+               if ( msg == MAL_SUCCEED) {
+                       b = BBPquickdesc(bid, FALSE);
+                       if ( b != NULL && BATcount(b) > 0 )
+                               return BATcount(b);
+               }
+               /*      return GDKnr_threads;*/
+       }
        return -1;
 }
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list