Update of /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9755/modules/mal/Tests
Modified Files:
ascii_io2.mal ascii_io2.stable.out inspect05.stable.out
statistics01.mal statistics01.stable.out
Log Message:
Use a stricter runtime test to trap possible BAT bind mismatchs.
Index: statistics01.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/statistics01.mal,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- statistics01.mal 15 May 2007 17:58:00 -0000 1.6
+++ statistics01.mal 12 Oct 2007 17:40:24 -0000 1.7
@@ -1,5 +1,5 @@
#test the statistics module
-tz:= bbp.bind("timezones");
+tz:bat[:str,:timezone]:= bbp.bind("timezones");
statistics.prelude();
#statistics.dump(); is size dependent
statistics.deposit("timezones");
Index: ascii_io2.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/ascii_io2.mal,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ascii_io2.mal 12 May 2007 07:35:44 -0000 1.4
+++ ascii_io2.mal 12 Oct 2007 17:40:09 -0000 1.5
@@ -26,9 +26,9 @@
#io.print(idxbat);
i1 := algebra.fetch(idxbat,0);
-b1 := bbp.find(i1);
+b1:bat[:oid,:str] := bbp.bind(i1);
#io.print(b1);
i2 := algebra.fetch(idxbat,1);
-b2 := bbp.find(i2);
+b2:bat[:oid,:str] := bbp.bind(i2);
#io.print(b2);
Index: inspect05.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/inspect05.stable.out,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -d -r1.339 -r1.340
--- inspect05.stable.out 4 Oct 2007 20:11:10 -0000 1.339
+++ inspect05.stable.out 12 Oct 2007 17:40:10 -0000 1.340
@@ -460,6 +460,8 @@
[ "releaseAll", "pattern", "box",
"(bname:str):void ",
"BOXreleaseAll;"
]
[ "toString", "pattern", "box",
"(bname:str,name:str):str ",
"BOXtoString;"
]
[ "take", "pattern", "box",
"(bnme:str,vnme:str):any_1 ",
"BOXtake;"
]
+[ "bind", "pattern", "bbp",
"(idx:BAT):bat[:any_1,:any_2] ",
"CMDbbpbindindex;" ]
+[ "bind", "pattern", "bbp",
"(head:str,tail:str):bat[:any_1,:any_2] ",
"CMDbbpbind2;" ]
[ "bind", "pattern", "bbp",
"(name:str):bat[:any_1,:any_2] ",
"CMDbbpbind;"
]
[ "commit", "pattern", "bbp",
"():void ",
"CMDbbpReleaseAll;"
]
[ "close", "command", "bbp",
"():void ",
"CMDbbpclose;"
]
@@ -469,9 +471,6 @@
[ "deposit", "pattern", "bbp",
"(name:str,loc:str):bat[:any_1,:any_2] ",
"CMDbbpbindDefinition;"
]
[ "deposit", "pattern", "bbp",
"(name:str,v:bat[:any_1,:any_2]):void ",
"CMDbbpdeposit;"
]
[ "destroy", "command", "bbp",
"():void ",
"CMDbbpdestroy;"
]
-[ "find", "command", "bbp",
"(idx:BAT):bat[:any_1,:any_2] ",
"CMDbbpbindindex;"
]
-[ "find", "command", "bbp",
"(head:str,tail:str):bat[:any_1,:any_2] ",
"CMDbbpfind2;"
]
-[ "find", "command", "bbp",
"(name:str):bat[:any_1,:any_2] ",
"CMDbbpfind3;"
]
[ "getDiskSpace", "command", "bbp",
"():int ",
"CMDbbpDiskSpace;"
]
[ "getLRefCount", "command", "bbp",
"(b:bat[:any_1,:any_2]):int ",
"CMDgetBATlrefcnt;"
]
[ "getRefCount", "command", "bbp",
"(b:bat[:any_1,:any_2]):int ",
"CMDgetBATrefcnt;"
]
@@ -3084,6 +3083,8 @@
[ "getTailType", "command", "bat",
"(b:bat[:any_1,:any_2]):str ",
"BKCgetTailType;"
]
[ "getHeadType", "command", "bat",
"(b:bat[:any_1,:any_2]):str ",
"BKCgetHeadType;"
]
[ "getCapacity", "command", "bat",
"(b:bat[:any_1,:any_2]):lng ",
"BKCgetCapacity;"
]
+[ "getDiskSize", "command", "bat",
"(b:bat[:any_1,:any_2]):lng ",
"BKCbatsize;"
]
+[ "getSize", "command", "bat",
"(b:bat[:any_1,:any_2]):lng ",
"BKCbatsize;"
]
[ "hasMoreElements", "pattern", "bat",
"(b:bat[:any_1,:BAT]) (_2:lng,h:any_1,t:any_2) ",
"CHPbunHasMoreElements;"
]
[ "hasMoreElements", "pattern", "bat",
"(b:bat[:oid,:any_2]) (_2:lng,h:oid,t:any_2) ",
"CHPbunHasMoreElements;"
]
[ "hasMoreElements", "pattern", "bat",
"(b:bat[:any_1,:any_2]) (_2:lng,h:any_1,t:any_2) ",
"CHPbunHasMoreElements;"
]
Index: statistics01.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/statistics01.stable.out,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- statistics01.stable.out 15 May 2007 17:58:00 -0000 1.10
+++ statistics01.stable.out 12 Oct 2007 17:40:25 -0000 1.11
@@ -52,7 +52,7 @@
function user.main():void; # 0 (main:void)
#test the statistics module # 1 (_1:str)
- tz := bbp.bind("timezones"); # 2 CMDbbpbind
(tz:bat[:any,:any])<-(_3:str)
+ tz:bat[:str,:timezone] := bbp.bind("timezones"); # 2 CMDbbpbind
(tz:bat[:str,:timezone])<-(_3:str)
statistics.prelude(); # 3 STATprelude (_4:void)
#statistics.dump(); is size dependent # 4 (_5:str)
statistics.deposit("timezones"); # 5 STATdepositStr (_6:void)<-(_3:str)
Index: ascii_io2.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/ascii_io2.stable.out,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ascii_io2.stable.out 19 Aug 2007 18:36:29 -0000 1.8
+++ ascii_io2.stable.out 12 Oct 2007 17:40:10 -0000 1.9
@@ -71,10 +71,10 @@
idxbat := tablet.load(namebat,sepbat,typebat,datafile,len); # 20
CMDtablet_load
(idxbat:bat[:str,:BAT])<-(namebat:bat[:oid,:str])(sepbat:bat[:oid,:str])(typebat:bat[:oid,:str])(datafile:str)(len:int)
#io.print(idxbat); # 21 (_30:str)
i1 := algebra.fetch(idxbat,0); # 22 ALGfetchint
(i1:BAT)<-(idxbat:bat[:str,:BAT])(_32:int)
- b1 := bbp.find(i1); # 23 CMDbbpbindindex
(b1:bat[:any,:any])<-(i1:BAT)
+ b1:bat[:oid,:str] := bbp.bind(i1); # 23 CMDbbpbindindex
(b1:bat[:oid,:str])<-(i1:BAT)
#io.print(b1); # 24 (_34:str)
i2 := algebra.fetch(idxbat,1); # 25 ALGfetchint
(i2:BAT)<-(idxbat:bat[:str,:BAT])(_36:int)
- b2 := bbp.find(i2); # 26 CMDbbpbindindex
(b2:bat[:any,:any])<-(i2:BAT)
+ b2:bat[:oid,:str] := bbp.bind(i2); # 26 CMDbbpbindindex
(b2:bat[:oid,:str])<-(i2:BAT)
#io.print(b2); # 27 (_38:str)
end main; # 28
#source:/ufs/mk/monet5/Linux/mTests/src/modules/mal/ascii_io2.load
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
