MonetDB: default - Minor textual changes to remote tests

[Martin Kersten]

Changeset: ca15cab457b8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca15cab457b8
Modified Files:
        monetdb5/modules/mal/Tests/All
        monetdb5/modules/mal/Tests/remote07.mal
        monetdb5/modules/mal/Tests/remote88.mal
Branch: default
Log Message:

Minor textual changes to remote tests


diffs (104 lines):

diff --git a/monetdb5/modules/mal/Tests/All b/monetdb5/modules/mal/Tests/All
--- a/monetdb5/modules/mal/Tests/All
+++ b/monetdb5/modules/mal/Tests/All
@@ -36,6 +36,7 @@ remote02
 HAVE_GEOM?remote03
 remote04
 remote06
+# should be run as 'mclient -d demo -l mal remote07.mal
 remote08
 remote09
 remote11
diff --git a/monetdb5/modules/mal/Tests/remote07.mal 
b/monetdb5/modules/mal/Tests/remote07.mal
--- a/monetdb5/modules/mal/Tests/remote07.mal
+++ b/monetdb5/modules/mal/Tests/remote07.mal
@@ -2,20 +2,20 @@
 uri := sabaoth.getLocalConnectionURI();
 conn:str := remote.connect(uri, "monetdb", "monetdb");
 
-d:bat[:str,:int] := bat.new(:str, :int);
-bat.insert(d, "bla", 1);
-bat.insert(d, nil:str, 2);
-bat.insert(d, "boe", nil:int);
-bat.insert(d, d); # 6
-bat.insert(d, d); # 12
-bat.insert(d, d); # 24
-bat.insert(d, d); # 48
-bat.insert(d, d); # 96
-bat.insert(d, d); # 192
-bat.insert(d, d); # 384
-bat.insert(d, d); # 768
-bat.insert(d, d); # 1536
-bat.insert(d, d); # 3072
+d:bat[:oid,:str] := bat.new(:oid,:str);
+bat.append(d, "bla");
+bat.append(d, nil:str);
+bat.append(d, "boe");
+bat.append(d, d); # 6
+bat.append(d, d); # 12
+bat.append(d, d); # 24
+bat.append(d, d); # 48
+bat.append(d, d); # 96
+bat.append(d, d); # 192
+bat.append(d, d); # 384
+bat.append(d, d); # 768
+bat.append(d, d); # 1536
+bat.append(d, d); # 3072
 
 # store the values
 t1 := alarm.time();
@@ -26,7 +26,7 @@ io.printf("# put: %d\n", t3);
 
 # retrieve the values
 t1 := alarm.time();
-u:bat[:str,:int] := remote.get(conn, l);
+u:bat[:oid,:str] := remote.get(conn, l);
 t2 := alarm.time();
 t3 := t2 - t1;
 io.printf("# get: %d\n", t3);
diff --git a/monetdb5/modules/mal/Tests/remote88.mal 
b/monetdb5/modules/mal/Tests/remote88.mal
--- a/monetdb5/modules/mal/Tests/remote88.mal
+++ b/monetdb5/modules/mal/Tests/remote88.mal
@@ -1,10 +1,8 @@
 # test octopus framework
-include sql;
+#include sql;
 # The script occassionally showed parallism errors.
-#profiler.activate("statement");
-#profiler.setFilter("*","*");
-#profiler.openStream("console");
-#profiler.start();
+
+module octopus;
 
 function octopus.bind(v:int):bat[:oid,:int];
        b:= bat.new(:oid,:int);
@@ -38,13 +36,14 @@ function octopus.exec(uri:str, query:str
        # this works with uri, because head and tentacle are the same */
        v:= remote.exec(conn,"octopus", query, m, u);
        res:bat[:oid,:int]:= remote.get(conn,v);
+       io.print(res);
        remote.disconnect(conn);
        return exec:=res;
 end exec;
 
 uri := sabaoth.getLocalConnectionURI();
 
-barrier (k,v):= language.newRange(0:int);
+barrier v:= 0:int;
        io.print(v);
 barrier go:= language.dataflow();
        v1:bat[:oid,:int] :=octopus.exec(uri, "tentacle", v);
@@ -52,8 +51,10 @@ barrier go:= language.dataflow();
        v3:bat[:oid,:int] :=octopus.exec(uri, "tentacle", v);
        v4:bat[:oid,:int] :=octopus.exec(uri, "tentacle", v);
        res:= mat.pack(v1,v2,v3,v4);
+       language.pass(uri);
+       language.pass(v);
 exit go;
-       redo (k,v) := language.nextElement(1:int,25:int);
-exit (k,v);
+       redo v := iterator.next(1:int,25:int);
+exit v;
 z:=clients.getUsers();
 io.print(z);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list