MonetDB: hitchhiker - add dbalias in the connection string

[Thodoris Zois]

Changeset: 390d5ac2f34e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=390d5ac2f34e
Modified Files:
        monetdb5/optimizer/opt_hitchhiker.c
        sql/backends/monet5/sql_hitchhiker.c
Branch: hitchhiker
Log Message:

add dbalias in the connection string


diffs (87 lines):

diff --git a/monetdb5/optimizer/opt_hitchhiker.c 
b/monetdb5/optimizer/opt_hitchhiker.c
--- a/monetdb5/optimizer/opt_hitchhiker.c
+++ b/monetdb5/optimizer/opt_hitchhiker.c
@@ -31,9 +31,9 @@ OPThitchhikerImplementation(Client cntxt
     str home_node = "localhost:50000";
     int next_node_idx = 2;
     const char* landscape[3] = {
-        "localhost:50000",
-        "localhost:50001",
-        "localhost:50002",
+        "localhost:50000:mdb1",
+        "localhost:50001:mdb2",
+        "localhost:50002:mdb3",
     };
 
     // check if optimizer has been applied
diff --git a/sql/backends/monet5/sql_hitchhiker.c 
b/sql/backends/monet5/sql_hitchhiker.c
--- a/sql/backends/monet5/sql_hitchhiker.c
+++ b/sql/backends/monet5/sql_hitchhiker.c
@@ -20,10 +20,9 @@ hh_move(Client cntxt, MalBlkPtr mb, MalS
     str username = "monetdb";
     str password = "monetdb";
     str lang = "sql";
-    str dbalias = "mdb1";
     str msg = MAL_SUCCEED;
 
-    str *home_node, *landscape, *next_node, host, token;
+    str *home_node, *landscape, *next_node, host, dbalias, token;
     int *next_node_idx, port, idx;
     Mapi dbh;
 
@@ -39,33 +38,29 @@ hh_move(Client cntxt, MalBlkPtr mb, MalS
     token = strtok(*next_node, delim);
     host = token;
     if(!host)
-    {
-        fprintf(stderr, "Could not parse connection string\n");
-        return msg;
-    }
+        goto parse_connection;
 
-    while(token != NULL) {
-        token = strtok(NULL, delim);
-        if(token)
-            port = atoi(token);
-    }
+    token = strtok(NULL, delim);
+    if(!token)
+        goto parse_connection;
+    port = atoi(token);
 
-    if(!port)
-    {
-        fprintf(stderr, "Could not parse connection string\n");
-        return msg;
-    }
+    token = strtok(NULL, delim);
+    dbalias = token;
+    if(!dbalias)
+        goto parse_connection;
+
 
     // connect to the next node 
     // TODO: change dbname
     dbh = mapi_connect(host, port, username, password, lang, dbalias);
     if(mapi_error(dbh)) 
-        fprintf(stderr, "Failed to connect to node %s:%d\n", host, port);
+        fprintf(stderr, "Failed to connect to node %s:%d:%s\n", host, port, 
dbalias);
 
-    fprintf(stderr, "Connect to node %s:%d\n", host, port);
+    fprintf(stderr, "Connect to node %s:%d:%s\n", host, port, dbalias);
 
     mapi_destroy(dbh); 
-    fprintf(stderr, "Disconnected from node %s:%d\n", host, port);
+    fprintf(stderr, "Disconnected from node %s:%d:%s\n", host, port, dbalias);
 
 
 
@@ -76,4 +71,8 @@ hh_move(Client cntxt, MalBlkPtr mb, MalS
     next_node_idx = getArgReference_int(stk, pci, 2);
     
     return msg;
+
+    parse_connection:
+        fprintf(stderr, "Could not parse connection string\n");
+           return msg;
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list