Changeset: 20f1f97e054c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=20f1f97e054c
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst020.maltest
monetdb5/mal/Tests/tst022.maltest
monetdb5/mal/Tests/tst033.malC
monetdb5/mal/Tests/tst034.malC
monetdb5/mal/Tests/tst035.malC
monetdb5/mal/Tests/tst041.malC
Branch: mtest
Log Message:
New batch of test conversion
diffs (261 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -21,24 +21,24 @@ tst019
tst020
tst021
tst022
-#tst023
-#tst024
-#tst025
-#tst026
-#tst027
-#tst028
-#tst029
-#tst030
-#tst031
-#tst032
-#tst033
-#tst034
-#tst035
-#tst036
-#tst037
-#tst038
-#tst039
-#tst041
+tst023
+tst024
+tst025
+tst026
+tst027
+tst028
+tst029
+tst030
+tst031
+tst032
+tst033
+tst034
+tst035
+tst036
+tst037
+tst038
+tst039
+tst041
#tst042
#tst043
#tst044
diff --git a/monetdb5/mal/Tests/tst020.maltest
b/monetdb5/mal/Tests/tst020.maltest
--- a/monetdb5/mal/Tests/tst020.maltest
+++ b/monetdb5/mal/Tests/tst020.maltest
@@ -8,16 +8,16 @@ barrier l:= r == 0;
leave l;
redo l;
exit l;
-end pl;
+end pl
statement ok
-a:= "hello";
+a:= "hello"
statement ok
-z:= user.pl(a);
+z:= user.pl(a)
query T rowsort
-io.print("done");
+io.print("done")
----
"done"
diff --git a/monetdb5/mal/Tests/tst022.maltest
b/monetdb5/mal/Tests/tst022.maltest
--- a/monetdb5/mal/Tests/tst022.maltest
+++ b/monetdb5/mal/Tests/tst022.maltest
@@ -12,6 +12,6 @@ barrier b:= j>0;
exit b;
barrier b:= j<=0
io.printf("wrong entered fourth\n");
-exit b
+exit b;
----
ok entered first
diff --git a/monetdb5/mal/Tests/tst033.malC b/monetdb5/mal/Tests/tst033.malC
--- a/monetdb5/mal/Tests/tst033.malC
+++ b/monetdb5/mal/Tests/tst033.malC
@@ -4,11 +4,27 @@ bat.append(b,1);
bat.append(b,2);
bat.append(b,3);
-s := algebra.select(b,nil:bat[:oid],0,2,true,true,false); z :=
algebra.projection(s,b); io.print(z);
-s := algebra.select(b,nil:bat[:oid],0,2,true,false,false); z :=
algebra.projection(s,b); io.print(z);
-s := algebra.select(b,nil:bat[:oid],0,2,false,true,false); z :=
algebra.projection(s,b); io.print(z);
-s := algebra.select(b,nil:bat[:oid],0,2,false,false,false); z :=
algebra.projection(s,b); io.print(z);
-s := algebra.select(b,nil:bat[:oid],0,2,true,true,true); z :=
algebra.projection(s,b); io.print(z);
-s := algebra.select(b,nil:bat[:oid],0,2,true,false,true); z :=
algebra.projection(s,b); io.print(z);
-s := algebra.select(b,nil:bat[:oid],0,2,false,true,true); z :=
algebra.projection(s,b); io.print(z);
-s := algebra.select(b,nil:bat[:oid],0,2,false,false,true); z :=
algebra.projection(s,b); io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,true,true,false);
+z := algebra.projection(s,b);
+io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,true,false,false);
+z := algebra.projection(s,b);
+io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,false,true,false);
+z := algebra.projection(s,b);
+io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,false,false,false);
+z := algebra.projection(s,b);
+io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,true,true,true);
+z := algebra.projection(s,b);
+io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,true,false,true);
+z := algebra.projection(s,b);
+io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,false,true,true);
+z := algebra.projection(s,b);
+io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,false,false,true);
+z := algebra.projection(s,b);
+io.print(z);
diff --git a/monetdb5/mal/Tests/tst034.malC b/monetdb5/mal/Tests/tst034.malC
--- a/monetdb5/mal/Tests/tst034.malC
+++ b/monetdb5/mal/Tests/tst034.malC
@@ -7,13 +7,21 @@ bat.append(b,3);
i:= bbp.getLRefCount(b);
io.printf("start of selections %d [1]\n",i);
-s:= algebra.select(b,nil:bat[:oid],0,2,true,true,false);
z:=algebra.projection(s,b); io.print(z);
+s:= algebra.select(b,nil:bat[:oid],0,2,true,true,false);
+z:=algebra.projection(s,b);
+io.print(z);
i:= bbp.getLRefCount(z);
io.printf("z select %d [1]\n",i);
i:= bbp.getLRefCount(b);
io.printf("select %d [1]\n",i);
-s:= algebra.select(b,nil:bat[:oid],0,2,true,false,false);
z:=algebra.projection(s,b); io.print(z);
+s:= algebra.select(b,nil:bat[:oid],0,2,true,false,false);
+z:=algebra.projection(s,b);
+io.print(z);
i:= bbp.getLRefCount(b);
io.printf("select %d [1]\n",i);
-s:= algebra.select(b,nil:bat[:oid],0,2,false,true,false);
z:=algebra.projection(s,b); io.print(z);
-s:= algebra.select(b,nil:bat[:oid],0,2,false,false,false);
z:=algebra.projection(s,b); io.print(z);
+s:= algebra.select(b,nil:bat[:oid],0,2,false,true,false);
+z:=algebra.projection(s,b);
+io.print(z);
+s:= algebra.select(b,nil:bat[:oid],0,2,false,false,false);
+z:=algebra.projection(s,b);
+io.print(z);
diff --git a/monetdb5/mal/Tests/tst035.malC b/monetdb5/mal/Tests/tst035.malC
--- a/monetdb5/mal/Tests/tst035.malC
+++ b/monetdb5/mal/Tests/tst035.malC
@@ -5,8 +5,11 @@ z:=z; io.print(z);
io.print("done");
b:= bat.new(:int);
-i:= bbp.getLRefCount(b); io.print(i);
+i:= bbp.getLRefCount(b);
+io.print(i);
b:=b;
-i:= bbp.getLRefCount(b); io.print(i);
+i:= bbp.getLRefCount(b);
+io.print(i);
b:=b;
-i:= bbp.getLRefCount(b); io.print(i);
+i:= bbp.getLRefCount(b);
+io.print(i);
diff --git a/monetdb5/mal/Tests/tst041.malC b/monetdb5/mal/Tests/tst041.malC
--- a/monetdb5/mal/Tests/tst041.malC
+++ b/monetdb5/mal/Tests/tst041.malC
@@ -1,36 +1,63 @@
# this sequence tests nil type management
-b:=nil; io.print(b);
+b:=nil;
+io.print(b);
-a:=23; io.print(a);
-a:= calc.int(nil); io.print(a);
-a:= calc.int(nil:int); io.print(a);
-a:= calc.int(13); io.print(a);
-a:= calc.int("23"); io.print(a);
-a:= calc.int(43.0:flt); io.print(a);
-a:= calc.int(63.0:dbl); io.print(a);
-a:= nil:int; io.print(a);
+a:=23;
+io.print(a);
+a:= calc.int(nil);
+io.print(a);
+a:= calc.int(nil:int);
+io.print(a);
+a:= calc.int(13);
+io.print(a);
+a:= calc.int("23");
+io.print(a);
+a:= calc.int(43.0:flt);
+io.print(a);
+a:= calc.int(63.0:dbl);
+io.print(a);
+a:= nil:int;
+io.print(a);
-c:= true; io.print(c);
-c:= calc.bit(nil); io.print(c);
-c:= calc.bit(nil:bit); io.print(c);
-c:= calc.bit(false); io.print(c);
-c:= calc.bit(1); io.print(c);
-c:= calc.bit("true"); io.print(c);
-c:= calc.bit(1.0:flt); io.print(c);
-c:= calc.bit(0.0:dbl); io.print(c);
+c:= true;
+io.print(c);
+c:= calc.bit(nil);
+io.print(c);
+c:= calc.bit(nil:bit);
+io.print(c);
+c:= calc.bit(false);
+io.print(c);
+c:= calc.bit(1);
+io.print(c);
+c:= calc.bit("true");
+io.print(c);
+c:= calc.bit(1.0:flt);
+io.print(c);
+c:= calc.bit(0.0:dbl);
+io.print(c);
c:= nil:bit; io.print(c);
-d:= 3.14:flt; io.print(d);
-d:= calc.flt(nil); io.print(d);
-d:= calc.flt(nil:flt); io.print(c);
-d:= calc.flt(5); io.print(d);
-d:= calc.flt("7.14"); io.print(d);
-d:= nil:flt; io.print(d);
+d:= 3.14:flt;
+io.print(d);
+d:= calc.flt(nil);
+io.print(d);
+d:= calc.flt(nil:flt);
+io.print(c);
+d:= calc.flt(5);
+io.print(d);
+d:= calc.flt("7.14");
+io.print(d);
+d:= nil:flt;
+io.print(d);
-e:= "hello"; io.print(e);
-e:= calc.str(nil); io.print(e);
-e:= calc.str("nil"); io.print(e);
-e:= nil:str; io.print(e);
+e:= "hello";
+io.print(e);
+e:= calc.str(nil);
+io.print(e);
+e:= calc.str("nil");
+io.print(e);
+e:= nil:str;
+io.print(e);
io.print(nil:str);
o:= nil:blob;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
