MonetDB: Oct2014 - Don't assign differently typed values to a va...

[Sjoerd Mullender]

Changeset: 65641890b30b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65641890b30b
Modified Files:
        monetdb5/modules/mal/Tests/manifold.mal
        monetdb5/modules/mal/Tests/manifold.stable.out
        monetdb5/modules/mal/Tests/manifoldstr.mal
        monetdb5/modules/mal/Tests/manifoldstr.stable.out
Branch: Oct2014
Log Message:

Don't assign differently typed values to a variable.


diffs (80 lines):

diff --git a/monetdb5/modules/mal/Tests/manifold.mal 
b/monetdb5/modules/mal/Tests/manifold.mal
--- a/monetdb5/modules/mal/Tests/manifold.mal
+++ b/monetdb5/modules/mal/Tests/manifold.mal
@@ -33,12 +33,12 @@ io.printf("#sum %f\n",s);
 #x:bat[:oid,:dbl]:= mal.multiplex("mmath","sin",b);
 t0:= alarm.usec();
 x:= bat.new(:oid,:dbl);
-barrier i:= 0@0;
-       ii:= algebra.fetch(b,i);
+barrier j:= 0@0;
+       ii:= algebra.fetch(b,j);
        d:= mmath.sin(ii);
        bat.append(x,d);
-       redo i:= iterator.next(1@0,1000000@0);
-exit i;
+       redo j:= iterator.next(1@0,1000000@0);
+exit j;
 t1:= alarm.usec();
 d0:= t1-t0;
 io.printf("#mal.multiplex(sin) %d\n",d0);
diff --git a/monetdb5/modules/mal/Tests/manifold.stable.out 
b/monetdb5/modules/mal/Tests/manifold.stable.out
--- a/monetdb5/modules/mal/Tests/manifold.stable.out
+++ b/monetdb5/modules/mal/Tests/manifold.stable.out
@@ -47,12 +47,12 @@ exit i;
     io.printf("#sum %f\n",s);
     t0 := alarm.usec();
     x := bat.new(:oid,:dbl);
-barrier i := 0@0;
-    ii := algebra.fetch(b,i);
+barrier j := 0@0;
+    ii := algebra.fetch(b,j);
     d := mmath.sin(ii);
     bat.append(x,d);
-    redo i := iterator.next(1@0,1000000@0);
-exit i;
+    redo j := iterator.next(1@0,1000000@0);
+exit j;
     t1 := alarm.usec();
     d0 := calc.-(t1,t0);
     io.printf("#mal.multiplex(sin) %d\n",d0);
diff --git a/monetdb5/modules/mal/Tests/manifoldstr.mal 
b/monetdb5/modules/mal/Tests/manifoldstr.mal
--- a/monetdb5/modules/mal/Tests/manifoldstr.mal
+++ b/monetdb5/modules/mal/Tests/manifoldstr.mal
@@ -31,12 +31,12 @@ io.printf("#mal.manifold(str,toUpper) %d
 # x:bat[:oid,:str]:= mal.multiplex("str","toUpper",b);
 t0:= alarm.usec();
 x:= bat.new(:oid,:str);
-barrier i:= 0@0;
-       ii:= algebra.fetch(b,i);
+barrier j:= 0@0;
+       ii:= algebra.fetch(b,j);
        d:= str.toUpper(ii);
        bat.append(x,d);
-       redo i:= iterator.next(1@0,100000@0);
-exit i;
+       redo j:= iterator.next(1@0,100000@0);
+exit j;
 t1:= alarm.usec();
 d0:= t1-t0;
 io.printf("#mal.multiplex(str,toUpper) %d\n",d0);
diff --git a/monetdb5/modules/mal/Tests/manifoldstr.stable.out 
b/monetdb5/modules/mal/Tests/manifoldstr.stable.out
--- a/monetdb5/modules/mal/Tests/manifoldstr.stable.out
+++ b/monetdb5/modules/mal/Tests/manifoldstr.stable.out
@@ -46,12 +46,12 @@ exit i;
 # x:bat[:oid,:str]:= mal.multiplex("str","toUpper",b); 
     t0 := alarm.usec();
     x := bat.new(:oid,:str);
-barrier i := 0@0;
-    ii := algebra.fetch(b,i);
+barrier j := 0@0;
+    ii := algebra.fetch(b,j);
     d := str.toUpper(ii);
     bat.append(x,d);
-    redo i := iterator.next(1@0,100000@0);
-exit i;
+    redo j := iterator.next(1@0,100000@0);
+exit j;
     t1 := alarm.usec();
     d0 := calc.-(t1,t0);
     io.printf("#mal.multiplex(str,toUpper) %d\n",d0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list