Changeset: 7e6cbee7782d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7e6cbee7782d
Modified Files:
monetdb5/mal/Tests/tst285.mal
monetdb5/mal/Tests/tst285.stable.out
monetdb5/mal/Tests/tst802.mal
monetdb5/mal/Tests/tst802.stable.out
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
monetdb5/modules/mal/remote.mal
Branch: default
Log Message:
Minor changes to become headless
diffs (135 lines):
diff --git a/monetdb5/mal/Tests/tst285.mal b/monetdb5/mal/Tests/tst285.mal
--- a/monetdb5/mal/Tests/tst285.mal
+++ b/monetdb5/mal/Tests/tst285.mal
@@ -2,7 +2,7 @@ b:= bat.new(:oid,:str);
bat.append(b,"hello");
bat.append(b,"goodbye");
-z0:= algebra.likesubselect(b,nil:bat,"%hel%",false);
+z0:= algebra.likesubselect(b,nil:bat[:oid,:oid],"%hel%",false);
io.print(z0);
diff --git a/monetdb5/mal/Tests/tst285.stable.out
b/monetdb5/mal/Tests/tst285.stable.out
--- a/monetdb5/mal/Tests/tst285.stable.out
+++ b/monetdb5/mal/Tests/tst285.stable.out
@@ -26,7 +26,7 @@ function user.main():void;
b := bat.new(:oid,:str);
bat.append(b,"hello");
bat.append(b,"goodbye");
- z0 := algebra.likesubselect(b,nil:BAT,"%hel%",false);
+ z0 := algebra.likesubselect(b,nil:bat[:oid,:oid],"%hel%",false);
io.print(z0);
end user.main;
#--------------------------#
diff --git a/monetdb5/mal/Tests/tst802.mal b/monetdb5/mal/Tests/tst802.mal
--- a/monetdb5/mal/Tests/tst802.mal
+++ b/monetdb5/mal/Tests/tst802.mal
@@ -1,10 +1,10 @@
#testing simple stuff around type BAT
-function tst(b:bat[:any_1,:any_2]):bat;
+function tst(b:bat[:any_1,:any_2]):bat[:any_1,:any_2];
return b;
end tst;
z:= bat.new(:oid,:int);
-b:= nil:bat;
+b:= nil:bat[:oid,:int];
b:= z;
#io.print(b);
c:= tst(b);
diff --git a/monetdb5/mal/Tests/tst802.stable.out
b/monetdb5/mal/Tests/tst802.stable.out
--- a/monetdb5/mal/Tests/tst802.stable.out
+++ b/monetdb5/mal/Tests/tst802.stable.out
@@ -5,24 +5,29 @@ stdout of test 'tst802` in directory 'mo
# 14:58:46 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5/Linux/lib64/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib64/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=32222
--set monet_prompt= --trace --dbname=mTests_src_mal tst802.mal < /dev/null
# 14:58:46 >
-# MonetDB Server v4.99.19
-# Copyright (c) 1993-2006 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf
-# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
-# dbname:mTests_src_mal
-# Visit http://monetdb.cwi.nl/ for further information
-##testing simple stuff around type BAT
-#function tst(b:bat[:any_1,:any_2]):bat;
-# return b;
-#end tst;
-function user.tst(b:bat[:any_1,:any_2]):BAT;
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_mal', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.590 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# 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://vienna.ins.cwi.nl:33676/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-1649/.s.monetdb.33676
+# 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.tst(b:bat[:any_1,:any_2]):bat[:any_1,:any_2];
return tst := b;
end user.tst;
function user.main():void;
#testing simple stuff around type BAT
z := bat.new(:oid,:int);
- b := nil:BAT;
+ b := nil:bat[:oid,:int];
b := z;
#io.print(b);
c := user.tst(b);
diff --git a/monetdb5/modules/kernel/bat5.mal b/monetdb5/modules/kernel/bat5.mal
--- a/monetdb5/modules/kernel/bat5.mal
+++ b/monetdb5/modules/kernel/bat5.mal
@@ -8,16 +8,17 @@ module bat;
#TO BE MADE HEADLESS PLAN
-command mirror(b:bat[:any_1,:any_2]) :bat[:any_1,:any_1]
-address BKCmirror
-comment "Returns the head-mirror image of a BAT (two head columns).";
-
command delete(b:bat[:oid, :any_1], src:bat[:oid,:any_1]) :bat[:oid,:any_1]
address BKCdelete_bat_bun
comment "Delete from the first BAT all BUNs with a corresponding BUN
in the second.";
# END TO BE MADE HEADLESS PLAN
+command mirror(b:bat[:oid,:any_2]) :bat[:oid,:oid]
+address BKCmirror
+comment "Returns the head-mirror image of a BAT (two head columns).";
+
+
command delete(b:bat[:oid, :any_1], h:oid) :bat[:oid,:any_1]
address BKCdelete
comment "Delete an entry with a certain head value.";
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
@@ -77,7 +77,7 @@ end user.main;
[ 36@0, "isTransient", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCgetKey;" ]
[ 37@0, "isaKey", "command", "bat", "(b:bat[:oid,:any_1])
(X_2:bat[:oid,:str],X_3:bat[:oid,:str]) ", "BKCinfo;" ]
[ 38@0, "mergecand", "command", "bat",
"(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCmergecand;" ]
-[ 39@0, "mirror", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_1] ", "BKCmirror;" ]
+[ 39@0, "mirror", "command", "bat",
"(b:bat[:oid,:any_2]):bat[:oid,:oid] ", "BKCmirror;" ]
[ 40@0, "new", "command", "bat", "(nme:str):bat[:oid,:any_1] ",
"CMDBATderivedByName;" ]
[ 41@0, "new", "pattern", "bat",
"(b:bat[:oid,:any_1],size:lng):bat[:oid,:any_1] ", "CMDBATnewDerived;" ]
[ 42@0, "new", "pattern", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "CMDBATnewDerived;" ]
diff --git a/monetdb5/modules/mal/remote.mal b/monetdb5/modules/mal/remote.mal
--- a/monetdb5/modules/mal/remote.mal
+++ b/monetdb5/modules/mal/remote.mal
@@ -61,7 +61,7 @@ pattern batload(tt:any_1, size:int):bat[
address RMTbatload
comment "create a BAT of the given type and size, and load values from the
input stream";
-pattern batbincopy(b:bat):void
+pattern batbincopy(b:bat[:oid,:any]):void
address RMTbincopyto
comment "dump BAT b in binary form to the stream";
pattern batbincopy():bat[:oid,:any]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
