Changeset: 4c7ff2ce775d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c7ff2ce775d
Modified Files:
MonetDB5/src/mal/Tests/tst654.mal
MonetDB5/src/mal/Tests/tst654.stable.out
MonetDB5/src/mal/Tests/tst655.mal
MonetDB5/src/mal/Tests/tst655.stable.out
MonetDB5/src/mal/Tests/tst805.mal
MonetDB5/src/mal/Tests/tst805.stable.out
MonetDB5/src/optimizer/Tests/garbage1.mal
MonetDB5/src/optimizer/Tests/garbage1.stable.out
Branch: Jun2010
Log Message:
baptise BATs to make test output determenistic
Internal BAT-IDs and hence their default names "tmp_BAT-ID"
can vary per system and per run;
hence, we rename BATs explicitly to get deterministic names
in the output.
diffs (150 lines):
diff -r 7369459c185b -r 4c7ff2ce775d MonetDB5/src/mal/Tests/tst654.mal
--- a/MonetDB5/src/mal/Tests/tst654.mal Wed Jul 07 13:36:42 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst654.mal Wed Jul 07 13:39:44 2010 +0200
@@ -16,6 +16,8 @@
b2:= bat.new(:oid,:str);
bat.append(b2,"hello world");
bat.append(b2,"goodbye world");
+bat.setName(b1,"BAT_b1");
+bat.setName(b2,"BAT_b2");
tablet.setProperties("name,type,dense,sorted,key,min,max");
tablet.display(b1,b2);
diff -r 7369459c185b -r 4c7ff2ce775d MonetDB5/src/mal/Tests/tst654.stable.out
--- a/MonetDB5/src/mal/Tests/tst654.stable.out Wed Jul 07 13:36:42 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst654.stable.out Wed Jul 07 13:39:44 2010 +0200
@@ -31,6 +31,8 @@
#b2:= new(:void,:str);
#insert(b2,"hello world");
#insert(b2,"goodbye world");
+#bat.setName(b1,"BAT_b1");
+#bat.setName(b2,"BAT_b2");
#
#tablet.setProperties("name,type,dense,sorted,key,min,max");
#tablet.display(b1,b2);
@@ -76,6 +78,8 @@
b2 := bat.new(:oid,:str);
bat.append(b2,"hello world");
bat.append(b2,"goodbye world");
+ bat.setName(b1,"BAT_b1");
+ bat.setName(b2,"BAT_b2");
tablet.setProperties("name,type,dense,sorted,key,min,max");
tablet.display(b1,b2);
in := calc.int(nil);
@@ -117,7 +121,7 @@
[ 1, 2 ]
#-----------------------#
#-------------------------------#
-% tmp_7,tmp_10 # name
+% BAT_b1,BAT_b2 # name
% int, str # type
% false,false # dense
% true, false # sorted
@@ -128,7 +132,7 @@
[ 42, "hello world" ]
[ 49, "goodbye world" ]
#---------------------------------------#
-% tmp_7, tmp_10 # name
+% BAT_b1, BAT_b2 # name
#---------------------------------------#
[ 4.2, "hello world" ]
[ 4.9, "goodbye world" ]
diff -r 7369459c185b -r 4c7ff2ce775d MonetDB5/src/mal/Tests/tst655.mal
--- a/MonetDB5/src/mal/Tests/tst655.mal Wed Jul 07 13:36:42 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst655.mal Wed Jul 07 13:39:44 2010 +0200
@@ -6,6 +6,8 @@
b2:= bat.new(:oid,:str);
bat.append(b2,"hello world");
bat.append(b2,"goodbye world");
+bat.setName(b1,"BAT_b1");
+bat.setName(b2,"BAT_b2");
tablet.setFormat(b1,b2);
tablet.setProperties("name,type,dense,sorted,key,min,max");
diff -r 7369459c185b -r 4c7ff2ce775d MonetDB5/src/mal/Tests/tst655.stable.out
--- a/MonetDB5/src/mal/Tests/tst655.stable.out Wed Jul 07 13:36:42 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst655.stable.out Wed Jul 07 13:39:44 2010 +0200
@@ -36,12 +36,14 @@
b2 := bat.new(:oid,:str);
bat.append(b2,"hello world");
bat.append(b2,"goodbye world");
+ bat.setName(b1,"BAT_b1");
+ bat.setName(b2,"BAT_b2");
tablet.setFormat(b1,b2);
tablet.setProperties("name,type,dense,sorted,key,min,max");
tablet.display(b1,b2);
end main;
#-------------------------------#
-% tmp_7,tmp_10 # name
+% BAT_b1,BAT_b2 # name
% int, str # type
% false,false # dense
% true, false # sorted
diff -r 7369459c185b -r 4c7ff2ce775d MonetDB5/src/mal/Tests/tst805.mal
--- a/MonetDB5/src/mal/Tests/tst805.mal Wed Jul 07 13:36:42 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst805.mal Wed Jul 07 13:39:44 2010 +0200
@@ -1,4 +1,5 @@
b:= bat.new(:oid,:int);
+bat.setName(b,"BAT_b");
c:= bat.new(:str,:bat);
bat.insert(c,"a",b);
io.print(c);
diff -r 7369459c185b -r 4c7ff2ce775d MonetDB5/src/mal/Tests/tst805.stable.out
--- a/MonetDB5/src/mal/Tests/tst805.stable.out Wed Jul 07 13:36:42 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst805.stable.out Wed Jul 07 13:39:44 2010 +0200
@@ -14,6 +14,7 @@
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:30168/
function user.main():void;
b := bat.new(:oid,:int);
+ bat.setName(b,"BAT_b");
c := bat.new(:str,:BAT);
bat.insert(c,"a",b);
io.print(c);
@@ -25,7 +26,7 @@
# h t # name
# str BAT # type
#-------------------------#
-[ "a", <tmp_7> ]
+[ "a", <BAT_b> ]
#-----------------#
# h t # name
# void int # type
diff -r 7369459c185b -r 4c7ff2ce775d MonetDB5/src/optimizer/Tests/garbage1.mal
--- a/MonetDB5/src/optimizer/Tests/garbage1.mal Wed Jul 07 13:36:42 2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/garbage1.mal Wed Jul 07 13:39:44 2010 +0200
@@ -1,5 +1,6 @@
function test():bat;
b:= bat.new(:str,:bat);
+ bat.setName(b,"BAT_b");
return test := b;
end test;
diff -r 7369459c185b -r 4c7ff2ce775d
MonetDB5/src/optimizer/Tests/garbage1.stable.out
--- a/MonetDB5/src/optimizer/Tests/garbage1.stable.out Wed Jul 07 13:36:42
2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/garbage1.stable.out Wed Jul 07 13:39:44
2010 +0200
@@ -15,6 +15,7 @@
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32278/
function user.test():BAT;
b := bat.new(:str,:BAT);
+ bat.setName(b,"BAT_b");
return test := b;
end test;
function user.test2():void;
@@ -38,13 +39,14 @@
end test2; # 3
function user.test():BAT; # 0 test:BAT := user.test() {G}
b := bat.new(:str,:BAT); # 1 b:bat[:str,:BAT] :=
CMDBATnew(_2:str, _3:BAT) {G}
- return test := b; # 2 test:BAT := b:bat[:str,:BAT] {G}
-end test; # 3
+ bat.setName(b,"BAT_b"); # 2 _4:void :=
BKCsetName(b:bat[:str,:BAT], _5:str) {G}
+ return test := b; # 3 test:BAT := b:bat[:str,:BAT] {G}
+end test; # 4
function user.test2():void; # 0 test2:void := user.test2() {G}
x := user.test(); # 1 x:BAT := user.test() {G}
io.print(x); # 2 _2:void := IOprint_val(x:BAT) {G}
end test2; # 3
-[ <tmp_17> ]
+[ <BAT_b> ]
# 23:03:59 >
# 23:03:59 > Done.
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
