Changeset: 63f200f3d4b0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63f200f3d4b0 Modified Files: monetdb5/modules/kernel/Tests/vacuum.mal monetdb5/modules/kernel/Tests/vacuum.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows Branch: default Log Message:
Merge with Apr2012 branch.
diffs (184 lines):
diff --git a/monetdb5/modules/kernel/Tests/vacuum.mal
b/monetdb5/modules/kernel/Tests/vacuum.mal
--- a/monetdb5/modules/kernel/Tests/vacuum.mal
+++ b/monetdb5/modules/kernel/Tests/vacuum.mal
@@ -4,6 +4,12 @@ b:= bat.new(:oid,:int);
c:= bat.new(:oid,:oid);
k:= 0;
+INT_MAX := 2147483647;
+dbgmsk_restore := mdb.getDebug();
+dbgmsk_unset := 8+8388608;
+dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
+dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
+mdb.setDebug(dbgmsk_set);
barrier (go,i):= language.newRange(0:lng);
k:= k +1;
barrier t:= k <= 1000;
@@ -13,6 +19,7 @@ barrier (go,i):= language.newRange(0:lng
bat.append(b,k);
redo (go,i):= language.nextElement(1:lng,1000000:lng);
exit (go,i);
+mdb.setDebug(dbgmsk_restore);
d:= algebra.copy(b);
diff --git a/monetdb5/modules/kernel/Tests/vacuum.stable.out
b/monetdb5/modules/kernel/Tests/vacuum.stable.out
--- a/monetdb5/modules/kernel/Tests/vacuum.stable.out
+++ b/monetdb5/modules/kernel/Tests/vacuum.stable.out
@@ -21,6 +21,12 @@ function user.main():void;
b := bat.new(:oid,:int);
c := bat.new(:oid,:oid);
k := 0;
+ INT_MAX := 2147483647;
+ dbgmsk_restore := mdb.getDebug();
+ dbgmsk_unset := calc.+(8,8388608);
+ dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
+ dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
+ mdb.setDebug(dbgmsk_set);
barrier (go,i) := language.newRange(0:lng);
k := calc.+(k,1);
barrier t := calc.<=(k,1000);
@@ -30,6 +36,7 @@ exit t;
bat.append(b,k);
redo (go,i) := language.nextElement(1:lng,1000000:lng);
exit (go,i);
+ mdb.setDebug(dbgmsk_restore);
d := algebra.copy(b);
cnt := aggr.count(b);
io.print(cnt);
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -4974,24 +4974,18 @@ end main;
[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];",
"nil" ]
[ "stddev", "function", "aggr",
"(v:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];",
"nil" ]
[ "stddev", "function", "aggr",
"(e:bat[:oid,:flt]):flt;",
"nil" ]
-[ "sum", "function", "aggr",
"(b:bat[:oid,:flt]):flt;",
"nil" ]
[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];",
"nil" ]
[ "stddev", "function", "aggr",
"(v:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];",
"nil" ]
[ "stddev", "function", "aggr",
"(e:bat[:oid,:lng]):lng;",
"nil" ]
-[ "sum", "function", "aggr",
"(b:bat[:oid,:lng]):lng;",
"nil" ]
[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];",
"nil" ]
[ "stddev", "function", "aggr",
"(v:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];",
"nil" ]
[ "stddev", "function", "aggr",
"(e:bat[:oid,:int]):int;",
"nil" ]
-[ "sum", "function", "aggr",
"(b:bat[:oid,:int]):int;",
"nil" ]
[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];",
"nil" ]
[ "stddev", "function", "aggr",
"(v:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];",
"nil" ]
[ "stddev", "function", "aggr",
"(e:bat[:oid,:sht]):sht;",
"nil" ]
-[ "sum", "function", "aggr",
"(b:bat[:oid,:sht]):sht;",
"nil" ]
[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];",
"nil" ]
[ "stddev", "function", "aggr",
"(v:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];",
"nil" ]
-[ "sum", "function", "aggr",
"(b:bat[:oid,:dbl]):dbl;",
"nil" ]
[ "stddev", "function", "aggr",
"(e:bat[:oid,:bte]):bte;",
"nil" ]
-[ "sum", "function", "aggr",
"(b:bat[:oid,:bte]):bte;",
"nil" ]
[ "size", "command", "aggr",
"(b:bat[:void,:bit],e:bat[:void,:any_1]):bat[:void,:wrd] ",
"AX3aggrX3_size;"
]
[ "sum", "command", "aggr",
"(b:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] ",
"AX3aggrX3_sum3_dbl_dbl;" ]
[ "sum", "command", "aggr",
"(b:bat[:oid,:dbl],e:bat[:oid,:any_1]):bat[:oid,:dbl] ",
"AX3aggrX3_sum_dbl_dbl;" ]
@@ -5048,12 +5042,15 @@ end main;
[ "sum", "command", "aggr",
"(b:bat[:any_1,:sht],empty_is_nil:bit):dbl ",
"ALGsum_sht_dbl;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:bte]):dbl;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:bte],empty_is_nil:bit):dbl ",
"ALGsum_bte_dbl;"
]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:dbl]):dbl;",
"nil"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:dbl]):dbl;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:dbl],empty_is_nil:bit):dbl ",
"ALGsum_dbl_dbl;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:flt]):dbl;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:flt],empty_is_nil:bit):dbl ",
"ALGsum_flt_dbl;"
]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:flt]):flt;",
"nil"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:flt]):flt;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:flt],empty_is_nil:bit):flt ",
"ALGsum_flt_flt;"
]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:lng]):lng;",
"nil"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:lng]):lng;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:lng],empty_is_nil:bit):lng ",
"ALGsum_lng_lng;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:wrd]):lng;",
"nil"
]
@@ -5064,6 +5061,7 @@ end main;
[ "sum", "command", "aggr",
"(b:bat[:any_1,:int],empty_is_nil:bit):lng ",
"ALGsum_int_lng;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:int]):wrd;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:int],empty_is_nil:bit):wrd ",
"ALGsum_int_wrd;"
]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:int]):int;",
"nil"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:int]):int;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:int],empty_is_nil:bit):int ",
"ALGsum_int_int;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:sht]):lng;",
"nil"
]
@@ -5072,6 +5070,7 @@ end main;
[ "sum", "command", "aggr",
"(b:bat[:any_1,:sht],empty_is_nil:bit):wrd ",
"ALGsum_sht_wrd;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:sht]):int;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:sht],empty_is_nil:bit):int ",
"ALGsum_sht_int;"
]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:sht]):sht;",
"nil"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:sht]):sht;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:sht],empty_is_nil:bit):sht ",
"ALGsum_sht_sht;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:bte]):lng;",
"nil"
]
@@ -5082,6 +5081,7 @@ end main;
[ "sum", "command", "aggr",
"(b:bat[:any_1,:bte],empty_is_nil:bit):int ",
"ALGsum_bte_int;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:bte]):sht;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:bte],empty_is_nil:bit):sht ",
"ALGsum_bte_sht;"
]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:bte]):bte;",
"nil"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:bte]):bte;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:bte],empty_is_nil:bit):bte ",
"ALGsum_bte_bte;"
]
[ "append", "command", "bat",
"(i:bat[:any_1,:any_2],u:any_2,force:bit):bat[:any_1,:any_2] ",
"BKCappend_val_force_wrap;" ]
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
@@ -4968,24 +4968,18 @@ end main;
[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];",
"nil" ]
[ "stddev", "function", "aggr",
"(v:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];",
"nil" ]
[ "stddev", "function", "aggr",
"(e:bat[:oid,:flt]):flt;",
"nil" ]
-[ "sum", "function", "aggr",
"(b:bat[:oid,:flt]):flt;",
"nil" ]
[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];",
"nil" ]
[ "stddev", "function", "aggr",
"(v:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];",
"nil" ]
[ "stddev", "function", "aggr",
"(e:bat[:oid,:lng]):lng;",
"nil" ]
-[ "sum", "function", "aggr",
"(b:bat[:oid,:lng]):lng;",
"nil" ]
[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];",
"nil" ]
[ "stddev", "function", "aggr",
"(v:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];",
"nil" ]
[ "stddev", "function", "aggr",
"(e:bat[:oid,:int]):int;",
"nil" ]
-[ "sum", "function", "aggr",
"(b:bat[:oid,:int]):int;",
"nil" ]
[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];",
"nil" ]
[ "stddev", "function", "aggr",
"(v:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];",
"nil" ]
[ "stddev", "function", "aggr",
"(e:bat[:oid,:sht]):sht;",
"nil" ]
-[ "sum", "function", "aggr",
"(b:bat[:oid,:sht]):sht;",
"nil" ]
[ "stddev_pop", "function", "aggr",
"(v:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];",
"nil" ]
[ "stddev", "function", "aggr",
"(v:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];",
"nil" ]
-[ "sum", "function", "aggr",
"(b:bat[:oid,:dbl]):dbl;",
"nil" ]
[ "stddev", "function", "aggr",
"(e:bat[:oid,:bte]):bte;",
"nil" ]
-[ "sum", "function", "aggr",
"(b:bat[:oid,:bte]):bte;",
"nil" ]
[ "size", "command", "aggr",
"(b:bat[:void,:bit],e:bat[:void,:any_1]):bat[:void,:wrd] ",
"AX3aggrX3_size;"
]
[ "sum", "command", "aggr",
"(b:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] ",
"AX3aggrX3_sum3_dbl_dbl;" ]
[ "sum", "command", "aggr",
"(b:bat[:oid,:dbl],e:bat[:oid,:any_1]):bat[:oid,:dbl] ",
"AX3aggrX3_sum_dbl_dbl;" ]
@@ -5042,12 +5036,15 @@ end main;
[ "sum", "command", "aggr",
"(b:bat[:any_1,:sht],empty_is_nil:bit):dbl ",
"ALGsum_sht_dbl;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:bte]):dbl;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:bte],empty_is_nil:bit):dbl ",
"ALGsum_bte_dbl;"
]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:dbl]):dbl;",
"nil"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:dbl]):dbl;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:dbl],empty_is_nil:bit):dbl ",
"ALGsum_dbl_dbl;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:flt]):dbl;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:flt],empty_is_nil:bit):dbl ",
"ALGsum_flt_dbl;"
]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:flt]):flt;",
"nil"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:flt]):flt;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:flt],empty_is_nil:bit):flt ",
"ALGsum_flt_flt;"
]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:lng]):lng;",
"nil"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:lng]):lng;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:lng],empty_is_nil:bit):lng ",
"ALGsum_lng_lng;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:wrd]):lng;",
"nil"
]
@@ -5058,6 +5055,7 @@ end main;
[ "sum", "command", "aggr",
"(b:bat[:any_1,:int],empty_is_nil:bit):lng ",
"ALGsum_int_lng;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:int]):wrd;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:int],empty_is_nil:bit):wrd ",
"ALGsum_int_wrd;"
]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:int]):int;",
"nil"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:int]):int;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:int],empty_is_nil:bit):int ",
"ALGsum_int_int;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:sht]):lng;",
"nil"
]
@@ -5066,6 +5064,7 @@ end main;
[ "sum", "command", "aggr",
"(b:bat[:any_1,:sht],empty_is_nil:bit):wrd ",
"ALGsum_sht_wrd;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:sht]):int;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:sht],empty_is_nil:bit):int ",
"ALGsum_sht_int;"
]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:sht]):sht;",
"nil"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:sht]):sht;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:sht],empty_is_nil:bit):sht ",
"ALGsum_sht_sht;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:bte]):lng;",
"nil"
]
@@ -5076,6 +5075,7 @@ end main;
[ "sum", "command", "aggr",
"(b:bat[:any_1,:bte],empty_is_nil:bit):int ",
"ALGsum_bte_int;"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:bte]):sht;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:bte],empty_is_nil:bit):sht ",
"ALGsum_bte_sht;"
]
+[ "sum", "function", "aggr",
"(b:bat[:oid,:bte]):bte;",
"nil"
]
[ "sum", "function", "aggr",
"(b:bat[:any_1,:bte]):bte;",
"nil"
]
[ "sum", "command", "aggr",
"(b:bat[:any_1,:bte],empty_is_nil:bit):bte ",
"ALGsum_bte_bte;"
]
[ "append", "command", "bat",
"(i:bat[:any_1,:any_2],u:any_2,force:bit):bat[:any_1,:any_2] ",
"BKCappend_val_force_wrap;" ]
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
