Changeset: ac96a8f956c8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ac96a8f956c8
Modified Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out
Branch: Jul2015
Log Message:
Approvals.
diffs (97 lines):
diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out
b/sql/benchmarks/tpch/Tests/01-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out
@@ -111,7 +111,7 @@ function user.s2_1{autoCommit=true}(A0:b
X_7 := sql.mvc();
X_11:bat[:oid,:date] := sql.bind(X_7,"sys","lineitem","l_shipdate",0);
X_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineitem");
- X_19 := mtime.date_sub_msec_interval(A3,A4);
+ X_19:date := mtime.date_sub_msec_interval(A3,A4);
X_227 := algebra.thetasubselect(X_11,X_8,X_19,"<=");
(X_14,r1_14) := sql.bind(X_7,"sys","lineitem","l_shipdate",2);
X_228 := algebra.thetasubselect(r1_14,nil:bat[:oid,:oid],X_19,"<=");
diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
@@ -111,7 +111,7 @@ function user.s2_1{autoCommit=true}(A0:b
X_7 := sql.mvc();
X_11:bat[:oid,:date] := sql.bind(X_7,"sys","lineitem","l_shipdate",0);
X_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineitem");
- X_19 := mtime.date_sub_msec_interval(A3,A4);
+ X_19:date := mtime.date_sub_msec_interval(A3,A4);
X_227 := algebra.thetasubselect(X_11,X_8,X_19,"<=");
(X_14,r1_14) := sql.bind(X_7,"sys","lineitem","l_shipdate",2);
X_228 := algebra.thetasubselect(r1_14,nil:bat[:oid,:oid],X_19,"<=");
diff --git a/sql/benchmarks/tpch/Tests/11-explain.stable.out
b/sql/benchmarks/tpch/Tests/11-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/11-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/11-explain.stable.out
@@ -97,7 +97,7 @@ function user.s2_1{autoCommit=true}(A0:s
X_96 := algebra.leftfetchjoin(r1_128,X_79);
X_97:bat[:oid,:lng] := batcalc.*(X_95,X_96);
X_98:lng := aggr.sum(X_97);
- X_99 := calc.*(X_98,A1);
+ X_99:lng := calc.*(X_98,A1);
X_28 := algebra.subselect(X_27,A0,A0,true,false,false);
X_30 := algebra.leftfetchjoin(X_28,X_19);
(X_31,r1_32) := algebra.subjoin(X_18,X_30,nil:BAT,nil:BAT,false,nil:lng);
@@ -115,7 +115,7 @@ function user.s2_1{autoCommit=true}(A0:s
X_61 := algebra.leftfetchjoin(r1_60,X_57);
X_82:bat[:oid,:lng] := aggr.subsum(X_81,X_58,r1_60,true,true);
X_62 := bat.mirror(X_61);
- X_101:hge := sql.dec_round(X_99,100);
+ X_101:lng := sql.dec_round(X_99,100);
X_117 := bat.new(nil:oid,nil:str);
X_125 := bat.append(X_117,"sys.partsupp");
X_135 := bat.append(X_125,"sys.L1");
diff --git a/sql/benchmarks/tpch/Tests/14-explain.stable.out
b/sql/benchmarks/tpch/Tests/14-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/14-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/14-explain.stable.out
@@ -48,7 +48,7 @@ function user.s2_1{autoCommit=true}(A0:s
X_10 := sql.mvc();
X_14:bat[:oid,:date] := sql.bind(X_10,"sys","lineitem","l_shipdate",0);
X_11:bat[:oid,:oid] := sql.tid(X_10,"sys","lineitem");
- X_22 := mtime.addmonths(A6,A7);
+ X_22:date := mtime.addmonths(A6,A7);
X_121 := algebra.subselect(X_14,X_11,A5,X_22,true,false,false);
(X_17,r1_18) := sql.bind(X_10,"sys","lineitem","l_shipdate",2);
X_122 :=
algebra.subselect(r1_18,nil:bat[:oid,:oid],A5,X_22,true,false,false);
@@ -89,13 +89,13 @@ function user.s2_1{autoCommit=true}(A0:s
X_81 := calc.lng(A3,19,4);
X_84:bat[:oid,:lng] := batcalc.ifthenelse(X_57,X_80,X_81);
X_85:lng := aggr.sum(X_84);
- X_86 := calc.*(A0,X_85);
+ X_86:lng := calc.*(A0,X_85);
X_87 := calc.lng(5,X_86,19,9);
X_90 := calc.lng(A4,15,2);
X_91:bat[:oid,:lng] := batcalc.-(X_90,X_78);
X_92:bat[:oid,:lng] := batcalc.*(X_66,X_91);
X_93:lng := aggr.sum(X_92);
- X_94 := calc./(X_87,X_93);
+ X_94:lng := calc./(X_87,X_93);
sql.resultSet(".L2","promo_revenue","decimal",19,5,10,X_94);
end user.s2_1;
diff --git a/sql/benchmarks/tpch/Tests/17-explain.stable.out
b/sql/benchmarks/tpch/Tests/17-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/17-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/17-explain.stable.out
@@ -105,7 +105,7 @@ function user.s2_1{autoCommit=true}(A0:b
X_98:lng := aggr.sum(X_97);
X_99 := calc.lng(2,X_98,19,5);
X_102 := calc.lng(1,A0,19,2);
- X_103 := calc./(X_99,X_102);
+ X_103:lng := calc./(X_99,X_102);
sql.resultSet("sys.L3","avg_yearly","decimal",19,3,10,X_103);
end user.s2_1;
diff --git a/sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out
b/sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out
--- a/sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out
+++ b/sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out
@@ -69,7 +69,7 @@ Ready.
% like_single_value # name
% boolean # type
% 5 # length
-[ true ]
+[ false ]
#SELECT '\\a' LIKE '\\\\\\\\a';
% .L # table_name
% like_single_value # name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
