Changeset: ecddd38a9d9c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ecddd38a9d9c
Added Files:
sql/test/sysmon/Tests/timeout_cross.SQL.py
Removed Files:
sql/test/sysmon/Tests/timeout_cp.SQL.py
Modified Files:
sql/test/sysmon/Tests/timeout_join.maltest
Branch: qcancel
Log Message:
fix test
diffs (61 lines):
diff --git a/sql/test/sysmon/Tests/timeout_cp.SQL.py
b/sql/test/sysmon/Tests/timeout_cp.SQL.py
deleted file mode 100644
--- a/sql/test/sysmon/Tests/timeout_cp.SQL.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from MonetDBtesting.sqltest import SQLTestCase
-
-with SQLTestCase() as tc:
- tc.execute("create table foo(id bigserial, value int);").assertSucceeded()
- tc.execute("create table bar(id bigserial, value int);").assertSucceeded()
- # test cross product
- tc.execute("insert into foo(value) (select * from
generate_series(0,10000));").assertSucceeded()
- tc.execute("insert into bar(value) (select * from
generate_series(0,10000));").assertSucceeded()
- tc.execute("call sys.setquerytimeout(1); select * from foo, bar;")\
- .assertFailed(err_code="HYT00", err_message="Query aborted due to
timeout")
- # test mergejoin_int with bigger data set
- tc.execute("insert into foo(value) (select * from
generate_series(0,10000000));").assertSucceeded()
- tc.execute("insert into bar(value) (select * from
generate_series(0,10000000));").assertSucceeded()
- tc.execute("call sys.setquerytimeout(1); select * from foo as f join bar b
on f.value=b.value;")\
- .assertFailed(err_code="HYT00", err_message="Query aborted due to
timeout")
diff --git a/sql/test/sysmon/Tests/timeout_cross.SQL.py
b/sql/test/sysmon/Tests/timeout_cross.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/sysmon/Tests/timeout_cross.SQL.py
@@ -0,0 +1,10 @@
+from MonetDBtesting.sqltest import SQLTestCase
+
+with SQLTestCase() as tc:
+ tc.execute("create table foo(id bigserial, value int);").assertSucceeded()
+ tc.execute("create table bar(id bigserial, value int);").assertSucceeded()
+ # test cross product
+ tc.execute("insert into foo(value) (select * from
generate_series(0,10000));").assertSucceeded()
+ tc.execute("insert into bar(value) (select * from
generate_series(0,10000));").assertSucceeded()
+ tc.execute("call sys.setquerytimeout(1); select * from foo, bar;")\
+ .assertFailed(err_code="HYT00", err_message="Query aborted due to
timeout")
diff --git a/sql/test/sysmon/Tests/timeout_join.maltest
b/sql/test/sysmon/Tests/timeout_join.maltest
--- a/sql/test/sysmon/Tests/timeout_join.maltest
+++ b/sql/test/sysmon/Tests/timeout_join.maltest
@@ -1,9 +1,21 @@
+statement error
a:=bat.new(:lng);
b:=bat.new(:lng);
+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);
+t1:= alarm.usec();
barrier i:= 0:lng;
bat.append(a, i);
bat.append(b, i);
redo i:= iterator.next(1:lng,1000000:lng);
exit i;
-clients.setquerytimeout(1);
+mdb.setDebug(dbgmsk_restore);
+t2:= alarm.usec();
+d:=t2-t1;
+qto:= d + 1000:lng;
+clients.setQryTimeoutMicro(qto);
(vg_a,xg_b):=algebra.join(a,b,nil:bat,nil:bat,false,nil:lng);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
