Changeset: 992cf3c3a818 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=992cf3c3a818
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/modules/mal/Tests/inspect00.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inlineCst.stable.out
monetdb5/optimizer/Tests/inlineFunction2.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:
Approve output
diffs (truncated from 1629 to 300 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -64,10 +64,10 @@ Ready.
% 118 # length
function user.s4_1():void;
X_24:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",12);
-barrier X_34 := language.dataflow();
+barrier X_53 := language.dataflow();
X_1 := sql.mvc();
(X_11:bat[:int],X_12:bat[:int],X_13:bat[:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
-exit X_34;
+exit X_53;
X_14 := sql.append(X_1,"sys","ttt","a",X_11);
X_18 := sql.append(X_14,"sys","ttt","b",X_12);
X_20 := sql.append(X_18,"sys","ttt","c",X_13);
@@ -98,10 +98,10 @@ end user.s4_1;
% 118 # length
function user.s12_1():void;
X_24:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",12);
-barrier X_35 := language.dataflow();
+barrier X_54 := language.dataflow();
X_1 := sql.mvc();
(X_11:bat[:int],X_12:bat[:int],X_13:bat[:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
-exit X_35;
+exit X_54;
X_14 := sql.append(X_1,"sys","ttt","a",X_11);
X_18 := sql.append(X_14,"sys","ttt","b",X_12);
X_22 := aggr.count(X_13);
diff --git a/monetdb5/modules/mal/Tests/inspect00.stable.out
b/monetdb5/modules/mal/Tests/inspect00.stable.out
--- a/monetdb5/modules/mal/Tests/inspect00.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect00.stable.out
@@ -64,6 +64,7 @@ stack depth 2
[ 0@0, "tst", "0@0" ]
[ 1@0, "i", "nil" ]
[ 2@0, "X_2", "0@0" ]
+[ 3@0, "X_3", "nil" ]
# 09:13:25 >
# 09:13:25 > Done.
diff --git a/monetdb5/optimizer/Tests/inline02.stable.out
b/monetdb5/optimizer/Tests/inline02.stable.out
--- a/monetdb5/optimizer/Tests/inline02.stable.out
+++ b/monetdb5/optimizer/Tests/inline02.stable.out
@@ -35,10 +35,10 @@ function user.qry():void;
X_16:int := calc.+(1:int,2:int); #[3] (0) CMDvarADDsignal 16 <-
5 7
zz:int := X_16:int; #[4] (0) 6 <- 16
# base line test for inlining
- X_20:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[6] (0)
CMDbatADDsignal 20 <- 1 1
- z:bat[:int] := X_20:bat[:int]; #[7] (0) 9 <- 20
- X_24:bat[:int] := batcalc.+(b:bat[:int],2:int); #[8] (0)
CMDbatADDsignal 24 <- 1 7
- z:bat[:int] := X_24:bat[:int]; #[9] (0) 9 <- 24
+ X_21:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[6] (0)
CMDbatADDsignal 21 <- 1 1
+ z:bat[:int] := X_21:bat[:int]; #[7] (0) 9 <- 21
+ X_25:bat[:int] := batcalc.+(b:bat[:int],2:int); #[8] (0)
CMDbatADDsignal 25 <- 1 7
+ z:bat[:int] := X_25:bat[:int]; #[9] (0) 9 <- 25
end user.qry; #[10] (0)
# 18:00:43 >
diff --git a/monetdb5/optimizer/Tests/inline03.stable.out
b/monetdb5/optimizer/Tests/inline03.stable.out
--- a/monetdb5/optimizer/Tests/inline03.stable.out
+++ b/monetdb5/optimizer/Tests/inline03.stable.out
@@ -32,14 +32,14 @@ Ready.
function user.qry():void; #[0] (0) 0
b:bat[:int] := bat.new(:oid,:int); #[1] (0) CMDBATnew 1 <- 2 3
bat.append(b:bat[:int],1:int); #[2] (0) BKCappend_val_wrap 4
<- 1 5
- X_14:int := 1:int; #[3] (0) 14 <- 5
- X_15:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[4] (0)
CMDbatADDsignal 15 <- 1 1
- X_15:bat[:int] := batcalc.*(X_15:bat[:int],X_14:int); #[5] (0)
CMDbatMULsignal 15 <- 15 14
- z:bat[:int] := X_15:bat[:int]; #[6] (0) 6 <- 15
- X_19:int := 1:int; #[7] (0) 19 <- 5
- X_20:bat[:int] := batcalc.+(b:bat[:int],2:int); #[8] (0)
CMDbatADDsignal 20 <- 1 10
- X_20:bat[:int] := batcalc.*(X_20:bat[:int],X_19:int); #[9] (0)
CMDbatMULsignal 20 <- 20 19
- z:bat[:int] := X_20:bat[:int]; #[10] (0) 6 <- 20
+ X_15:int := 1:int; #[3] (0) 15 <- 5
+ X_16:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[4] (0)
CMDbatADDsignal 16 <- 1 1
+ X_16:bat[:int] := batcalc.*(X_16:bat[:int],X_15:int); #[5] (0)
CMDbatMULsignal 16 <- 16 15
+ z:bat[:int] := X_16:bat[:int]; #[6] (0) 6 <- 16
+ X_20:int := 1:int; #[7] (0) 20 <- 5
+ X_21:bat[:int] := batcalc.+(b:bat[:int],2:int); #[8] (0)
CMDbatADDsignal 21 <- 1 10
+ X_21:bat[:int] := batcalc.*(X_21:bat[:int],X_20:int); #[9] (0)
CMDbatMULsignal 21 <- 21 20
+ z:bat[:int] := X_21:bat[:int]; #[10] (0) 6 <- 21
end user.qry; #[11] (0)
# 18:00:43 >
diff --git a/monetdb5/optimizer/Tests/inline04.stable.out
b/monetdb5/optimizer/Tests/inline04.stable.out
--- a/monetdb5/optimizer/Tests/inline04.stable.out
+++ b/monetdb5/optimizer/Tests/inline04.stable.out
@@ -32,22 +32,22 @@ Ready.
function user.qry():void; #[0] (0) 0
b:bat[:int] := bat.new(:oid,:int); #[1] (0) CMDBATnew 1 <- 2 3
bat.append(b:bat[:int],1:int); #[2] (0) BKCappend_val_wrap 4
<- 1 5
- X_14:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[3] (0)
CMDbatADDsignal 14 <- 1 1
- X_15:int := 1:int; #[4] (0) 15 <- 5
-barrier X_16:bit := true:bit; #[5] (0) 16 <- 17
- X_14:bat[:int] := batcalc.*(X_14:bat[:int],X_14:bat[:int]); #[6]
(0) CMDbatMULsignal 14 <- 14 14
- X_15:int := calc.+(X_15:int,1:int); #[7] (0) CMDvarADDsignal 15 <-
15 5
- redo X_16:bit := calc.<(X_15:int,3:int); #[8] (0) CMDvarLT 16 <- 15 18
-exit X_16:bit; #[9] (0) 16
- z:bat[:int] := X_14:bat[:int]; #[10] (0) 6 <- 14
- X_22:bat[:int] := batcalc.+(b:bat[:int],2:int); #[11] (0)
CMDbatADDsignal 22 <- 1 10
- X_23:int := 1:int; #[12] (0) 23 <- 5
-barrier X_24:bit := true:bit; #[13] (0) 24 <- 17
- X_22:bat[:int] := batcalc.*(X_22:bat[:int],X_22:bat[:int]); #[14]
(0) CMDbatMULsignal 22 <- 22 22
- X_23:int := calc.+(X_23:int,1:int); #[15] (0) CMDvarADDsignal 23 <-
23 5
- redo X_24:bit := calc.<(X_23:int,3:int); #[16] (0) CMDvarLT 24 <- 23 18
-exit X_24:bit; #[17] (0) 24
- z:bat[:int] := X_22:bat[:int]; #[18] (0) 6 <- 22
+ X_15:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[3] (0)
CMDbatADDsignal 15 <- 1 1
+ X_16:int := 1:int; #[4] (0) 16 <- 5
+barrier X_17:bit := true:bit; #[5] (0) 17 <- 18
+ X_15:bat[:int] := batcalc.*(X_15:bat[:int],X_15:bat[:int]); #[6]
(0) CMDbatMULsignal 15 <- 15 15
+ X_16:int := calc.+(X_16:int,1:int); #[7] (0) CMDvarADDsignal 16 <-
16 5
+ redo X_17:bit := calc.<(X_16:int,3:int); #[8] (0) CMDvarLT 17 <- 16 19
+exit X_17:bit; #[9] (0) 17
+ z:bat[:int] := X_15:bat[:int]; #[10] (0) 6 <- 15
+ X_23:bat[:int] := batcalc.+(b:bat[:int],2:int); #[11] (0)
CMDbatADDsignal 23 <- 1 10
+ X_24:int := 1:int; #[12] (0) 24 <- 5
+barrier X_25:bit := true:bit; #[13] (0) 25 <- 18
+ X_23:bat[:int] := batcalc.*(X_23:bat[:int],X_23:bat[:int]); #[14]
(0) CMDbatMULsignal 23 <- 23 23
+ X_24:int := calc.+(X_24:int,1:int); #[15] (0) CMDvarADDsignal 24 <-
24 5
+ redo X_25:bit := calc.<(X_24:int,3:int); #[16] (0) CMDvarLT 25 <- 24 19
+exit X_25:bit; #[17] (0) 25
+ z:bat[:int] := X_23:bat[:int]; #[18] (0) 6 <- 23
end user.qry; #[19] (0)
# 18:00:43 >
diff --git a/monetdb5/optimizer/Tests/inline06.stable.out
b/monetdb5/optimizer/Tests/inline06.stable.out
--- a/monetdb5/optimizer/Tests/inline06.stable.out
+++ b/monetdb5/optimizer/Tests/inline06.stable.out
@@ -32,16 +32,16 @@ Ready.
function user.qry():void; #[0] (0) 0
b:bat[:int] := bat.new(:oid,:int); #[1] (0) CMDBATnew 1 <- 2 3
bat.append(b:bat[:int],1:int); #[2] (0) BKCappend_val_wrap 4
<- 1 5
- X_14:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[3] (0)
CMDbatADDsignal 14 <- 1 1
- X_15:int := mmath.rand(); #[4] (0) MATHrandint 15
+ X_15:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[3] (0)
CMDbatADDsignal 15 <- 1 1
+ X_16:int := mmath.rand(); #[4] (0) MATHrandint 16
#
- X_14:bat[:int] := batcalc.*(X_14:bat[:int],X_15:int); #[6] (0)
CMDbatMULsignal 14 <- 14 15
- z:bat[:int] := X_14:bat[:int]; #[7] (0) 6 <- 14
- X_20:bat[:int] := batcalc.+(b:bat[:int],2:int); #[8] (0)
CMDbatADDsignal 20 <- 1 10
- X_21:int := mmath.rand(); #[9] (0) MATHrandint 21
+ X_15:bat[:int] := batcalc.*(X_15:bat[:int],X_16:int); #[6] (0)
CMDbatMULsignal 15 <- 15 16
+ z:bat[:int] := X_15:bat[:int]; #[7] (0) 6 <- 15
+ X_21:bat[:int] := batcalc.+(b:bat[:int],2:int); #[8] (0)
CMDbatADDsignal 21 <- 1 10
+ X_22:int := mmath.rand(); #[9] (0) MATHrandint 22
#
- X_20:bat[:int] := batcalc.*(X_20:bat[:int],X_21:int); #[11] (0)
CMDbatMULsignal 20 <- 20 21
- z:bat[:int] := X_20:bat[:int]; #[12] (0) 6 <- 20
+ X_21:bat[:int] := batcalc.*(X_21:bat[:int],X_22:int); #[11] (0)
CMDbatMULsignal 21 <- 21 22
+ z:bat[:int] := X_21:bat[:int]; #[12] (0) 6 <- 21
end user.qry; #[13] (0)
# 18:00:44 >
diff --git a/monetdb5/optimizer/Tests/inline07.stable.out
b/monetdb5/optimizer/Tests/inline07.stable.out
--- a/monetdb5/optimizer/Tests/inline07.stable.out
+++ b/monetdb5/optimizer/Tests/inline07.stable.out
@@ -32,9 +32,9 @@ Ready.
function user.qry():void; #[0] (0) 0
b:bat[:int] := bat.new(:oid,:int); #[1] (0) CMDBATnew 1 <- 2 3
bat.append(b:bat[:int],1:int); #[2] (0) BKCappend_val_wrap 4
<- 1 5
- X_12:dbl := aggr.sum(b:bat[:int]); #[3] (0) CMDBATsum 12 <- 1
- X_13:bat[:dbl] := batcalc.+(b:bat[:int],X_12:dbl); #[4] (0)
CMDbatADDsignal 13 <- 1 12
- z:bat[:dbl] := X_13:bat[:dbl]; #[5] (0) 6 <- 13
+ X_13:dbl := aggr.sum(b:bat[:int]); #[3] (0) CMDBATsum 13 <- 1
+ X_14:bat[:dbl] := batcalc.+(b:bat[:int],X_13:dbl); #[4] (0)
CMDbatADDsignal 14 <- 1 13
+ z:bat[:dbl] := X_14:bat[:dbl]; #[5] (0) 6 <- 14
end user.qry; #[6] (0)
# 18:00:44 >
diff --git a/monetdb5/optimizer/Tests/inline09.stable.out
b/monetdb5/optimizer/Tests/inline09.stable.out
--- a/monetdb5/optimizer/Tests/inline09.stable.out
+++ b/monetdb5/optimizer/Tests/inline09.stable.out
@@ -32,12 +32,12 @@ Ready.
function user.qry():void; #[0] (0) 0
b:bat[:str] := bat.new(:oid,:str); #[1] (0) CMDBATnew 1 <- 2 3
bat.append(b:bat[:str],"HELLO WORLD":str); #[2] (0) BKCappend_val_wrap 4
<- 1 5
- X_12:bat[:str] := b:bat[:str]; #[3] (0) 12 <- 1
- X_12:bat[:str] := batstr.substring(X_12:bat[:str],1:int,5:int); #[4]
(0) STRbatsubstringcst 12 <- 12 13 14
- X_15:bat[:str] := b:bat[:str]; #[5] (0) 15 <- 1
- X_15:bat[:str] := batstr.substring(X_15:bat[:str],1:int,3:int); #[6]
(0) STRbatsubstringcst 15 <- 15 13 16
- X_17:bat[:str] := batcalc.+(X_12:bat[:str],X_15:bat[:str]); #[7]
(0) CMDbatADD 17 <- 12 15
- z:bat[:str] := X_17:bat[:str]; #[8] (0) 6 <- 17
+ X_13:bat[:str] := b:bat[:str]; #[3] (0) 13 <- 1
+ X_13:bat[:str] := batstr.substring(X_13:bat[:str],1:int,5:int); #[4]
(0) STRbatsubstringcst 13 <- 13 14 15
+ X_16:bat[:str] := b:bat[:str]; #[5] (0) 16 <- 1
+ X_16:bat[:str] := batstr.substring(X_16:bat[:str],1:int,3:int); #[6]
(0) STRbatsubstringcst 16 <- 16 14 17
+ X_18:bat[:str] := batcalc.+(X_13:bat[:str],X_16:bat[:str]); #[7]
(0) CMDbatADD 18 <- 13 16
+ z:bat[:str] := X_18:bat[:str]; #[8] (0) 6 <- 18
end user.qry; #[9] (0)
# 11:53:00 >
diff --git a/monetdb5/optimizer/Tests/inline10.stable.out
b/monetdb5/optimizer/Tests/inline10.stable.out
--- a/monetdb5/optimizer/Tests/inline10.stable.out
+++ b/monetdb5/optimizer/Tests/inline10.stable.out
@@ -36,9 +36,9 @@ function user.qry():void;
X_15:int := X_19:int; #[4] (0) 15 <- 19
zz:int := X_15:int; #[5] (0) 6 <- 15
# base line test for inlining
- X_27:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[7] (0)
CMDbatADDsignal 27 <- 1 1
- X_23:bat[:int] := X_27:bat[:int]; #[8] (0) 23 <- 27
- z:bat[:int] := X_23:bat[:int]; #[9] (0) 9 <- 23
+ X_28:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[7] (0)
CMDbatADDsignal 28 <- 1 1
+ X_24:bat[:int] := X_28:bat[:int]; #[8] (0) 24 <- 28
+ z:bat[:int] := X_24:bat[:int]; #[9] (0) 9 <- 24
end user.qry; #[10] (0)
# 11:53:01 >
diff --git a/monetdb5/optimizer/Tests/inlineCst.stable.out
b/monetdb5/optimizer/Tests/inlineCst.stable.out
--- a/monetdb5/optimizer/Tests/inlineCst.stable.out
+++ b/monetdb5/optimizer/Tests/inlineCst.stable.out
@@ -41,8 +41,8 @@ function user.qry():void;
bat.append(b:bat[:int],1:int); #[2] (0) BKCappend_val_wrap 4
<- 1 5
bat.append(b:bat[:int],10:int); #[3] (0) BKCappend_val_wrap 6
<- 1 7
bat.append(b:bat[:int],20:int); #[4] (0) BKCappend_val_wrap 8
<- 1 9
- X_16:int := 213:int; #[5] (0) 16 <- 17
- r:bat[:int] := algebra.project(b:bat[:int],X_16:int); #[6] (0)
ALGprojecttail 10 <- 1 16
+ X_17:int := 213:int; #[5] (0) 17 <- 18
+ r:bat[:int] := algebra.project(b:bat[:int],X_17:int); #[6] (0)
ALGprojecttail 10 <- 1 17
io.print(r:bat[:int]); #[7] (0) IOprint_val 13 <- 10
end user.qry; #[8] (0)
diff --git a/monetdb5/optimizer/Tests/inlineFunction2.stable.out
b/monetdb5/optimizer/Tests/inlineFunction2.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction2.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction2.stable.out
@@ -30,8 +30,8 @@ function user.tst():void;
b := bat.new(:oid,:int);
X_8 := bat.new(nil:oid,nil:int);
barrier (X_12,X_13) := iterator.new(b);
- X_23 := calc.+(X_13,1);
- X_15 := X_23;
+ X_24 := calc.+(X_13,1);
+ X_15 := X_24;
bat.append(X_8,X_15);
redo (X_12,X_13) := iterator.next(b);
exit (X_12,X_13);
diff --git a/monetdb5/optimizer/Tests/manifold2.stable.out
b/monetdb5/optimizer/Tests/manifold2.stable.out
--- a/monetdb5/optimizer/Tests/manifold2.stable.out
+++ b/monetdb5/optimizer/Tests/manifold2.stable.out
@@ -31,14 +31,14 @@ barrier X_9:bit := language.dataflow();
c:wrd := aggr.count(b:bat[:dbl]); #[2] (0) ALGcount_bat 3 <- 1
c2:wrd := aggr.count(b2:bat[:dbl]); #[3] (0) ALGcount_bat 4 <- 2
exit X_9:bit; #[4] (0) 9
- X_12:bat[:dbl] := bat.new(nil:oid,nil:dbl); #[5] (0) CMDBATnew 12
<- 13 14
-barrier (X_16:oid,X_17:dbl) := iterator.new(b:bat[:dbl]); #[6] (0)
ITRbunIterator 16 17 <- 1
- X_19:dbl := algebra.fetch(b2:bat[:dbl],X_16:oid); #[7] (0) ALGfetchoid 19
<- 2 16
- X_21:dbl := calc.max(X_17:dbl,X_19:dbl); #[8] (0) CALCmax 21 <- 17 19
- bat.append(X_12:bat[:dbl],X_21:dbl); #[9] (0) BKCappend_val_wrap 22
<- 12 21
- redo (X_16:oid,X_17:dbl) := iterator.next(b:bat[:dbl]); #[10] (0)
ITRbunNext 16 17 <- 1
-exit (X_16:oid,X_17:dbl); #[11] (0) 16 17
- z:bat[:dbl] := X_12:bat[:dbl]; #[12] (0) 5 <- 12
+ X_13:bat[:dbl] := bat.new(nil:oid,nil:dbl); #[5] (0) CMDBATnew 13
<- 14 15
+barrier (X_17:oid,X_18:dbl) := iterator.new(b:bat[:dbl]); #[6] (0)
ITRbunIterator 17 18 <- 1
+ X_20:dbl := algebra.fetch(b2:bat[:dbl],X_17:oid); #[7] (0) ALGfetchoid 20
<- 2 17
+ X_22:dbl := calc.max(X_18:dbl,X_20:dbl); #[8] (0) CALCmax 22 <- 18 20
+ bat.append(X_13:bat[:dbl],X_22:dbl); #[9] (0) BKCappend_val_wrap 23
<- 13 22
+ redo (X_17:oid,X_18:dbl) := iterator.next(b:bat[:dbl]); #[10] (0)
ITRbunNext 17 18 <- 1
+exit (X_17:oid,X_18:dbl); #[11] (0) 17 18
+ z:bat[:dbl] := X_13:bat[:dbl]; #[12] (0) 5 <- 13
io.print(z:bat[:dbl],b:bat[:dbl],b2:bat[:dbl]); #[13] (0) IOtable 8 <-
5 1 2
end user.tst; #[14] (0)
#[1] b = :bat[:dbl]
@@ -59,14 +59,14 @@ barrier X_9:bit := language.dataflow();
c:wrd := aggr.count(b:bat[:dbl]); #[2] (0) ALGcount_bat 3 <- 1
c2:wrd := aggr.count(b2:bat[:dbl]); #[3] (0) ALGcount_bat 4 <- 2
exit X_9:bit; #[4] (0) 9
- X_12:bat[:dbl] := bat.new(nil:oid,nil:dbl); #[5] (0) CMDBATnew 12
<- 13 14
-barrier (X_16:oid,X_17:dbl) := iterator.new(b:bat[:dbl]); #[6] (0)
ITRbunIterator 16 17 <- 1
- X_19:dbl := algebra.fetch(b2:bat[:dbl],X_16:oid); #[7] (0) ALGfetchoid 19
<- 2 16
- X_21:dbl := calc.max(X_17:dbl,X_19:dbl); #[8] (0) CALCmax 21 <- 17 19
- bat.append(X_12:bat[:dbl],X_21:dbl); #[9] (0) BKCappend_val_wrap 22
<- 12 21
- redo (X_16:oid,X_17:dbl) := iterator.next(b:bat[:dbl]); #[10] (0)
ITRbunNext 16 17 <- 1
-exit (X_16:oid,X_17:dbl); #[11] (0) 16 17
- z:bat[:dbl] := X_12:bat[:dbl]; #[12] (0) 5 <- 12
+ X_13:bat[:dbl] := bat.new(nil:oid,nil:dbl); #[5] (0) CMDBATnew 13
<- 14 15
+barrier (X_17:oid,X_18:dbl) := iterator.new(b:bat[:dbl]); #[6] (0)
ITRbunIterator 17 18 <- 1
+ X_20:dbl := algebra.fetch(b2:bat[:dbl],X_17:oid); #[7] (0) ALGfetchoid 20
<- 2 17
+ X_22:dbl := calc.max(X_18:dbl,X_20:dbl); #[8] (0) CALCmax 22 <- 18 20
+ bat.append(X_13:bat[:dbl],X_22:dbl); #[9] (0) BKCappend_val_wrap 23
<- 13 22
+ redo (X_17:oid,X_18:dbl) := iterator.next(b:bat[:dbl]); #[10] (0)
ITRbunNext 17 18 <- 1
+exit (X_17:oid,X_18:dbl); #[11] (0) 17 18
+ z:bat[:dbl] := X_13:bat[:dbl]; #[12] (0) 5 <- 13
io.print(z:bat[:dbl],b:bat[:dbl],b2:bat[:dbl]); #[13] (0) IOtable 8 <-
5 1 2
end user.tst; #[14] (0)
diff --git
a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
--- a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
+++ b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
@@ -25,71 +25,95 @@ Ready.
# 21:13:40 >
#~BeginVariableOutput~#
-function user.s4_1{autoCommit=true}():void;
+function user.s4_1():void;
" X_32:void := querylog.define(""explain alter table blabla add constraint
dada unique (id);"",""sequential_pipe"",22);"
- X_2 := sql.mvc();
+ X_1 := sql.mvc();
" sql.catalog(29,""sys"",nil,0);"
-" X_10:bat[:oid,:int] := sql.bind(X_2,""sys"",""blabla"",""id"",0);"
-" X_8:bat[:oid,:oid] := sql.tid(X_2,""sys"",""blabla"");"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
