Changeset: 5b852b769f89 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5b852b769f89
Removed Files:
monetdb5/mal/Tests/tst005.maltest
monetdb5/mal/Tests/tst280.maltest
monetdb5/mal/Tests/tst400.maltest
monetdb5/mal/Tests/tst401.maltest
monetdb5/mal/Tests/tst902.maltest
monetdb5/modules/mal/Tests/iterator03.maltest
monetdb5/modules/mal/Tests/manifold.maltest
monetdb5/modules/mal/Tests/manifoldstr.maltest
monetdb5/optimizer/Tests/reorder00.maltest
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/dataflow01.maltest
monetdb5/mal/Tests/tst901.maltest
monetdb5/mal/Tests/tst901a.maltest
monetdb5/mal/Tests/tst904.maltest
monetdb5/mal/Tests/tst905.maltest
monetdb5/mal/Tests/tst906.maltest
monetdb5/mal/Tests/tst908.maltest
monetdb5/mal/Tests/tst920.maltest
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/Tests/bigsum.maltest
monetdb5/optimizer/Tests/All
Branch: default
Log Message:
Adapt to some iterator functions having been removed.
diffs (truncated from 888 to 300 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -3,7 +3,6 @@ tst001
tst002
tst003
tst004
-tst005
tst006
tst007
tst008
@@ -124,7 +123,6 @@ tst251
tst252
tst255
tst256
-tst280
tst281
tst292
tst285
@@ -136,8 +134,6 @@ tst304
tst305
tst307
tst308
-tst400
-tst401
tst500
tst501
tst560
@@ -163,7 +159,6 @@ tst880
tst890
tst900
tst901
-tst902
tst904
tst905
tst906
diff --git a/monetdb5/mal/Tests/dataflow01.maltest
b/monetdb5/mal/Tests/dataflow01.maltest
--- a/monetdb5/mal/Tests/dataflow01.maltest
+++ b/monetdb5/mal/Tests/dataflow01.maltest
@@ -1,23 +1,3 @@
-statement ok
-function load():bat[:lng];
-b:= bat.new(:lng);
-k:=0;
-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;
- k:= k+1;
- l:= calc.lng(k);
- bat.append(b,l);
- redo i:= iterator.next(1:lng,100000:lng);
-exit i;
-mdb.setDebug(dbgmsk_restore);
- return b;
-end load;
-
statement ok
function qry(z:bat[:lng],low:int,hgh:int):lng;
l:= calc.lng(low);
@@ -28,7 +8,7 @@ function qry(z:bat[:lng],low:int,hgh:int
end qry;
statement ok
-s:= load();
+s:= generator.series(1:lng, 100001:lng);
statement ok
t1:= 0:lng;
diff --git a/monetdb5/mal/Tests/tst005.maltest
b/monetdb5/mal/Tests/tst005.maltest
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst005.maltest
+++ /dev/null
@@ -1,33 +0,0 @@
-statement ok
-function foo();
- i:= 1;
- j:= 2;
-barrier v:=i;
- io.print("entered");
- io.print(v);
- redo v:= iterator.next(-1,0);
-exit v;
- io.print("doubles");
- i:= 1;
-barrier (v,w):=(i,j);
- io.print("entered2");
- io.print(v);
- v:= v-1;
- barrier b:= v == 0;
- leave (v,w);
- exit b;
- redo (v,w):= (v,w);
-exit (v,w);
- io.print("finished");
-end foo;
-
-query T nosort
-user.foo();
-----
-"entered"
-1
-"doubles"
-"entered2"
-1
-"finished"
-
diff --git a/monetdb5/mal/Tests/tst280.maltest
b/monetdb5/mal/Tests/tst280.maltest
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst280.maltest
+++ /dev/null
@@ -1,49 +0,0 @@
-statement ok
-function pow(i:int,j:int):int;
- z:= i+j;
- return z;
-end pow
-
-statement ok
-function tst(A2:bat[:int],A3:bat[:int]):bat[:int];
- resB := bat.new(:int);
- lim:= aggr.count(A2);
- l:= calc.oid(lim);
-barrier m:= 0:oid;
- B2 := algebra.fetch(A2,m);
- B3 := algebra.fetch(A3,m);
- cr := user.pow(B2,B3);
- bat.append(resB,cr);
- redo m := iterator.next(1:oid,l);
-catch MALException:str;
-exit MALException;
-exit m ;
- return resB;
-end tst
-
-statement ok
- b := bat.new(:int)
-
-statement ok
- bat.append(b,1)
-
-statement ok
- bat.append(b,2)
-
-statement ok
- e:= algebra.fetch(b,1:oid)
-
-statement ok
- c:= algebra.copy(b)
-
-statement ok
- z:= user.tst(b,c)
-
-query II rowsort
- io.print(z)
-----
-0
-2
-1
-4
-
diff --git a/monetdb5/mal/Tests/tst400.maltest
b/monetdb5/mal/Tests/tst400.maltest
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst400.maltest
+++ /dev/null
@@ -1,23 +0,0 @@
-statement ok
-function foo();
-barrier i:= 0;
- io.print("do something");
- redo i:= iterator.next(1,2);
-exit i;
- io.printf("left first loop with %d\n",i);
- io.print("next iteration");
-barrier i:= 0;
- io.print("do something else");
- redo i:= iterator.next(2,5);
-exit i;
-end foo;
-
-query T rowsort
-user.foo();
-----
-"do something else"
-"do something else"
-"do something else"
-"next iteration"
-left first loop with nil
-
diff --git a/monetdb5/mal/Tests/tst401.maltest
b/monetdb5/mal/Tests/tst401.maltest
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst401.maltest
+++ /dev/null
@@ -1,15 +0,0 @@
-statement ok
-function foo();
-barrier i := 0.0:flt;
- io.print(i);
- v:= "do something";
- redo i :=iterator.next(1.3:flt,2.5:flt);
-exit i;
-end foo;
-
-query T rowsort
-user.foo();
-----
-0
-1.3
-
diff --git a/monetdb5/mal/Tests/tst901.maltest
b/monetdb5/mal/Tests/tst901.maltest
--- a/monetdb5/mal/Tests/tst901.maltest
+++ b/monetdb5/mal/Tests/tst901.maltest
@@ -1,10 +1,6 @@
statement ok
function foo();
-b:= bat.new(:int);
-barrier i:= 0:int;
- bat.append(b,i);
- redo i:= iterator.next(1:int,10:int);
-exit i;
+b:= generator.series(0,10);
c:= algebra.copy(b);
io.print(c);
x:= batcalc.+(b,c,nil:bat,nil:bat);
diff --git a/monetdb5/mal/Tests/tst901a.maltest
b/monetdb5/mal/Tests/tst901a.maltest
--- a/monetdb5/mal/Tests/tst901a.maltest
+++ b/monetdb5/mal/Tests/tst901a.maltest
@@ -1,17 +1,6 @@
statement ok
function foo();
-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(b,i);
- redo i:= iterator.next(1:lng,1000000:lng);
-exit i;
-mdb.setDebug(dbgmsk_restore);
+b:= generator.series(0:lng, 1000000:lng);
c:= algebra.copy(b);
x:= batcalc.+(b,c,nil:bat,nil:bat);
xc:= aggr.count(b);
diff --git a/monetdb5/mal/Tests/tst902.maltest
b/monetdb5/mal/Tests/tst902.maltest
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst902.maltest
+++ /dev/null
@@ -1,45 +0,0 @@
-statement ok
-function foo();
-b:= bat.new(:lng);
-barrier v:= 0:lng;
- bat.append(b,v);
- redo v:= iterator.next(1:lng,10:lng);
-exit v;
-c:= algebra.copy(b);
-d:= bat.new(:lng);
-barrier (h,t):= iterator.new(b);
- B1:= algebra.fetch(b,h);
- B2:= algebra.fetch(c,h);
- t:= B1+B2;
- bat.append(d,t);
- redo (h,t):= iterator.next(b);
-catch GDKerror:str;
-exit GDKerror;
-exit (h,t);
-io.print(d);
-end;
-
-query II rowsort
-user.foo();
-----
-0
-0
-1
-2
-2
-4
-3
-6
-4
-8
-5
-10
-6
-12
-7
-14
-8
-16
-9
-18
-
diff --git a/monetdb5/mal/Tests/tst904.maltest
b/monetdb5/mal/Tests/tst904.maltest
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
