Changeset: 1f92469b8880 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f92469b8880
Modified Files:
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.FreeBSD
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.single
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: default
Log Message:
minimize differences between system-specific and standard stable.out
diffs (292 lines):
diff --git
a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.FreeBSD
b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.FreeBSD
---
a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.FreeBSD
+++
b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.FreeBSD
@@ -33,32 +33,32 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 66 # length
-function user.s2_1{autoCommit=true}():void;
- X_23 := nil:bat[:oid,:dbl];
-barrier X_55 := language.dataflow();
- X_2 := sql.mvc();
- X_10:bat[:oid,:dbl] := sql.bind(X_2,"sys","tab_2826","d",0);
- X_8:bat[:oid,:dbl] := sql.bind(X_2,"sys","tab_2826","d",2);
- X_12 := algebra.kdifference(X_10,X_8);
- X_13 := algebra.kunion(X_12,X_8);
- X_5:bat[:oid,:dbl] := sql.bind(X_2,"sys","tab_2826","d",1);
- X_14 := algebra.kunion(X_13,X_5);
- X_15:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","tab_2826",1);
- X_16 := bat.reverse(X_15);
- X_17 := algebra.kdifference(X_14,X_16);
- X_18 := batcalc.flt(X_17);
- X_42 := batmmath.log10(X_18);
- X_19 := algebra.thetauselect(X_42,1:flt,">");
- X_21 := algebra.markT(X_19,0@0:oid);
- X_22 := bat.reverse(X_21);
- X_23 := algebra.leftjoin(X_22,X_14);
-exit X_55;
- X_24 := sql.resultSet(1,1,X_23);
- sql.rsColumn(X_24,"sys.tab_2826","d","double",53,0,X_23);
- X_30 := io.stdout();
- sql.exportResult(X_30,X_24);
-end s2_1;
+% 65 # length
+function user.s1_1{autoCommit=true}(A0:flt):void;
+ X_24 := nil:bat[:oid,:dbl];
+barrier X_56 := language.dataflow();
+ X_3 := sql.mvc();
+ X_13:bat[:oid,:dbl] := sql.bind(X_3,"sys","tab_2826","d",0);
+ X_11:bat[:oid,:dbl] := sql.bind(X_3,"sys","tab_2826","d",2);
+ X_15 := algebra.kdifference(X_13,X_11);
+ X_16 := algebra.kunion(X_15,X_11);
+ X_10:bat[:oid,:dbl] := sql.bind(X_3,"sys","tab_2826","d",1);
+ X_17 := algebra.kunion(X_16,X_10);
+ X_6:bat[:oid,:oid] := sql.bind_dbat(X_3,"sys","tab_2826",1);
+ X_9 := bat.reverse(X_6);
+ X_18 := algebra.kdifference(X_17,X_9);
+ X_19 := batcalc.flt(X_18);
+ X_43 := batmmath.log10(X_19);
+ X_20 := algebra.thetauselect(X_43,A0,">");
+ X_22 := algebra.markT(X_20,0@0:oid);
+ X_23 := bat.reverse(X_22);
+ X_24 := algebra.leftjoin(X_23,X_18);
+exit X_56;
+ X_25 := sql.resultSet(1,1,X_24);
+ sql.rsColumn(X_25,"sys.tab_2826","d","double",53,0,X_24);
+ X_31 := io.stdout();
+ sql.exportResult(X_31,X_25);
+end s1_1;
#select * from tab_2826 where func_2826(d) > 1;
% sys.tab_2826 # table_name
% d # name
diff --git
a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.single
b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.single
---
a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.single
+++
b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.single
@@ -33,29 +33,29 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 66 # length
-function user.s3_1{autoCommit=true}():void;
- X_2 := sql.mvc();
- X_10:bat[:oid,:dbl] := sql.bind(X_2,"sys","tab_2826","d",0);
- X_8:bat[:oid,:dbl] := sql.bind(X_2,"sys","tab_2826","d",2);
- X_12 := algebra.kdifference(X_10,X_8);
- X_13 := algebra.kunion(X_12,X_8);
- X_5:bat[:oid,:dbl] := sql.bind(X_2,"sys","tab_2826","d",1);
- X_14 := algebra.kunion(X_13,X_5);
- X_15:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","tab_2826",1);
- X_16 := bat.reverse(X_15);
- X_17 := algebra.kdifference(X_14,X_16);
- X_18 := batcalc.flt(X_17);
- X_42 := batmmath.log10(X_18);
- X_19 := algebra.thetauselect(X_42,1:flt,">");
- X_21 := algebra.markT(X_19,0@0:oid);
- X_22 := bat.reverse(X_21);
- X_23 := algebra.leftjoin(X_22,X_14);
- X_24 := sql.resultSet(1,1,X_23);
- sql.rsColumn(X_24,"sys.tab_2826","d","double",53,0,X_23);
- X_30 := io.stdout();
- sql.exportResult(X_30,X_24);
-end s3_1;
+% 65 # length
+function user.s1_1{autoCommit=true}(A0:flt):void;
+ X_3 := sql.mvc();
+ X_13:bat[:oid,:dbl] := sql.bind(X_3,"sys","tab_2826","d",0);
+ X_11:bat[:oid,:dbl] := sql.bind(X_3,"sys","tab_2826","d",2);
+ X_15 := algebra.kdifference(X_13,X_11);
+ X_16 := algebra.kunion(X_15,X_11);
+ X_10:bat[:oid,:dbl] := sql.bind(X_3,"sys","tab_2826","d",1);
+ X_17 := algebra.kunion(X_16,X_10);
+ X_6:bat[:oid,:oid] := sql.bind_dbat(X_3,"sys","tab_2826",1);
+ X_9 := bat.reverse(X_6);
+ X_18 := algebra.kdifference(X_17,X_9);
+ X_19 := batcalc.flt(X_18);
+ X_43 := batmmath.log10(X_19);
+ X_20 := algebra.thetauselect(X_43,A0,">");
+ X_22 := algebra.markT(X_20,0@0:oid);
+ X_23 := bat.reverse(X_22);
+ X_24 := algebra.leftjoin(X_23,X_18);
+ X_25 := sql.resultSet(1,1,X_24);
+ sql.rsColumn(X_25,"sys.tab_2826","d","double",53,0,X_24);
+ X_31 := io.stdout();
+ sql.exportResult(X_31,X_25);
+end s1_1;
#select * from tab_2826 where func_2826(d) > 1;
% sys.tab_2826 # table_name
% d # name
diff --git
a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
@@ -15,97 +15,114 @@ stdout of test 'jdbc_no_debug.SF-1739356
# MonetDB/SQL module v2.30.0 loaded
Ready.
-#function user.main():void;
-# clients.quit();
-#end main;
-# 13:30:19 >
-# 13:30:19 > ./jdbc_no_debug.SF-1739356.SQL.sh jdbc_no_debug.SF-1739356
-# 13:30:19 >
-# 13:30:19 >
-# 13:30:19 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -h
rig -p 39462 -d mTests_src_test_BugTracker -f
"../../../../../source/sql/src/test/BugTracker/Tests/jdbc_no_debug.SF-1739356-data.sql"
-# 13:30:19 >
-+------------------------------------------------------------------------------------------------------------------+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 18:23:35 >
+# 18:23:35 > "./jdbc_no_debug.SF-1739356.SQL.sh" "jdbc_no_debug.SF-1739356"
+# 18:23:35 >
+
+
+# 18:23:35 >
+# 18:23:35 > Mtimeout -timeout 60 java nl.cwi.monetdb.client.JdbcClient -h
niels -p 32617 -d mTests_test_BugTracker -f
"../../../../../..//data/MonetDB/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356-data.sql"
+# 18:23:35 >
+
++-------------------------------------------------------------------------------------------------------------------------+
| rel
|
-+==================================================================================================================+
++=========================================================================================================================+
| project (
|
| | group by (
|
| | | union (
|
| | | | group by (
|
| | | | | project (
|
| | | | | | select (
|
-| | | | | | | table(sys._tables) [ _tables.id as p.id, _tables.type as p.type,
_tables.%TID% NOT NULL as p.%TID% ] |
+| | | | | | | table(sys._tables) [ _tables.id as p.id, _tables.type as p.type,
_tables.%TID% NOT NULL as p.%TID% ] COUNT |
| | | | | | ) [ p.type < smallint[tinyint "2"] ]
|
| | | | | ) [ p.id as tables.id ]
|
| | | | ) [ ] [ sys.count() NOT NULL as L1 ],
|
| | | | group by (
|
| | | | | project (
|
| | | | | | select (
|
-| | | | | | | table(tmp._tables) [ _tables.id as t.id, _tables.type as t.type,
_tables.%TID% NOT NULL as t.%TID% ] |
+| | | | | | | table(tmp._tables) [ _tables.id as t.id, _tables.type as t.type,
_tables.%TID% NOT NULL as t.%TID% ] COUNT |
| | | | | | ) [ t.type < smallint[tinyint "2"] ]
|
| | | | | ) [ t.id as tables.id ]
|
| | | | ) [ ] [ sys.count() NOT NULL as L1 ]
|
| | | ) [ L1 ]
|
| | ) [ ] [ sys.sum no nil (L1) as L1 ]
|
| ) [ L1 NOT NULL ]
|
-+------------------------------------------------------------------------------------------------------------------+
++-------------------------------------------------------------------------------------------------------------------------+
20 rows
+Operation successful
+---------------------------------------------------------------------+
-| mal |
+| mal |
+=====================================================================+
-| function user.s4_1{autoCommit=true}():void; |
-| X_51:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
-| X_2 := sql.mvc(); |
+| function user.s2_1{autoCommit=true}():void; |
+| X_51:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
+| X_2 := sql.mvc(); |
| X_40:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
-| X_41 := algebra.thetauselect(X_40,2:sht,"<"); |
+| X_41 := algebra.thetauselect(X_40,2:sht,"<"); |
| X_38:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",2); |
-| X_42 := algebra.kdifference(X_41,X_38); |
-| X_39 := algebra.thetauselect(X_38,2:sht,"<"); |
-| X_43 := algebra.kunion(X_42,X_39); |
+| X_42 := algebra.kdifference(X_41,X_38); |
+| X_39 := algebra.thetauselect(X_38,2:sht,"<"); |
+| X_43 := algebra.kunion(X_42,X_39); |
| X_35:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); |
-| X_36 := algebra.thetauselect(X_35,2:sht,"<"); |
-| X_44 := algebra.kunion(X_43,X_36); |
-| X_32:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","_tables",1); |
-| X_34 := bat.reverse(X_32); |
-| X_45 := algebra.kdifference(X_44,X_34); |
-| X_46 := algebra.markT(X_45,0@0:oid); |
-| X_47 := bat.reverse(X_46); |
-| X_25:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0); |
-| X_23:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",2); |
-| X_28 := algebra.kdifference(X_25,X_23); |
-| X_29 := algebra.kunion(X_28,X_23); |
-| X_20:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1); |
-| X_30 := algebra.kunion(X_29,X_20); |
-| X_48 := algebra.leftjoin(X_47,X_30); |
-| X_49 := aggr.count(X_48); |
-| X_50 := sql.single(X_49); |
-| X_54 := bat.append(X_51,X_50,true); |
+| X_36 := algebra.thetauselect(X_35,2:sht,"<"); |
+| X_44 := algebra.kunion(X_43,X_36); |
+| X_32:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","_tables",1); |
+| X_34 := bat.reverse(X_32); |
+| X_45 := algebra.kdifference(X_44,X_34); |
+| X_46 := algebra.markT(X_45,0@0:oid); |
+| X_47 := bat.reverse(X_46); |
+| X_25:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0); |
+| X_23:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",2); |
+| X_28 := algebra.kdifference(X_25,X_23); |
+| X_29 := algebra.kunion(X_28,X_23); |
+| X_20:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1); |
+| X_30 := algebra.kunion(X_29,X_20); |
+| X_48 := algebra.leftjoin(X_47,X_30); |
+| X_49 := aggr.count(X_48); |
+| X_50 := sql.single(X_49); |
+| X_54 := bat.append(X_51,X_50,true); |
| X_12:bat[:oid,:sht] := sql.bind(X_2,"tmp","_tables","type",0); |
-| X_13 := algebra.thetauselect(X_12,2:sht,"<"); |
-| X_9:bat[:oid,:oid] := sql.bind_dbat(X_2,"tmp","_tables",1); |
-| X_11 := bat.reverse(X_9); |
-| X_15 := algebra.kdifference(X_13,X_11); |
-| X_16 := algebra.markT(X_15,0@0:oid); |
-| X_17 := bat.reverse(X_16); |
-| X_4:bat[:oid,:int] := sql.bind(X_2,"tmp","_tables","id",0); |
-| X_18 := algebra.leftjoin(X_17,X_4); |
-| X_19 := aggr.count(X_18); |
-| X_56 := bat.append(X_54,X_19,true); |
-| X_57 := algebra.selectNotNil(X_56); |
-| X_58:wrd := aggr.sum(X_57); |
-| sql.exportValue(1,".tables","L2":str,"wrd",32,0,6,X_58,""); |
-| end s4_1; |
+| X_13 := algebra.thetauselect(X_12,2:sht,"<"); |
+| X_9:bat[:oid,:oid] := sql.bind_dbat(X_2,"tmp","_tables",1); |
+| X_11 := bat.reverse(X_9); |
+| X_15 := algebra.kdifference(X_13,X_11); |
+| X_16 := algebra.markT(X_15,0@0:oid); |
+| X_17 := bat.reverse(X_16); |
+| X_4:bat[:oid,:int] := sql.bind(X_2,"tmp","_tables","id",0); |
+| X_18 := algebra.leftjoin(X_17,X_4); |
+| X_19 := aggr.count(X_18); |
+| X_56 := bat.append(X_54,X_19,true); |
+| X_57 := algebra.selectNotNil(X_56); |
+| X_58:wrd := aggr.sum(X_57); |
+| sql.exportValue(1,".tables","L1":str,"wrd",32,0,6,X_58,""); |
+| end s2_1; |
+---------------------------------------------------------------------+
42 rows
-# 13:30:20 >
-# 13:30:20 > Done.
-# 13:30:20 >
+# 19:39:11 >
+# 19:39:11 > "Done."
+# 19:39:11 >
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
