Changeset: c196f568cfcc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/c196f568cfcc Branch: default Log Message:
Merge with Dec2025 branch. diffs (68 lines): diff --git a/sql/test/sysmon/timeout/Tests/timeout_aggr.maltest b/sql/test/sysmon/timeout/Tests/timeout_aggr.maltest --- a/sql/test/sysmon/timeout/Tests/timeout_aggr.maltest +++ b/sql/test/sysmon/timeout/Tests/timeout_aggr.maltest @@ -1,16 +1,5 @@ statement error -a:=bat.new(:lng); -INT_MAX := 2147483647; -dbgmsk_restore := mdb.getDebug(); -dbgmsk_unset := 8+2; -dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset); -dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep); -mdb.setDebug(dbgmsk_set); -barrier i:= 0:lng; - bat.append(a, i); - redo i:= iterator.next(1:lng,1000000:lng); -exit i; -mdb.setDebug(dbgmsk_restore); +a := generate.series(0:lng, 1000000:lng); qto:= 1000:lng; clients.setQryTimeoutMicro(qto); X_sum:hge := aggr.sum(a); diff --git a/sql/test/sysmon/timeout/Tests/timeout_join.maltest b/sql/test/sysmon/timeout/Tests/timeout_join.maltest --- a/sql/test/sysmon/timeout/Tests/timeout_join.maltest +++ b/sql/test/sysmon/timeout/Tests/timeout_join.maltest @@ -1,18 +1,6 @@ statement error -a:=bat.new(:lng); -b:=bat.new(:lng); -INT_MAX := 2147483647; -dbgmsk_restore := mdb.getDebug(); -dbgmsk_unset := 8+2; -dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset); -dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep); -mdb.setDebug(dbgmsk_set); -barrier i:= 0:lng; - bat.append(a, i); - bat.append(b, i); - redo i:= iterator.next(1:lng,1000000:lng); -exit i; -mdb.setDebug(dbgmsk_restore); +a:=generate.series(0:lng,1000000:lng); +b:=generate.series(0:lng,1000000:lng); qto:= 1000:lng; clients.setQryTimeoutMicro(qto); (vg_a,xg_b):=algebra.join(a,b,nil:bat,nil:bat,false,nil:lng); @@ -20,20 +8,8 @@ qto:= 0:lng; clients.setQryTimeoutMicro(qto); statement error -int_a:=bat.new(:int); -int_b:=bat.new(:int); -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 j:= 0:int; - bat.append(int_a, j); - bat.append(int_b, j); - redo j:= iterator.next(1:int,1000000:int); -exit j; -mdb.setDebug(dbgmsk_restore); +int_a:=generate.series(0:int,1000000:int); +int_b:=generate.series(0:int,1000000:int); qto:= 1000:lng; clients.setQryTimeoutMicro(qto); (vg_a,xg_b):=algebra.join(int_a,int_b,nil:bat,nil:bat,false,nil:lng); _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
