Changeset: 3fbce18329ba for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3fbce18329ba
Modified Files:
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: Dec2011
Log Message:
Merge from Aug2011 branch.
diffs (truncated from 339 to 300 lines):
diff --git a/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
b/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
--- a/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
+++ b/sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
@@ -28,7 +28,7 @@ Ready.
% mal # name
% clob # type
% 67 # length
-function user.s0_1{autoCommit=true}():void;
+function user.s3_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_13:bat[:oid,:dbl] := sql.bind(X_2,"sys","sf_2596114","x",0);
X_11:bat[:oid,:dbl] := sql.bind(X_2,"sys","sf_2596114","x",2);
@@ -44,12 +44,13 @@ function user.s0_1{autoCommit=true}():vo
sql.rsColumn(X_20,"sys.","power_x","double",53,0,X_19);
X_25 := io.stdout();
sql.exportResult(X_25,X_20);
-end s0_1;
+end s3_1;
+#explain select x*x from SF_2596114;
% .explain # table_name
% mal # name
% clob # type
% 67 # length
-function user.s1_1{autoCommit=true}():void;
+function user.s4_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_13:bat[:oid,:dbl] := sql.bind(X_2,"sys","sf_2596114","x",0);
X_11:bat[:oid,:dbl] := sql.bind(X_2,"sys","sf_2596114","x",2);
@@ -65,7 +66,8 @@ function user.s1_1{autoCommit=true}():vo
sql.rsColumn(X_20,"sys.","sql_mul_x","double",53,0,X_19);
X_25 := io.stdout();
sql.exportResult(X_25,X_20);
-end s1_1;
+end s4_1;
+#drop table SF_2596114;
# 23:02:30 >
# 23:02:30 > Done.
diff --git
a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
--- a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
+++ b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
@@ -129,7 +129,7 @@ top N (
% mal # name
% clob # type
% 61 # length
-function user.s1_1{autoCommit=true}():void;
+function user.s4_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_9:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
X_12 := bat.reverse(X_9);
@@ -144,13 +144,13 @@ function user.s1_1{autoCommit=true}():vo
sql.rsColumn(X_22,"sys.oblo","a","int",32,0,X_21);
X_27 := io.stdout();
sql.exportResult(X_27,X_22);
-end s1_1;
+end s4_1;
#EXPLAIN select * from oblo OFFSET 2;
% .explain # table_name
% mal # name
% clob # type
% 62 # length
-function user.s2_1{autoCommit=true}():void;
+function user.s5_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_11:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
X_14 := bat.reverse(X_11);
@@ -172,13 +172,13 @@ function user.s2_1{autoCommit=true}():vo
sql.rsColumn(X_35,"sys.oblo","a","int",32,0,X_34);
X_41 := io.stdout();
sql.exportResult(X_41,X_35);
-end s2_1;
+end s5_1;
#EXPLAIN select * from oblo LIMIT 2;
% .explain # table_name
% mal # name
% clob # type
% 62 # length
-function user.s3_1{autoCommit=true}():void;
+function user.s6_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_11:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
X_14 := bat.reverse(X_11);
@@ -200,13 +200,13 @@ function user.s3_1{autoCommit=true}():vo
sql.rsColumn(X_35,"sys.oblo","a","int",32,0,X_34);
X_41 := io.stdout();
sql.exportResult(X_41,X_35);
-end s3_1;
+end s6_1;
#EXPLAIN select * from oblo LIMIT 1 OFFSET 2;
% .explain # table_name
% mal # name
% clob # type
% 62 # length
-function user.s4_1{autoCommit=true}():void;
+function user.s7_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_11:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
X_14 := bat.reverse(X_11);
@@ -228,13 +228,13 @@ function user.s4_1{autoCommit=true}():vo
sql.rsColumn(X_35,"sys.oblo","a","int",32,0,X_34);
X_41 := io.stdout();
sql.exportResult(X_41,X_35);
-end s4_1;
+end s7_1;
#EXPLAIN select * from oblo LIMIT 2 OFFSET 1;
% .explain # table_name
% mal # name
% clob # type
% 62 # length
-function user.s5_1{autoCommit=true}():void;
+function user.s8_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_11:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
X_14 := bat.reverse(X_11);
@@ -256,13 +256,13 @@ function user.s5_1{autoCommit=true}():vo
sql.rsColumn(X_35,"sys.oblo","a","int",32,0,X_34);
X_41 := io.stdout();
sql.exportResult(X_41,X_35);
-end s5_1;
+end s8_1;
#EXPLAIN select * from oblo ORDER BY a;
% .explain # table_name
% mal # name
% clob # type
% 62 # length
-function user.s6_1{autoCommit=true}():void;
+function user.s9_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_11:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
X_14 := bat.reverse(X_11);
@@ -282,13 +282,13 @@ function user.s6_1{autoCommit=true}():vo
sql.rsColumn(X_30,"sys.oblo","a","int",32,0,X_29);
X_35 := io.stdout();
sql.exportResult(X_35,X_30);
-end s6_1;
+end s9_1;
#EXPLAIN select * from oblo ORDER BY a OFFSET 2;
% .explain # table_name
% mal # name
% clob # type
% 62 # length
-function user.s7_1{autoCommit=true}():void;
+function user.s10_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_13:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
X_16 := bat.reverse(X_13);
@@ -315,13 +315,13 @@ function user.s7_1{autoCommit=true}():vo
sql.rsColumn(X_45,"sys.oblo","a","int",32,0,X_44);
X_50 := io.stdout();
sql.exportResult(X_50,X_45);
-end s7_1;
+end s10_1;
#EXPLAIN select * from oblo ORDER BY a LIMIT 2;
% .explain # table_name
% mal # name
% clob # type
% 62 # length
-function user.s8_1{autoCommit=true}():void;
+function user.s11_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_11:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
X_14 := bat.reverse(X_11);
@@ -349,13 +349,13 @@ function user.s8_1{autoCommit=true}():vo
sql.rsColumn(X_41,"sys.oblo","a","int",32,0,X_40);
X_47 := io.stdout();
sql.exportResult(X_47,X_41);
-end s8_1;
+end s11_1;
#EXPLAIN select * from oblo ORDER BY a LIMIT 2 OFFSET 1;
% .explain # table_name
% mal # name
% clob # type
% 62 # length
-function user.s9_1{autoCommit=true}():void;
+function user.s12_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_11:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
X_14 := bat.reverse(X_11);
@@ -385,13 +385,13 @@ function user.s9_1{autoCommit=true}():vo
sql.rsColumn(X_46,"sys.oblo","a","int",32,0,X_45);
X_53 := io.stdout();
sql.exportResult(X_53,X_46);
-end s9_1;
+end s12_1;
#EXPLAIN select * from oblo ORDER BY a LIMIT 1 OFFSET 2;
% .explain # table_name
% mal # name
% clob # type
% 62 # length
-function user.s10_1{autoCommit=true}():void;
+function user.s13_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_11:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
X_14 := bat.reverse(X_11);
@@ -421,8 +421,7 @@ function user.s10_1{autoCommit=true}():v
sql.rsColumn(X_46,"sys.oblo","a","int",32,0,X_45);
X_53 := io.stdout();
sql.exportResult(X_53,X_46);
-end s10_1;
-
+end s13_1;
#select * from oblo;
% sys.oblo # table_name
% a # name
diff --git
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
--- a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
+++ b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
@@ -39,7 +39,7 @@ Ready.
% mal # name
% clob # type
% 63 # length
-function user.s2_1{autoCommit=true}():void;
+function user.s5_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_30:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c2",0);
X_29:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c2",2);
@@ -73,7 +73,7 @@ function user.s2_1{autoCommit=true}():vo
sql.rsColumn(X_44,"sys.t2564","L4":str,"wrd",64,0,X_43);
X_52 := io.stdout();
sql.exportResult(X_52,X_44);
-end s2_1;
+end s5_1;
#select count(*) from t2564 group by c1, c2, c3;
% sys.t2564 # table_name
% L5 # name
diff --git
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
---
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
+++
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
@@ -39,7 +39,7 @@ Ready.
% mal # name
% clob # type
% 63 # length
-function user.s2_1{autoCommit=true}():void;
+function user.s5_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_30:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c2",0);
X_29:bat[:oid,:int] := sql.bind(X_2,"sys","t2564","c2",2);
@@ -73,7 +73,7 @@ function user.s2_1{autoCommit=true}():vo
sql.rsColumn(X_44,"sys.t2564","L4":str,"wrd",32,0,X_43);
X_52 := io.stdout();
sql.exportResult(X_52,X_44);
-end s2_1;
+end s5_1;
#select count(*) from t2564 group by c1, c2, c3;
% sys.t2564 # table_name
% L5 # name
diff --git
a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
--- a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
+++ b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
@@ -34,9 +34,9 @@ Ready.
% mal # name
% clob # type
% 66 # length
-function user.s0_1{autoCommit=true}():void;
+function user.s3_1{autoCommit=true}():void;
X_23 := nil:bat[:oid,:dbl];
-barrier X_55 := language.dataflow();
+barrier X_61 := 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);
@@ -53,12 +53,12 @@ barrier X_55 := language.dataflow();
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;
+exit X_61;
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 s0_1;
+end s3_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
@@ -34,7 +34,7 @@ Ready.
% mal # name
% clob # type
% 66 # length
-function user.s0_1{autoCommit=true}():void;
+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);
@@ -55,7 +55,7 @@ function user.s0_1{autoCommit=true}():vo
sql.rsColumn(X_24,"sys.tab_2826","d","double",53,0,X_23);
X_30 := io.stdout();
sql.exportResult(X_30,X_24);
-end s0_1;
+end s3_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
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
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
