Changeset: 3fa5d7598617 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3fa5d7598617
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
sql/jdbc/tests/Tests/Test_CisValid.stable.err
sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: Jun2016
Log Message:
Approvals.
diffs (189 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -56,7 +56,7 @@ Ready.
% def # name
% clob # type
% 541 # length
-[
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();"
]
+[
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();"
]
#explain copy into ttt from 'a:\tmp/xyz';
% .explain # table_name
% mal # name
@@ -90,7 +90,7 @@ end user.s4_1;
% def # name
% clob # type
% 564 # length
-[
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.sql_append();optimizer.garbageCollector();"
]
+[
"optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from 'Z:/tmp/xyz';
% .explain # table_name
% mal # name
diff --git a/sql/jdbc/tests/Tests/Test_CisValid.stable.err
b/sql/jdbc/tests/Tests/Test_CisValid.stable.err
--- a/sql/jdbc/tests/Tests/Test_CisValid.stable.err
+++ b/sql/jdbc/tests/Tests/Test_CisValid.stable.err
@@ -36,8 +36,8 @@ stderr of test 'Test_CisValid` in direct
# 23:03:08 >
java.sql.SQLException: SELECT: no such table 'doesnotexist'
- at
nl.cwi.monetdb.jdbc.MonetConnection$ResponseList.executeQuery(MonetConnection.java:2603)
- at
nl.cwi.monetdb.jdbc.MonetConnection$ResponseList.processQuery(MonetConnection.java:2351)
+ at
nl.cwi.monetdb.jdbc.MonetConnection$ResponseList.executeQuery(MonetConnection.java:2602)
+ at
nl.cwi.monetdb.jdbc.MonetConnection$ResponseList.processQuery(MonetConnection.java:2350)
at
nl.cwi.monetdb.jdbc.MonetStatement.internalExecute(MonetStatement.java:507)
at nl.cwi.monetdb.jdbc.MonetStatement.execute(MonetStatement.java:345)
at Test_CisValid.main(Test_CisValid.java:23)
diff --git a/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
b/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
--- a/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
@@ -116,7 +116,7 @@ Colnr 5.
name myclob
type 2005
typename clob
- precision 0
+ precision 11
scale 0
catalogname null
schemaname sys
diff --git a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
--- a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
+++ b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
@@ -45,77 +45,48 @@ Ready.
% clob # type
% 206 # length
function user.s5_1(A0:timestamp,A1:timestamp,A2:void):void;
- X_62:void := querylog.define("explain select (t-(select timestamp
\\'1970-1-1\\')),v from foo_nil_2dec union all select (t-(select timestamp
\\'1970-1-1\\')),null from foo_nil_2dec;","default_pipe",73);
-barrier X_110 := language.dataflow();
- X_40 := bat.new(nil:oid,nil:str);
- X_47 := bat.append(X_40,".L5");
- X_56 := bat.append(X_47,".L5");
- X_42 := bat.new(nil:oid,nil:str);
- X_49 := bat.append(X_42,"L2");
- X_57 := bat.append(X_49,"v");
- X_43 := bat.new(nil:oid,nil:str);
- X_51 := bat.append(X_43,"sec_interval");
- X_58 := bat.append(X_51,"decimal");
- X_44 := bat.new(nil:oid,nil:int);
- X_53 := bat.append(X_44,13);
- X_60 := bat.append(X_53,18);
- X_46 := bat.new(nil:oid,nil:int);
- X_55 := bat.append(X_46,0);
- X_61 := bat.append(X_55,9);
+ X_67:void := querylog.define("explain select (t-(select timestamp
\\'1970-1-1\\')),v from foo_nil_2dec union all select (t-(select timestamp
\\'1970-1-1\\')),null from foo_nil_2dec;","default_pipe",44);
+ X_45 := bat.new(nil:oid,nil:str);
+ X_52 := bat.append(X_45,".L5");
+ X_61 := bat.append(X_52,".L5");
+ X_47 := bat.new(nil:oid,nil:str);
+ X_54 := bat.append(X_47,"L2");
+ X_62 := bat.append(X_54,"v");
+ X_48 := bat.new(nil:oid,nil:str);
+ X_56 := bat.append(X_48,"sec_interval");
+ X_63 := bat.append(X_56,"decimal");
+ X_49 := bat.new(nil:oid,nil:int);
+ X_58 := bat.append(X_49,13);
+ X_65 := bat.append(X_58,18);
+ X_51 := bat.new(nil:oid,nil:int);
+ X_60 := bat.append(X_51,0);
+ X_66 := bat.append(X_60,9);
X_5:bat[:lng] := bat.new(nil:oid,nil:lng);
X_4 := sql.mvc();
- X_72:bat[:oid] := sql.tid(X_4,"sys","foo_nil_2dec",0,2);
- X_74:bat[:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",0,0,2);
- (X_76:bat[:oid],X_77:bat[:timestamp]) :=
sql.bind(X_4,"sys","foo_nil_2dec","t",2,0,2);
- X_86 := sql.delta(X_74,X_76,X_77);
- X_88 := algebra.projection(X_72,X_86);
- X_15 := calc.timestamp(A0,7);
- X_90 := algebra.project(X_88,X_15);
- X_92 := batmtime.diff(X_88,X_90);
- X_73:bat[:oid] := sql.tid(X_4,"sys","foo_nil_2dec",1,2);
- X_75:bat[:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",0,1,2);
- (X_78:bat[:oid],X_79:bat[:timestamp]) :=
sql.bind(X_4,"sys","foo_nil_2dec","t",2,1,2);
- X_13:bat[:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",1);
- X_87 := sql.delta(X_75,X_78,X_79,X_13);
- X_89 := algebra.projection(X_73,X_87);
- X_91 := algebra.project(X_89,X_15);
- X_93 := batmtime.diff(X_89,X_91);
- X_98 := mat.packIncrement(X_92,2);
- X_17:bat[:lng] := mat.packIncrement(X_98,X_93);
- X_18 := bat.append(X_5,X_17,true);
- C_20:bat[:oid] := sql.tid(X_4,"sys","foo_nil_2dec");
- X_21:bat[:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",0);
- (C_22,r1_32) := sql.bind(X_4,"sys","foo_nil_2dec","t",2);
- X_24 := sql.delta(X_21,C_22,r1_32,X_13);
- X_25 := algebra.projection(C_20,X_24);
- X_26 := calc.timestamp(A1,7);
- X_27 := algebra.project(X_25,X_26);
- X_28:bat[:lng] := batmtime.diff(X_25,X_27);
- X_29 := bat.append(X_18,X_28,true);
- X_30:bat[:lng] := bat.new(nil:oid,nil:lng);
- X_80:bat[:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",0,0,2);
- (X_82:bat[:oid],X_83:bat[:lng]) :=
sql.bind(X_4,"sys","foo_nil_2dec","v",2,0,2);
- X_94 := sql.delta(X_80,X_82,X_83);
- X_96 := algebra.projection(X_72,X_94);
- X_81:bat[:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",0,1,2);
- (X_84:bat[:oid],X_85:bat[:lng]) :=
sql.bind(X_4,"sys","foo_nil_2dec","v",2,1,2);
- X_32:bat[:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",1);
- X_95 := sql.delta(X_81,X_84,X_85,X_32);
- X_97 := algebra.projection(X_73,X_95);
- X_101 := mat.packIncrement(X_96,2);
- X_33 := mat.packIncrement(X_101,X_97);
- X_34 := bat.append(X_30,X_33,true);
- X_37 := algebra.project(X_28,nil:lng);
- X_38 := bat.append(X_34,X_37,true);
- language.pass(X_88);
- language.pass(X_89);
- language.pass(X_13);
- language.pass(X_25);
- language.pass(X_72);
- language.pass(X_73);
- language.pass(X_28);
-exit X_110;
- sql.resultSet(X_56,X_57,X_58,X_60,X_61,X_29,X_38);
+ C_8:bat[:oid] := sql.tid(X_4,"sys","foo_nil_2dec");
+ X_11:bat[:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",0);
+ (C_14,r1_14) := sql.bind(X_4,"sys","foo_nil_2dec","t",2);
+ X_17:bat[:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",1);
+ X_19 := sql.delta(X_11,C_14,r1_14,X_17);
+ X_20 := algebra.projection(C_8,X_19);
+ X_21 := calc.timestamp(A0,7);
+ X_23 := algebra.project(X_20,X_21);
+ X_24:bat[:lng] := batmtime.diff(X_20,X_23);
+ X_25 := bat.append(X_5,X_24,true);
+ X_27 := calc.timestamp(A1,7);
+ X_28 := algebra.project(X_20,X_27);
+ X_29:bat[:lng] := batmtime.diff(X_20,X_28);
+ X_30 := bat.append(X_25,X_29,true);
+ X_31:bat[:lng] := bat.new(nil:oid,nil:lng);
+ X_32:bat[:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",0);
+ (C_34,r1_47) := sql.bind(X_4,"sys","foo_nil_2dec","v",2);
+ X_36:bat[:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",1);
+ X_37 := sql.delta(X_32,C_34,r1_47,X_36);
+ X_38 := algebra.projection(C_8,X_37);
+ X_39 := bat.append(X_31,X_38,true);
+ X_42 := algebra.project(X_29,nil:lng);
+ X_43 := bat.append(X_39,X_42,true);
+ sql.resultSet(X_61,X_62,X_63,X_65,X_66,X_30,X_43);
end user.s5_1;
# 23:28:04 >
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -48,7 +48,7 @@ Operation successful
+--------------------------------------------------------------------------------------------------+
| mal |
+==================================================================================================+
-| function user.s3_1():void;
|
+| function user.s2_1():void;
|
| X_41:void := querylog.define("explain select count(*) from
tables\n;","sequential_pipe",27); |
| X_2:bat[:wrd] := bat.new(nil:oid,nil:wrd);
|
| X_1 := sql.mvc();
|
@@ -74,7 +74,7 @@ Operation successful
| X_33 := bat.append(X_27,X_32,true);
|
| X_34:wrd := aggr.sum(X_33);
|
| sql.resultSet(".L3","L3","wrd",64,0,7,X_34);
|
-| end user.s3_1;
|
+| end user.s2_1;
|
+--------------------------------------------------------------------------------------------------+
27 rows
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
