Changeset: 7fb0a1bd03e2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7fb0a1bd03e2
Branch: mtest
Log Message:
merged
diffs (truncated from 8538 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
@@ -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/tst023.maltest
b/monetdb5/mal/Tests/tst023.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst023.maltest
@@ -0,0 +1,93 @@
+statement ok
+b1:= bat.new(:int)
+
+statement ok
+b2:= bat.new(:flt)
+
+statement ok
+bat.append(b1,1)
+
+
+statement ok
+bat.append(b1,2)
+
+statement ok
+bat.append(b1,3)
+
+statement ok
+bat.append(b1,4)
+
+statement ok
+bat.append(b1,2)
+
+statement ok
+bat.append(b2, 12.31)
+
+statement ok
+bat.append(b2, 12.32)
+
+statement ok
+bat.append(b2, 12.33)
+
+statement ok
+bat.append(b2, 12.34)
+
+statement ok
+bat.append(b2, 12.35)
+
+query TIT rowsort
+io.print(b1,b2)
+----
+15 values hashing to 7780eab4e64e9eb5beefdca3f9ec7c81
+
+statement ok
+s:= algebra.select(b1,nil:bat[:oid],2,2,true,true,false)
+
+query TT rowsort
+io.print(s)
+----
+@
+1
+@
+4
+
+statement ok
+bat.delete(b1,s)
+
+query TI rowsort
+io.print(b1)
+----
+@
+1
+@
+3
+@
+4
+
+statement ok
+bat.delete(b2,s)
+
+query TT rowsort
+io.print(b2)
+----
+@
+12.31
+@
+12.33
+@
+12.34
+
+query TIT rowsort
+io.print(b1,b2)
+----
+@
+1
+12.31
+@
+3
+12.33
+@
+4
+12.34
+
+
diff --git a/monetdb5/mal/Tests/tst024.maltest
b/monetdb5/mal/Tests/tst024.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst024.maltest
@@ -0,0 +1,18 @@
+statement ok
+i:= 12
+
+statement ok
+_2:=55
+
+statement ok
+_3:= 23
+
+statement ok
+_5:=23
+
+query T rowsort
+io.print(_5)
+----
+23
+
+
diff --git a/monetdb5/mal/Tests/tst025.maltest
b/monetdb5/mal/Tests/tst025.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst025.maltest
@@ -0,0 +1,41 @@
+statement ok
+b:= bat.new(:int)
+
+statement ok
+bat.append(b, 5140046)
+
+statement ok
+bat.append(b, 5442033)
+
+statement ok
+bat.append(b, 5645862)
+
+query TI rowsort
+io.print(b)
+----
+@
+5140046
+@
+5442033
+@
+5645862
+
+statement ok
+bat.delete(b,1@0)
+
+query TI rowsort
+io.print(b)
+----
+@
+5140046
+@
+5645862
+
+statement ok
+bat.delete(b)
+
+query TI rowsort
+io.print(b)
+----
+
+
diff --git a/monetdb5/mal/Tests/tst026.maltest
b/monetdb5/mal/Tests/tst026.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst026.maltest
@@ -0,0 +1,29 @@
+statement ok
+function foo();
+ b:= bat.new(:int);
+ cnt:= 0:lng;
+ f:= 0;
+ g:= 0;
+barrier d:=true;
+ f:=1;
+ cnt:= aggr.count(b);
+ redo d:=false;
+ barrier e:=true;
+ g:=1;
+ exit e;
+ io.print(g);
+exit d;
+cnt:= aggr.count(b);
+id := calc.oid(cnt);
+io.print(f);
+io.print(g);
+end foo
+
+query T rowsort
+foo()
+----
+1
+1
+1
+
+
diff --git a/monetdb5/mal/Tests/tst027.maltest
b/monetdb5/mal/Tests/tst027.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst027.maltest
@@ -0,0 +1,15 @@
+statement ok
+function test(s:str, b:bat[:any_1]...);
+ io.print(s);
+end test
+
+statement ok
+b:= bat.new(:int)
+
+statement ok
+c:= bat.new(:int)
+
+statement error
+user.test("hello",b,c)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
