Changeset: 7583805ed308 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7583805ed308
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
monetdb5/extras/rapi/Tests/rapi08.malC
monetdb5/modules/mal/Tests/remoteInit.mal
monetdb5/modules/mal/Tests/remoteInit.stable.out
monetdb5/optimizer/Tests/remap.stable.out
Branch: default
Log Message:
Test fixes and approvals after changeset 3bd8d00f4525.
diffs (82 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -38725,7 +38725,7 @@ command mapi.fetch_line(hdl:int):str
address SERVERfetch_line;
comment Retrieve a complete line.
-command mapi.fetch_field_array(hdl:int):bat[:int,:str]
+command mapi.fetch_field_array(hdl:int):bat[:oid,:str]
address SERVERfetch_field_bat;
comment Retrieve all fields for a row.
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -49652,7 +49652,7 @@ command mapi.fetch_line(hdl:int):str
address SERVERfetch_line;
comment Retrieve a complete line.
-command mapi.fetch_field_array(hdl:int):bat[:int,:str]
+command mapi.fetch_field_array(hdl:int):bat[:oid,:str]
address SERVERfetch_field_bat;
comment Retrieve all fields for a row.
diff --git a/monetdb5/extras/rapi/Tests/rapi08.malC
b/monetdb5/extras/rapi/Tests/rapi08.malC
--- a/monetdb5/extras/rapi/Tests/rapi08.malC
+++ b/monetdb5/extras/rapi/Tests/rapi08.malC
@@ -23,6 +23,6 @@ X_12 := algebra.leftfetchjoin(r1_9,X_8);
X_15 := algebra.leftfetchjoin(ti,dv);
io.print(X_9);
-X_16:bat[:any,:dbl] := rapi.subeval_aggr(nil:ptr,"res <- aggregate(arg2,
by=list(aggr_group), FUN=median); return(res$x)",X_8,X_15);
+X_16:bat[:oid,:dbl] := rapi.subeval_aggr(nil:ptr,"res <- aggregate(arg2,
by=list(aggr_group), FUN=median); return(res$x)",X_8,X_15);
io.print(X_16);
diff --git a/monetdb5/modules/mal/Tests/remoteInit.mal
b/monetdb5/modules/mal/Tests/remoteInit.mal
--- a/monetdb5/modules/mal/Tests/remoteInit.mal
+++ b/monetdb5/modules/mal/Tests/remoteInit.mal
@@ -1,5 +1,5 @@
#test basic interaction scheme
-function user.remote_internal_servegetbat(type:str, o:bat[:any_1,:any_2]):void;
+function user.remote_internal_servegetbat(type:str, o:bat[:oid,:any_2]):void;
t := inspect.getType(o);
barrier ifpart := type == t;
len := aggr.count(o);
diff --git a/monetdb5/modules/mal/Tests/remoteInit.stable.out
b/monetdb5/modules/mal/Tests/remoteInit.stable.out
--- a/monetdb5/modules/mal/Tests/remoteInit.stable.out
+++ b/monetdb5/modules/mal/Tests/remoteInit.stable.out
@@ -9,10 +9,17 @@ stdout of test 'remoteInit` in directory
# Serving database 'mTests_src_modules_mal', using 4 threads
# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008- MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
-function user.remote_internal_servegetbat(type:str,o:bat[:any_1,:any_2]):void;
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://gaai.mullender.nl:37132/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-8843/.s.monetdb.37132
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+function user.remote_internal_servegetbat(type:str,o:bat[:oid,:any_2]):void;
t := inspect.getType(o);
barrier ifpart := calc.==(type,t);
len := aggr.count(o);
diff --git a/monetdb5/optimizer/Tests/remap.stable.out
b/monetdb5/optimizer/Tests/remap.stable.out
--- a/monetdb5/optimizer/Tests/remap.stable.out
+++ b/monetdb5/optimizer/Tests/remap.stable.out
@@ -24,7 +24,7 @@ function user.tst():void;
end user.tst;
#WARNING To speedup calc.+ a bulk operator implementation is needed
# y:bat[:oid,:str] :=
mal.multiplex("calc":str,"+":str,b:bat[:oid,:int],1:int);
-
+!TypeException:user.tst[12]:'bat.append' undefined in:
bat.append(X_19:bat[:oid,:str],X_26:int);
function user.main():void;
# it will be ignored by the optimizer
mdb.List("user","tst");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
