Changeset: 6267136484c8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6267136484c8
Modified Files:
clients/Tests/SQL-dump.stable.out
monetdb5/mal/Tests/recycle00.stable.out
monetdb5/mal/Tests/tst004.stable.out
monetdb5/mal/Tests/tst005.stable.out
monetdb5/mal/Tests/tst006.stable.out
monetdb5/mal/Tests/tst077.stable.out
monetdb5/mal/Tests/tst1002.stable.out
monetdb5/mal/Tests/tst275.stable.out
monetdb5/mal/Tests/tst302.stable.out
monetdb5/mal/Tests/tst303.stable.out
monetdb5/mal/Tests/tst304.stable.out
monetdb5/mal/Tests/tst305.stable.out
monetdb5/mal/Tests/tst400.stable.out
monetdb5/mal/Tests/tst401.stable.out
monetdb5/mal/Tests/tst661.stable.out
monetdb5/mal/Tests/tst662.stable.out
monetdb5/mal/Tests/tst802.stable.out
monetdb5/mal/Tests/tst810.stable.out
monetdb5/mal/Tests/tst819.stable.out
monetdb5/mal/Tests/tst830.stable.out
monetdb5/mal/Tests/tst840.stable.out
monetdb5/mal/Tests/tst850.stable.out
monetdb5/mal/Tests/tst866.stable.out
monetdb5/mal/Tests/tst870.stable.out
monetdb5/mal/Tests/tst880.stable.out
monetdb5/mal/Tests/tst890.stable.out
monetdb5/mal/Tests/tst901.stable.out
monetdb5/mal/Tests/tst901a.stable.out
monetdb5/mal/Tests/tst902.stable.out
monetdb5/mal/Tests/tst904.stable.out
monetdb5/mal/Tests/tst906.stable.out
monetdb5/mal/Tests/tst907.stable.out
monetdb5/mal/Tests/tst908.stable.out
monetdb5/mal/Tests/tst911.stable.out
monetdb5/mal/Tests/tst913.stable.out
monetdb5/mal/Tests/tst920.stable.out
monetdb5/mal/Tests/tst960.stable.out
monetdb5/modules/mal/Tests/partition.stable.out
monetdb5/optimizer/Tests/CXexample.stable.out
monetdb5/optimizer/Tests/DCexample.stable.out
monetdb5/optimizer/Tests/DCexample2.stable.out
monetdb5/optimizer/Tests/GCexample01.stable.out
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/Mexample.stable.out
monetdb5/optimizer/Tests/cst00.stable.out
monetdb5/optimizer/Tests/cst01.stable.out
monetdb5/optimizer/Tests/cst02.stable.out
monetdb5/optimizer/Tests/dataflow.stable.out
monetdb5/optimizer/Tests/inline00.stable.out
monetdb5/optimizer/Tests/inline01.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline05.stable.out
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline08.stable.out
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inline12.stable.out
monetdb5/optimizer/Tests/inlineCst.stable.out
monetdb5/optimizer/Tests/inlineIfthen.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out
monetdb5/optimizer/Tests/remap.stable.out
monetdb5/optimizer/Tests/tst4000.stable.out
monetdb5/optimizer/Tests/tst4003.stable.out
monetdb5/optimizer/Tests/tst4005.stable.out
monetdb5/optimizer/Tests/tst4010.stable.out
monetdb5/optimizer/Tests/tst4601.stable.out
monetdb5/optimizer/Tests/tst4630.stable.out
monetdb5/scheduler/Tests/sched00.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
Branch: geo
Log Message:
Merge with default branch.
diffs (truncated from 2885 to 300 lines):
diff --git a/monetdb5/mal/Tests/recycle00.stable.out
b/monetdb5/mal/Tests/recycle00.stable.out
--- a/monetdb5/mal/Tests/recycle00.stable.out
+++ b/monetdb5/mal/Tests/recycle00.stable.out
@@ -35,11 +35,11 @@ function user.qry():void;
j := calc.*(i,i);
io.print(j);
end user.qry;
-function user.qry():void; #[0] 0
- i:int := 23:int; #[1] 1 <- 2
- j:int := calc.*(i:int,i:int); #[2] CMDvarMULsignal 3 <- 1 1
- io.print(j:int); #[3] IOprint_val 4 <- 3
-end user.qry; #[4]
+function user.qry():void; #[0] (0) 0
+ i:int := 23:int; #[1] (0) 1 <- 2
+ j:int := calc.*(i:int,i:int); #[2] (0) CMDvarMULsignal 3 <- 1
1
+ io.print(j:int); #[3] (0) IOprint_val 4 <- 3
+end user.qry; #[4] (0)
[ "start" ]
[ 529 ]
[ "next" ]
diff --git a/monetdb5/mal/Tests/tst004.stable.out
b/monetdb5/mal/Tests/tst004.stable.out
--- a/monetdb5/mal/Tests/tst004.stable.out
+++ b/monetdb5/mal/Tests/tst004.stable.out
@@ -27,16 +27,16 @@ Ready.
# 22:18:45 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25410" "--port=39815"
# 22:18:45 >
-function user.foo():void; #[0] 0
-barrier l:int := 1:int; #[1] 1 <- 2
- io.print(l:int); #[2] IOprint_val 3 <- 1
-exit l:int := 2:int; #[3] 1 <- 4
- io.print(l:int); #[4] IOprint_val 5 <- 1
-barrier m:int := 3:int; #[5] 6 <- 7
- leave m:int; #[6] 6
-exit m:int := 4:int; #[7] 6 <- 8
- io.print(m:int); #[8] IOprint_val 9 <- 6
-end user.foo; #[9]
+function user.foo():void; #[0] (0) 0
+barrier l:int := 1:int; #[1] (0) 1 <- 2
+ io.print(l:int); #[2] (0) IOprint_val 3 <- 1
+exit l:int := 2:int; #[3] (0) 1 <- 4
+ io.print(l:int); #[4] (0) IOprint_val 5 <- 1
+barrier m:int := 3:int; #[5] (0) 6 <- 7
+ leave m:int; #[6] (0) 6
+exit m:int := 4:int; #[7] (0) 6 <- 8
+ io.print(m:int); #[8] (0) IOprint_val 9 <- 6
+end user.foo; #[9] (0)
[ 1 ]
[ 2 ]
[ 4 ]
diff --git a/monetdb5/mal/Tests/tst005.stable.out
b/monetdb5/mal/Tests/tst005.stable.out
--- a/monetdb5/mal/Tests/tst005.stable.out
+++ b/monetdb5/mal/Tests/tst005.stable.out
@@ -25,31 +25,31 @@ stdout of test 'tst005` in directory 'mo
Ready.
-# 08:15:16 >
-# 08:15:16 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-26338" "--port=32746"
-# 08:15:16 >
+# 10:52:47 >
+# 10:52:47 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-5303" "--port=30531"
+# 10:52:47 >
-function user.foo():void; #[0] 0
- i:int := 1:int; #[1] 1 <- 2
- j:int := 2:int; #[2] 3 <- 4
-barrier v:int := i:int; #[3] 5 <- 1
- io.print("entered":str); #[4] IOprint_val 6 <- 7
- io.print(v:int); #[5] IOprint_val 8 <- 5
- redo v:int := iterator.next(-1:int,0:int); #[6] ITRnext_int 5 <- 9 10
-exit v:int; #[7] 5
- io.print("doubles":str); #[8] IOprint_val 11 <- 12
- i:int := 1:int; #[9] 1 <- 2
-barrier (v:int,w:int) := (i:int,j:int); #[10] 5 13 <- 1 3
- io.print("entered2":str); #[11] IOprint_val 14 <- 15
- io.print(v:int); #[12] IOprint_val 16 <- 5
- v:int := calc.-(v:int,1:int); #[13] CMDvarSUBsignal 5 <- 5 2
-barrier b:bit := calc.==(v:int,0:int); #[14] CMDvarEQ 17 <- 5 10
- leave (v:int,w:int); #[15] 5 13
-exit b:bit; #[16] 17
- redo (v:int,w:int) := (v:int,w:int); #[17] 5 13 <- 5 13
-exit (v:int,w:int); #[18] 5 13
- io.print("finished":str); #[19] IOprint_val 18 <- 19
-end user.foo; #[20]
+function user.foo():void; #[0] (0) 0
+ i:int := 1:int; #[1] (0) 1 <- 2
+ j:int := 2:int; #[2] (0) 3 <- 4
+barrier v:int := i:int; #[3] (0) 5 <- 1
+ io.print("entered":str); #[4] (0) IOprint_val 6 <- 7
+ io.print(v:int); #[5] (0) IOprint_val 8 <- 5
+ redo v:int := iterator.next(-1:int,0:int); #[6] (0) ITRnext_int 5 <- 9 10
+exit v:int; #[7] (0) 5
+ io.print("doubles":str); #[8] (0) IOprint_val 11 <- 12
+ i:int := 1:int; #[9] (0) 1 <- 2
+barrier (v:int,w:int) := (i:int,j:int); #[10] (0) 5 13 <- 1 3
+ io.print("entered2":str); #[11] (0) IOprint_val 14 <- 15
+ io.print(v:int); #[12] (0) IOprint_val 16 <- 5
+ v:int := calc.-(v:int,1:int); #[13] (0) CMDvarSUBsignal 5 <-
5 2
+barrier b:bit := calc.==(v:int,0:int); #[14] (0) CMDvarEQ 17 <- 5 10
+ leave (v:int,w:int); #[15] (0) 5 13
+exit b:bit; #[16] (0) 17
+ redo (v:int,w:int) := (v:int,w:int); #[17] (0) 5 13 <- 5 13
+exit (v:int,w:int); #[18] (0) 5 13
+ io.print("finished":str); #[19] (0) IOprint_val 18 <- 19
+end user.foo; #[20] (0)
[ "entered" ]
[ 1 ]
[ "doubles" ]
diff --git a/monetdb5/mal/Tests/tst006.stable.out
b/monetdb5/mal/Tests/tst006.stable.out
--- a/monetdb5/mal/Tests/tst006.stable.out
+++ b/monetdb5/mal/Tests/tst006.stable.out
@@ -27,16 +27,16 @@ Ready.
# 10:37:23 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6574" "--port=37178"
# 10:37:23 >
-function user.foo():void; #[0] 0
- r:int := 0:int; #[1] 1 <- 2
-barrier l:bit := calc.<(r:int,1:int); #[2] CMDvarLT 3 <- 1 4
- io.print(l:bit); #[3] IOprint_val 5 <- 3
- io.print(r:int); #[4] IOprint_val 6 <- 1
- r:int := calc.+(r:int,1:int); #[5] CMDvarADDsignal 1 <- 1 4
- l:bit := false:bit; #[6] 3 <- 7
- redo l:bit; #[7] 3
-exit l:bit; #[8] 3
-end user.foo; #[9]
+function user.foo():void; #[0] (0) 0
+ r:int := 0:int; #[1] (0) 1 <- 2
+barrier l:bit := calc.<(r:int,1:int); #[2] (0) CMDvarLT 3 <- 1 4
+ io.print(l:bit); #[3] (0) IOprint_val 5 <- 3
+ io.print(r:int); #[4] (0) IOprint_val 6 <- 1
+ r:int := calc.+(r:int,1:int); #[5] (0) CMDvarADDsignal 1 <- 1
4
+ l:bit := false:bit; #[6] (0) 3 <- 7
+ redo l:bit; #[7] (0) 3
+exit l:bit; #[8] (0) 3
+end user.foo; #[9] (0)
[ true ]
[ 0 ]
diff --git a/monetdb5/mal/Tests/tst077.stable.out
b/monetdb5/mal/Tests/tst077.stable.out
--- a/monetdb5/mal/Tests/tst077.stable.out
+++ b/monetdb5/mal/Tests/tst077.stable.out
@@ -25,15 +25,15 @@ Ready.
# 13:14:25 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24111" "--port=37355"
# 13:14:25 >
-function user.foo():void; #[0] 0
- X:bat[:int] := bat.new(:int); #[1] CMDBATnewColumn 1 <- 2
- bat.append(X:bat[:int],1:int); #[2] BKCappend_val_wrap 3 <- 1
4
- Y:bat[:int] := bat.new(:int); #[3] CMDBATnewColumn 5 <- 2
- bat.append(Y:bat[:int],2:int); #[4] BKCappend_val_wrap 6 <- 5
7
- (x:str,y:bat[:int]) := user.swap(X:bat[:int],Y:bat[:int]); #[5] 8 9 <- 1
5
- io.print(x:str); #[6] IOprint_val 10 <- 8
- io.print(y:bat[:int]); #[7] IOprint_val 11 <- 9
-end user.foo; #[8]
+function user.foo():void; #[0] (0) 0
+ X:bat[:int] := bat.new(:int); #[1] (0) CMDBATnewColumn 1 <- 2
+ bat.append(X:bat[:int],1:int); #[2] (0) BKCappend_val_wrap 3
<- 1 4
+ Y:bat[:int] := bat.new(:int); #[3] (0) CMDBATnewColumn 5 <- 2
+ bat.append(Y:bat[:int],2:int); #[4] (0) BKCappend_val_wrap 6
<- 5 7
+ (x:str,y:bat[:int]) := user.swap(X:bat[:int],Y:bat[:int]); #[5] (0) 8 9
<- 1 5
+ io.print(x:str); #[6] (0) IOprint_val 10 <- 8
+ io.print(y:bat[:int]); #[7] (0) IOprint_val 11 <- 9
+end user.foo; #[8] (0)
[ "done" ]
#-----------------#
# h t # name
diff --git a/monetdb5/mal/Tests/tst1002.stable.out
b/monetdb5/mal/Tests/tst1002.stable.out
--- a/monetdb5/mal/Tests/tst1002.stable.out
+++ b/monetdb5/mal/Tests/tst1002.stable.out
@@ -12,13 +12,13 @@ Ready.
# 15:35:45 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-16148" "--port=33827"
# 15:35:45 >
-function user.foo():void; #[0] 0
- c:bat[:int] := bbp.bind("myfirstbat":str); #[1] CMDbbpbind 1 <- 2
- io.print(c:bat[:int]); #[2] IOprint_val 3 <- 1
-catch MALException:str; #[3] 4
- io.printf("%s\n":str,MALException:str); #[4] IOprintf 5 <- 6 4
-exit MALException:str; #[5] 4
-end user.foo; #[6]
+function user.foo():void; #[0] (0) 0
+ c:bat[:int] := bbp.bind("myfirstbat":str); #[1] (0) CMDbbpbind 1 <- 2
+ io.print(c:bat[:int]); #[2] (0) IOprint_val 3 <- 1
+catch MALException:str; #[3] (0) 4
+ io.printf("%s\n":str,MALException:str); #[4] (0) IOprintf 5 <- 6 4
+exit MALException:str; #[5] (0) 4
+end user.foo; #[6] (0)
MALException:bbp.bind:Object not found
# 15:35:45 >
diff --git a/monetdb5/mal/Tests/tst275.stable.out
b/monetdb5/mal/Tests/tst275.stable.out
--- a/monetdb5/mal/Tests/tst275.stable.out
+++ b/monetdb5/mal/Tests/tst275.stable.out
@@ -34,8 +34,8 @@ Ready.
# t t t # name
# void str str # type
#--------------------------#
-[ 0@0, "batId", "tmp_47" ]
-[ 1@0, "batCacheid", "39" ]
+[ 0@0, "batId", "tmp_22" ]
+[ 1@0, "batCacheid", "18" ]
[ 2@0, "hparentid", "0" ]
[ 3@0, "tparentid", "0" ]
[ 4@0, "batSharecnt", "0" ]
@@ -98,7 +98,7 @@ Ready.
[ 61@0, "tail.size", "1024" ]
[ 62@0, "tail.storage", "malloced" ]
[ 63@0, "tail.newstorage", "malloced" ]
-[ 64@0, "tail.filename", "47.tail" ]
+[ 64@0, "tail.filename", "22.tail" ]
[ 65@0, "H->vheap->dirty", "clean" ]
[ 66@0, "T->vheap->dirty", "clean" ]
#~EndVariableOutput~#
diff --git a/monetdb5/mal/Tests/tst302.stable.out
b/monetdb5/mal/Tests/tst302.stable.out
--- a/monetdb5/mal/Tests/tst302.stable.out
+++ b/monetdb5/mal/Tests/tst302.stable.out
@@ -29,10 +29,10 @@ Ready.
# 09:00:01 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21311" "--port=30157"
# 09:00:01 >
-function user.foo():void; #[0] 0
- raise PermissionDeniedException:int := 1234:int; #[1] 1 <- 2
- io.print("should not come here\n":str); #[2] IOprint_val 3 <- 4
-end user.foo; #[3]
+function user.foo():void; #[0] (0) 0
+ raise PermissionDeniedException:int := 1234:int; #[1] (0) 1 <- 2
+ io.print("should not come here\n":str); #[2] (0) IOprint_val 3 <- 4
+end user.foo; #[3] (0)
# 09:00:01 >
# 09:00:01 > "Done."
diff --git a/monetdb5/mal/Tests/tst303.stable.out
b/monetdb5/mal/Tests/tst303.stable.out
--- a/monetdb5/mal/Tests/tst303.stable.out
+++ b/monetdb5/mal/Tests/tst303.stable.out
@@ -29,16 +29,16 @@ Ready.
# 09:00:01 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21311" "--port=30157"
# 09:00:01 >
-function user.foo():void; #[0] 0
- raise IllegalAccess:str := "an exception":str; #[1] 1 <- 2
- io.print("should not come here\n":str); #[2] IOprint_val 3 <- 4
-catch IllegalAccess:str; #[3] 1
- io.printf("caught %s\n":str,IllegalAccess:str); #[4] IOprintf 5 <- 6 1
- raise IllegalAccess:str := "a second exception raised":str; #[5] 1
<- 7
- io.print("should not come here either\n":str); #[6] IOprint_val 8 <- 9
-exit IllegalAccess:str; #[7] 1
- io.print("should not be done":str); #[8] IOprint_val 10 <- 11
-end user.foo; #[9]
+function user.foo():void; #[0] (0) 0
+ raise IllegalAccess:str := "an exception":str; #[1] (0) 1 <- 2
+ io.print("should not come here\n":str); #[2] (0) IOprint_val 3 <- 4
+catch IllegalAccess:str; #[3] (0) 1
+ io.printf("caught %s\n":str,IllegalAccess:str); #[4] (0) IOprintf 5 <-
6 1
+ raise IllegalAccess:str := "a second exception raised":str; #[5]
(0) 1 <- 7
+ io.print("should not come here either\n":str); #[6] (0) IOprint_val 8
<- 9
+exit IllegalAccess:str; #[7] (0) 1
+ io.print("should not be done":str); #[8] (0) IOprint_val 10 <- 11
+end user.foo; #[9] (0)
caught an exception
# 17:45:29 >
diff --git a/monetdb5/mal/Tests/tst304.stable.out
b/monetdb5/mal/Tests/tst304.stable.out
--- a/monetdb5/mal/Tests/tst304.stable.out
+++ b/monetdb5/mal/Tests/tst304.stable.out
@@ -25,19 +25,19 @@ stdout of test 'tst304` in directory 'mo
Ready.
-# 11:35:16 >
-# 11:35:16 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-13954" "--port=38078"
-# 11:35:16 >
+# 10:53:36 >
+# 10:53:36 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-5303" "--port=30531"
+# 10:53:36 >
-function user.foo():void; #[0] 0
- user.myException(); #[1] 1
- io.print("should not come here":str); #[2] IOprint_val 2 <- 3
+function user.foo():void; #[0] (0) 0
+ user.myException(); #[1] (0) 1
+ io.print("should not come here":str); #[2] (0) IOprint_val 2 <- 3
#exception block;
-catch MALException:str; #[4] 5
- io.printf("caught IllegalAccess\n":str); #[5] IOprintf 6 <- 7
-exit MALException:str; #[6] 5
- io.print("done":str); #[7] IOprint_val 8 <- 9
-end user.foo; #[8]
+catch MALException:str; #[4] (0) 5
+ io.printf("caught IllegalAccess\n":str); #[5] (0) IOprintf 6 <- 7
+exit MALException:str; #[6] (0) 5
+ io.print("done":str); #[7] (0) IOprint_val 8 <- 9
+end user.foo; #[8] (0)
caught IllegalAccess
[ "done" ]
diff --git a/monetdb5/mal/Tests/tst305.stable.out
b/monetdb5/mal/Tests/tst305.stable.out
--- a/monetdb5/mal/Tests/tst305.stable.out
+++ b/monetdb5/mal/Tests/tst305.stable.out
@@ -29,10 +29,10 @@ Ready.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
