Changeset: 46b69a582c79 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/46b69a582c79
Modified Files:
monetdb5/modules/mal/Tests/mapi01.maltest
monetdb5/modules/mal/Tests/mapi02.malC
monetdb5/modules/mal/Tests/mapi04.maltest
monetdb5/modules/mal/Tests/mapi05.maltest
monetdb5/modules/mal/Tests/mapi06.maltest
monetdb5/modules/mal/Tests/mapi07.maltest
monetdb5/modules/mal/Tests/mserver00.maltest
monetdb5/modules/mal/Tests/register00.maltest
Branch: Jul2021
Log Message:
Fix test statements and call mapi.destroy instead of mapi.disconnect to clean
all the used resources
diffs (284 lines):
diff --git a/monetdb5/modules/mal/Tests/mapi01.maltest
b/monetdb5/modules/mal/Tests/mapi01.maltest
--- a/monetdb5/modules/mal/Tests/mapi01.maltest
+++ b/monetdb5/modules/mal/Tests/mapi01.maltest
@@ -7,52 +7,52 @@ port := calc.int(fs)
statement ok
mid:= mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal")
-statement error
-mapi.rpc(mid,"rb:= bat.new(:int); bat.setName(rb,\"rbat\");")
+statement ok
+mapi.rpc(mid,"rb:= bat.new(:int); bat.setName(rb,\"rbat\");");
-statement error
-mapi.rpc(mid,"bat.append(rb,1);")
+statement ok
+mapi.rpc(mid,"bat.append(rb,1);");
-statement error
-mapi.rpc(mid,"bat.append(rb,3);")
+statement ok
+mapi.rpc(mid,"bat.append(rb,3);");
-statement error
-mapi.rpc(mid,"bat.append(rb,5);")
+statement ok
+mapi.rpc(mid,"bat.append(rb,5);");
-statement error
-mapi.rpc(mid,"bat.append(rb,6);")
+statement ok
+mapi.rpc(mid,"bat.append(rb,6);");
-statement error
-mapi.rpc(mid,"bat.append(rb,7);")
+statement ok
+mapi.rpc(mid,"bat.append(rb,7);");
-statement error
-mapi.rpc(mid,"c1:=algebra.select(rb,nil:bat[:oid],0,12,true,true,false);c:=algebra.projection(c1,rb);")
+statement ok
+mapi.rpc(mid,"c1:=algebra.select(rb,nil:bat[:oid],0,12,true,true,false);c:=algebra.projection(c1,rb);");
-statement error
-c:bat[:int]:= mapi.rpc(mid, "io.print(c);")
+statement ok
+c:bat[:int]:= mapi.rpc(mid, "io.print(c);");
-statement error
-io.print(c)
+statement ok
+io.print(c);
-statement error
-mapi.rpc(mid,"c1:=algebra.select(rb,nil:bat[:oid],0,4,true,true,false);")
+statement ok
+mapi.rpc(mid,"c1:=algebra.select(rb,nil:bat[:oid],0,4,true,true,false);");
-statement error
-c:bat[:int]:= mapi.rpc(mid, "io.print(c1);")
+statement ok
+c:bat[:int]:= mapi.rpc(mid, "io.print(c1);");
-statement error
-io.print(c)
+statement ok
+io.print(c);
-statement error
-b:bat[:int]:= mapi.bind(mid,"rbat")
+statement ok
+b:bat[:int]:= mapi.bind(mid,"rbat");
query T rowsort
io.print(b)
----
NULL
-statement error
-mapi.rpc(mid,"d:=algebra.select(b,nil:bat[:oid],5,10,true,true,false);")
+statement ok
+mapi.rpc(mid,"d:=algebra.select(b,nil:bat[:oid],5,10,true,true,false);");
statement ok
low:= 5+1
@@ -60,24 +60,24 @@ low:= 5+1
statement ok
mapi.put(mid,"low",low)
-statement error
-mapi.rpc(mid,"e:=algebra.select(b,d,low,7,true,true,false);")
+statement ok
+mapi.rpc(mid,"e:=algebra.select(b,d,low,7,true,true,false);");
-statement error
-mapi.rpc(mid,"i:=aggr.count(e);")
+statement ok
+mapi.rpc(mid,"i:=aggr.count(e);");
-statement error
-i:lng:= mapi.rpc(mid,"io.print(i);")
+statement ok
+i:lng:= mapi.rpc(mid,"io.print(i);");
-statement error
-io.printf(" count %d\n",i)
+statement ok
+io.printf(" count %d\n",i);
-statement error
-d:bat[:int]:= mapi.rpc(mid,"e1:=algebra.projection(e,b);io.print(e1);")
+statement ok
+d:bat[:int]:= mapi.rpc(mid,"e1:=algebra.projection(e,b);io.print(e1);");
-statement error
+statement ok
io.print(d)
statement ok
-mapi.disconnect(mid)
+mapi.destroy(mid)
diff --git a/monetdb5/modules/mal/Tests/mapi02.malC
b/monetdb5/modules/mal/Tests/mapi02.malC
--- a/monetdb5/modules/mal/Tests/mapi02.malC
+++ b/monetdb5/modules/mal/Tests/mapi02.malC
@@ -20,5 +20,5 @@ io.print("k2");
i:=aggr.count(e);
io.printf(" count %d\n",i);
io.print(d);
-mapi.disconnect(mid);
+mapi.destroy(mid);
optimizer.remoteQueries();
diff --git a/monetdb5/modules/mal/Tests/mapi04.maltest
b/monetdb5/modules/mal/Tests/mapi04.maltest
--- a/monetdb5/modules/mal/Tests/mapi04.maltest
+++ b/monetdb5/modules/mal/Tests/mapi04.maltest
@@ -7,12 +7,12 @@ port := calc.int(fs)
statement ok
mid:= mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal")
-statement error
-s:str:= mapi.rpc(mid,"io.print(123456);")
-
-statement error
-io.print(s)
+statement ok
+s:str:= mapi.rpc(mid,"io.print(123456);");
statement ok
-mapi.disconnect(mid)
+io.print(s);
+statement ok
+mapi.destroy(mid)
+
diff --git a/monetdb5/modules/mal/Tests/mapi05.maltest
b/monetdb5/modules/mal/Tests/mapi05.maltest
--- a/monetdb5/modules/mal/Tests/mapi05.maltest
+++ b/monetdb5/modules/mal/Tests/mapi05.maltest
@@ -7,8 +7,8 @@ port := calc.int(fs)
statement ok
mid:= mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal")
-statement error
-mapi.query(mid,"io.print(1);")
+statement ok
+mapi.query(mid,"io.print(1);");
query T rowsort
io.print("done")
@@ -16,5 +16,5 @@ io.print("done")
"done"
statement ok
-mapi.disconnect(mid)
+mapi.destroy(mid)
diff --git a/monetdb5/modules/mal/Tests/mapi06.maltest
b/monetdb5/modules/mal/Tests/mapi06.maltest
--- a/monetdb5/modules/mal/Tests/mapi06.maltest
+++ b/monetdb5/modules/mal/Tests/mapi06.maltest
@@ -16,5 +16,5 @@ io.print("done")
"done"
statement ok
-mapi.disconnect(mid)
+mapi.destroy(mid)
diff --git a/monetdb5/modules/mal/Tests/mapi07.maltest
b/monetdb5/modules/mal/Tests/mapi07.maltest
--- a/monetdb5/modules/mal/Tests/mapi07.maltest
+++ b/monetdb5/modules/mal/Tests/mapi07.maltest
@@ -7,26 +7,26 @@ port := calc.int(fs)
statement ok
mid:= mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal")
-statement error
-mapi.rpc(mid,"rb:= bat.new(:int); bat.setName(rb,\"rbat\");")
+statement ok
+mapi.rpc(mid,"rb:= bat.new(:int); bat.setName(rb,\"rbat\");");
-statement error
-mapi.rpc(mid,"bat.append(rb,1);")
+statement ok
+mapi.rpc(mid,"bat.append(rb,1);");
-statement error
-mapi.rpc(mid,"bat.append(rb,3);")
+statement ok
+mapi.rpc(mid,"bat.append(rb,3);");
-statement error
-mapi.rpc(mid,"bat.append(rb,5);")
+statement ok
+mapi.rpc(mid,"bat.append(rb,5);");
-statement error
-mapi.rpc(mid,"bat.append(rb,6);")
+statement ok
+mapi.rpc(mid,"bat.append(rb,6);");
-statement error
-mapi.rpc(mid,"bat.append(rb,7);")
+statement ok
+mapi.rpc(mid,"bat.append(rb,7);");
-statement error
-mapi.rpc(mid,"c:=algebra.select(rb,nil:bat[:oid],0,12,true,true,false);")
+statement ok
+mapi.rpc(mid,"c:=algebra.select(rb,nil:bat[:oid],0,12,true,true,false);");
statement ok
low:= 5+1
@@ -34,20 +34,20 @@ low:= 5+1
statement ok
mapi.put(mid,"low",low)
-statement error
-i:lng:=
mapi.rpc(mid,"e:=algebra.select(rb,nil:bat[:oid],low,7,true,true,false);
i:=aggr.count(e); io.print(i);")
-
-statement error
-io.printf(" count %d\n",i)
+statement ok
+i:lng:=
mapi.rpc(mid,"e:=algebra.select(rb,nil:bat[:oid],low,7,true,true,false);
i:=aggr.count(e); io.print(i);");
-statement error
-d:bat[:int]:= mapi.rpc(mid,"io.print(i);")
-
-statement error
-io.print(d)
+statement ok
+io.printf(" count %d\n",i);
statement ok
-mapi.disconnect(mid)
+d:bat[:int]:= mapi.rpc(mid,"io.print(i);");
+
+statement ok
+io.print(d);
+
+statement ok
+mapi.destroy(mid)
statement ok
optimizer.remoteQueries()
diff --git a/monetdb5/modules/mal/Tests/mserver00.maltest
b/monetdb5/modules/mal/Tests/mserver00.maltest
--- a/monetdb5/modules/mal/Tests/mserver00.maltest
+++ b/monetdb5/modules/mal/Tests/mserver00.maltest
@@ -117,5 +117,5 @@ catch MapiException:str;
exit MapiException;
statement ok
-mapi.disconnect(mid);
+mapi.destroy(mid);
diff --git a/monetdb5/modules/mal/Tests/register00.maltest
b/monetdb5/modules/mal/Tests/register00.maltest
--- a/monetdb5/modules/mal/Tests/register00.maltest
+++ b/monetdb5/modules/mal/Tests/register00.maltest
@@ -1,6 +1,6 @@
-statement error
-language.register("user","mytest","io.print(\"hello world\");","first test")
+statement ok
+language.register("user","mytest","io.print(\"hello world\");","first test");
-statement error
-mdb.list("user","mytest")
+statement ok
+mdb.list("user","mytest");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
