Changeset: fa2561551b66 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa2561551b66
Modified Files:
monetdb5/mal/Tests/tst201.stable.out
monetdb5/mal/Tests/tst810.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
Branch: profiler
Log Message:
Accept output
diffs (276 lines):
diff --git a/monetdb5/mal/Tests/tst201.stable.out
b/monetdb5/mal/Tests/tst201.stable.out
--- a/monetdb5/mal/Tests/tst201.stable.out
+++ b/monetdb5/mal/Tests/tst201.stable.out
@@ -87,10 +87,10 @@ end user.main;
# h t # name
# oid str # type
#--------------------------#
-[ 10@0, "" ]
+[ 0@0, "" ]
[ 1@0, "quick" ]
[ 2@0, "brown" ]
-[ 11@0, nil ]
+[ 3@0, nil ]
[ 4@0, "jumps" ]
[ 5@0, "over" ]
[ 6@0, "lazy" ]
@@ -102,48 +102,48 @@ end user.main;
# void str # type
#--------------------------#
[ 2@0, "brown" ]
+[ 3@0, nil ]
+[ 4@0, "jumps" ]
#--------------------------#
# t h # name
# void str # type
#--------------------------#
-[ 10@0, "" ]
-[ 11@0, nil ]
[ 7@0, "dog" ]
[ 8@0, nil ]
-[ 12@0, "fox" ]
-[ 13@0, "the" ]
-[ 14@0, "." ]
+[ 9@0, "fox" ]
+[ 10@0, "the" ]
+[ 11@0, "." ]
#--------------------------#
# t t # name
# void str # type
#--------------------------#
-[ 10@0, "" ]
+[ 0@0, "" ]
[ 1@0, "quick" ]
[ 2@0, "brown" ]
-[ 11@0, nil ]
+[ 3@0, nil ]
[ 4@0, "jumps" ]
[ 5@0, "over" ]
[ 6@0, "lazy" ]
[ 7@0, "dog" ]
[ 8@0, nil ]
-[ 12@0, "fox" ]
-[ 13@0, "the" ]
-[ 14@0, "." ]
+[ 9@0, "fox" ]
+[ 10@0, "the" ]
+[ 11@0, "." ]
#--------------------------#
# t t # name
# void str # type
#--------------------------#
-[ 12@0, "fox" ]
+[ nil, 9@0 ]
#--------------------------#
# h t # name
# oid str # type
#--------------------------#
-[ 12@0, "fox" ]
+[ nil, 9@0 ]
#--------------------------#
# h t # name
# oid str # type
#--------------------------#
-[ 12@0, "fox" ]
+[ nil, 9@0 ]
#--------------------------#
# h t # name
# oid str # type
diff --git a/monetdb5/mal/Tests/tst810.stable.out
b/monetdb5/mal/Tests/tst810.stable.out
--- a/monetdb5/mal/Tests/tst810.stable.out
+++ b/monetdb5/mal/Tests/tst810.stable.out
@@ -55,8 +55,9 @@ end user.main;
[ 1@0, 2 ]
[ 2@0, 3 ]
[ 3@0, 4 ]
-#-----------------#
-# t h # name
+[ 4@0, 5 ]
+#--------------------------#
+# h t # name
# void int # type
#--------------------------#
[ 5@0, 6 ]
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
@@ -34,84 +34,89 @@ Ready.
% .L5, .L5 # table_name
% L2, v # name
% sec_interval, decimal # type
-% 0, 20 # length
+% 14, 20 # length
[ 1412467200.000, 42.000000000 ]
[ 1412467200.000, 43.000000000 ]
[ 1412467200.000, NULL ]
+[ 1412467200.000, NULL ]
#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;
% .explain # table_name
% mal # name
% clob # type
% 206 # length
function user.s5_1{autoCommit=true}(A0:timestamp,A1:timestamp,A2:void):void;
- X_56: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",70);
-barrier X_116 := language.dataflow();
- X_34 := bat.new(nil:oid,nil:str);
- X_41 := bat.append(X_34,".L5");
- X_50 := bat.append(X_41,".L5");
+ X_55: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",74);
+barrier X_121 := language.dataflow();
+ X_33 := bat.new(nil:oid,nil:str);
+ X_40 := bat.append(X_33,".L5");
+ X_49 := bat.append(X_40,".L5");
+ X_35 := bat.new(nil:oid,nil:str);
+ X_42 := bat.append(X_35,"L2");
+ X_50 := bat.append(X_42,"v");
X_36 := bat.new(nil:oid,nil:str);
- X_43 := bat.append(X_36,"L2");
- X_51 := bat.append(X_43,"v");
- X_37 := bat.new(nil:oid,nil:str);
- X_45 := bat.append(X_37,"sec_interval");
- X_52 := bat.append(X_45,"decimal");
- X_38 := bat.new(nil:oid,nil:int);
- X_47 := bat.append(X_38,13);
- X_54 := bat.append(X_47,18);
- X_40 := bat.new(nil:oid,nil:int);
- X_49 := bat.append(X_40,0);
- X_55 := bat.append(X_49,9);
+ X_44 := bat.append(X_36,"sec_interval");
+ X_51 := bat.append(X_44,"decimal");
+ X_37 := bat.new(nil:oid,nil:int);
+ X_46 := bat.append(X_37,13);
+ X_53 := bat.append(X_46,18);
+ X_39 := bat.new(nil:oid,nil:int);
+ X_48 := bat.append(X_39,0);
+ X_54 := bat.append(X_48,9);
X_6:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
X_5 := sql.mvc();
- X_73:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",0,2);
- X_76:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,0,2);
- (X_78:bat[:oid,:oid],X_79:bat[:oid,:timestamp]) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,0,2);
- X_88 := sql.delta(X_76,X_78,X_79);
- X_90 := algebra.leftfetchjoin(X_73,X_88);
+ X_72:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",0,2);
+ X_75:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,0,2);
+ (X_77:bat[:oid,:oid],X_78:bat[:oid,:timestamp]) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,0,2);
+ X_87 := sql.delta(X_75,X_77,X_78);
+ X_89 := algebra.leftfetchjoin(X_72,X_87);
X_16 := calc.timestamp(A0,7);
+ X_91 := algebra.project(X_89,X_16);
+ X_93 := batmtime.diff(X_89,X_91);
+ X_74:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",1,2);
+ X_76:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,1,2);
+ (X_79:bat[:oid,:oid],X_80:bat[:oid,:timestamp]) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,1,2);
+ X_14:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",1);
+ X_88 := sql.delta(X_76,X_79,X_80,X_14);
+ X_90 := algebra.leftfetchjoin(X_74,X_88);
X_92 := algebra.project(X_90,X_16);
X_94 := batmtime.diff(X_90,X_92);
- X_75:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",1,2);
- X_77:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,1,2);
- (X_80:bat[:oid,:oid],X_81:bat[:oid,:timestamp]) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,1,2);
- X_14:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",1);
- X_89 := sql.delta(X_77,X_80,X_81,X_14);
- X_91 := algebra.leftfetchjoin(X_75,X_89);
- X_93 := algebra.project(X_91,X_16);
- X_95 := batmtime.diff(X_91,X_93);
- X_106 := mat.packIncrement(X_94,2);
- X_18:bat[:oid,:lng] := mat.packIncrement(X_106,X_95);
+ X_107 := mat.packIncrement(X_93,2);
+ X_18:bat[:oid,:lng] := mat.packIncrement(X_107,X_94);
X_19 := bat.append(X_6,X_18,true);
X_20 := calc.timestamp(A1,7);
+ X_97 := algebra.project(X_89,X_20);
+ X_99 := batmtime.diff(X_89,X_97);
X_98 := algebra.project(X_90,X_20);
X_100 := batmtime.diff(X_90,X_98);
- X_99 := algebra.project(X_91,X_20);
- X_101 := batmtime.diff(X_91,X_99);
- X_108 := mat.packIncrement(X_100,2);
- X_21:bat[:oid,:lng] := mat.packIncrement(X_108,X_101);
+ X_109 := mat.packIncrement(X_99,2);
+ X_21:bat[:oid,:lng] := mat.packIncrement(X_109,X_100);
X_22 := bat.append(X_19,X_21,true);
X_23:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
- X_82:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,0,2);
- (X_84:bat[:oid,:oid],X_85:bat[:oid,:lng]) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,0,2);
- X_102 := sql.delta(X_82,X_84,X_85);
- X_104 := algebra.leftfetchjoin(X_73,X_102);
- X_83:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,1,2);
- (X_86:bat[:oid,:oid],X_87:bat[:oid,:lng]) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,1,2);
+ X_81:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,0,2);
+ (X_83:bat[:oid,:oid],X_84:bat[:oid,:lng]) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,0,2);
+ X_101 := sql.delta(X_81,X_83,X_84);
+ X_103 := algebra.leftfetchjoin(X_72,X_101);
+ X_82:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,1,2);
+ (X_85:bat[:oid,:oid],X_86:bat[:oid,:lng]) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,1,2);
X_25:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",1);
- X_103 := sql.delta(X_83,X_86,X_87,X_25);
- X_105 := algebra.leftfetchjoin(X_75,X_103);
- X_110 := mat.packIncrement(X_104,2);
- X_26 := mat.packIncrement(X_110,X_105);
+ X_102 := sql.delta(X_82,X_85,X_86,X_25);
+ X_104 := algebra.leftfetchjoin(X_74,X_102);
+ X_111 := mat.packIncrement(X_103,2);
+ X_26 := mat.packIncrement(X_111,X_104);
X_27 := bat.append(X_23,X_26,true);
- X_28 := sql.single(nil:lng);
- X_29:bat[:oid,:lng] := batcalc.lng(X_28,18,9);
- X_32 := bat.append(X_27,X_29,true);
+ X_105 := algebra.project(X_99,nil:lng);
+ X_106 := algebra.project(X_100,nil:lng);
+ X_113 := mat.packIncrement(X_105,2);
+ X_30 := mat.packIncrement(X_113,X_106);
+ X_31 := bat.append(X_27,X_30,true);
+ language.pass(X_89);
language.pass(X_90);
- language.pass(X_91);
- language.pass(X_73);
- language.pass(X_75);
-exit X_116;
- sql.resultSet(X_50,X_51,X_52,X_54,X_55,X_22,X_32);
+ language.pass(X_72);
+ language.pass(X_74);
+ language.pass(X_99);
+ language.pass(X_100);
+exit X_121;
+ sql.resultSet(X_49,X_50,X_51,X_53,X_54,X_22,X_31);
end user.s5_1;
# 23:28:04 >
diff --git a/sql/test/Tests/setoptimizer.stable.err
b/sql/test/Tests/setoptimizer.stable.err
--- a/sql/test/Tests/setoptimizer.stable.err
+++ b/sql/test/Tests/setoptimizer.stable.err
@@ -79,11 +79,11 @@ stderr of test 'setoptimizer` in directo
# 12:49:31 > mclient -lsql -i --host=eir --port=36907
# 12:49:31 >
-MAPI = (monetdb) /var/tmp/mtest-27167/.s.monetdb.39144
-QUERY = set optimizer=' optimizer.inline(); optimizer.remap();
optimizer.evaluate(); optimizer.costModel(); optimizer.coercions();
optimizer.emptySet(); optimizer.aliases(); optimizer.mergetable();
optimizer.deadcode(); optimizer.commonTerms(); optimizer.joinPath();
optimizer.reorder(); optimizer.deadcode(); optimizer.reduce();
optimizer.querylog(); optimizer.multiplex(); optimizer.accumulators();
optimizer.garbageCollector();';
+MAPI = (monetdb) /var/tmp/mtest-31506/.s.monetdb.36061
+QUERY = set optimizer=' optimizer.inline(); optimizer.remap();
optimizer.evaluate(); optimizer.costModel(); optimizer.coercions();
optimizer.emptySet(); optimizer.aliases(); optimizer.mergetable();
optimizer.deadcode(); optimizer.commonTerms(); optimizer.joinPath();
optimizer.reorder(); optimizer.deadcode(); optimizer.reduce();
optimizer.querylog(); optimizer.multiplex(); optimizer.garbageCollector();';
ERROR = !TypeException:user.main[6]:'optimizer.emptySet' undefined in:
optimizer.emptySet();
!Semantic errors detected
-MAPI = (monetdb) /var/tmp/mtest-27167/.s.monetdb.39144
+MAPI = (monetdb) /var/tmp/mtest-31506/.s.monetdb.36061
QUERY = set optimizer='myfamous_pipe';
ERROR = !optimizer 'myfamous_pipe' unknown
diff --git a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
--- a/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
+++ b/sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
@@ -75,10 +75,10 @@ Ready.
% varchar, varchar, int # type
% 7, 13, 4 # length
[ "monetdb", "MonetDB Admin", 2000 ]
-[ "user1", "1st user", 7367 ]
-[ "user2", "2nd user", 7367 ]
-[ "user3", "3rd user", 7367 ]
-[ "user4", "4th user", 7367 ]
+[ "user1", "1st user", 7320 ]
+[ "user2", "2nd user", 7320 ]
+[ "user3", "3rd user", 7320 ]
+[ "user4", "4th user", 7320 ]
#DROP USER user1;
#DROP USER user2;
#DROP USER user3;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
