Changeset: 629df8390ac1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=629df8390ac1 Removed Files: monetdb5/modules/mal/Tests/flags.maltest monetdb5/modules/mal/Tests/inspect40.maltest monetdb5/modules/mal/Tests/mapi02.maltest monetdb5/modules/mal/Tests/remote89.maltest Branch: mtest Log Message:
cleanup diffs (271 lines): diff --git a/monetdb5/modules/mal/Tests/flags.maltest b/monetdb5/modules/mal/Tests/flags.maltest deleted file mode 100644 --- a/monetdb5/modules/mal/Tests/flags.maltest +++ /dev/null @@ -1,41 +0,0 @@ -statement ok -d := mdb.getDebug() - -query T rowsort -io.print(d) ----- -553648138 - -statement ok -(f,v) := mdb.getDebugFlags() - -query TTT rowsort -io.print(f,v) ----- -30 values hashing to 283847870bd7193ab4305115ea414caf - -statement ok -mdb.setDebug("threads") - -statement error -mdb.setDebug("dataflow") - -statement ok -(f,v) := mdb.getDebugFlags() - -query TTT rowsort -io.print(f,v) ----- -30 values hashing to b4fc9e938354ac20fe39b2d38be7b03d - -statement ok -mdb.setDebug("threads") - -statement ok -(f,v) := mdb.getDebugFlags() - -query TTT rowsort -io.print(f,v) ----- -30 values hashing to 283847870bd7193ab4305115ea414caf - diff --git a/monetdb5/modules/mal/Tests/inspect40.maltest b/monetdb5/modules/mal/Tests/inspect40.maltest deleted file mode 100644 --- a/monetdb5/modules/mal/Tests/inspect40.maltest +++ /dev/null @@ -1,12 +0,0 @@ -statement ok -t:= inspect.getAtomNames() - -statement error -s:= inspect.getAtomSuperNames() - -statement ok -v:= inspect.getAtomSizes() - -statement error -io.print(t,s,v) - diff --git a/monetdb5/modules/mal/Tests/mapi02.maltest b/monetdb5/modules/mal/Tests/mapi02.maltest deleted file mode 100644 --- a/monetdb5/modules/mal/Tests/mapi02.maltest +++ /dev/null @@ -1,65 +0,0 @@ -statement ok -fs:= inspect.getEnvironment("mapi_port") - -statement ok -port := calc.int(fs) - -query T rowsort -io.printf("port %d\n",port) ----- -port 30009 - -statement error -mid:= mapi.reconnect("s0_0","localhost",port,"monetdb","monetdb","mal") - -statement error -mapi.rpc(mid,"include sql;sql.init();") - -query T rowsort -io.print("ready for remote SQL interaction") ----- -"ready for remote SQL interaction" - -statement error -b:bat[:void,:int] := mapi.bind(mid,"sys","ptables","schema_id",0) - -statement error -c:=algebra.select(b,nil:bat[:oid],0,6000, true,true,false) - -statement error -io.print(c) - -statement error -d:=algebra.select(b,nil:bat[:oid],5,6000, true,true,false) - -statement ok -low:= 5+1 - -query T rowsort -io.print("kk") ----- -"kk" - -statement error -e:=algebra.select(d,nil:bat[:oid],low,7, true,true,false) - -query T rowsort -io.print("k2") ----- -"k2" - -statement error -i:=aggr.count(e) - -statement error -io.printf(" count %d\n",i) - -statement error -io.print(d) - -statement error -mapi.disconnect(mid) - -statement ok -optimizer.remoteQueries() - diff --git a/monetdb5/modules/mal/Tests/remote89.maltest b/monetdb5/modules/mal/Tests/remote89.maltest deleted file mode 100644 --- a/monetdb5/modules/mal/Tests/remote89.maltest +++ /dev/null @@ -1,133 +0,0 @@ -statement ok -include sql - -statement ok -function octopus.bind(v:int):bat[:int] - -statement ok - b:= bat.new(:int) - -statement ok - bat.append(b,v) - -statement ok - return b - -statement ok -end bind - -statement ok -function octopus.bind(conn:str,v:int):bat[:int] - -statement ok - vh:= remote.put(conn,v) - -statement ok - b:= remote.put(conn,nil:bat[:int]) - -statement ok - b:= remote.exec(conn,"octopus","bind",vh) - -statement ok - bv:bat[:int]:= remote.get(conn,b) - -statement ok - return bv - -statement ok -end bind - -statement ok -function octopus.tentacle(v:int, uri:str):bat[:int] - -statement ok - conn:str := remote.connect(uri, "monetdb", "monetdb", "msql") - -statement ok - b:= octopus.bind(conn,v) - -statement ok -catch RMTexception:str - -statement ok - io.print(RMTexception) - -statement ok -exit RMTexception - -statement ok - remote.disconnect(conn) - -statement ok - return tentacle:=b - -statement ok -end tentacle - -statement ok -function octopus.exec(uri:str, query:str, version:int):bat[:int] - -statement ok - conn:str := remote.connect(uri, "monetdb", "monetdb", "msql") - -statement ok - m:= remote.put(conn,version) - -statement ok - v:= remote.put(conn,nil:bat[:int]) - -statement ok - u:= remote.put(conn,uri) - -statement ok - v:= remote.exec(conn,"octopus", query, m, u) - -statement ok - res:bat[:int]:= remote.get(conn,v) - -statement ok - remote.disconnect(conn) - -statement ok - return exec:=res - -statement ok -end exec - -statement error -uri := sabaoth.getLocalConnectionURI() - -statement ok -res:= nil:bat - -statement ok -barrier (go,version):= scheduler.octopus(10) - -statement ok - v1:bat[:int] :=octopus.exec(uri, "tentacle", version) - -statement ok - v2:bat[:int] :=octopus.exec(uri, "tentacle", version) - -statement ok - v3:bat[:int] :=octopus.exec(uri, "tentacle", version) - -statement ok - v4:bat[:int] :=octopus.exec(uri, "tentacle", version) - -statement ok - res:= mat.pack(v1,v2,v3,v4) - -statement error -exit (go,version) - -query T rowsort -io.print(res) ----- -NULL - -query T rowsort -io.print("done") ----- -"done" - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list