Changeset: 2cf5a083f632 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2cf5a083f632
Modified Files:
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: default
Log Message:
approved test after recent changes (such as the changed explain and less
default options)
diffs (truncated from 963 to 300 lines):
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
@@ -68,9 +68,9 @@
# 22:29:10 > mclient -lsql -i -umonetdb -Pmonetdb --host=pegasus --port=30332
# 22:29:10 >
-MAPI = monetdb@alf:35734
+MAPI = monetdb@alf:33179
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !SQLException:zero_or_one:cardinality violation (21>1)
+ERROR = !SQLException:zero_or_one:cardinality violation (19>1)
# 13:22:15 >
# 13:22:15 > Done.
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
@@ -29,7 +29,6 @@
% name # name
% varchar # type
% 16 # length
-[ "default_pipe" ]
[ "gdk_alloc_map" ]
[ "gdk_dbfarm" ]
[ "gdk_dbname" ]
@@ -42,7 +41,6 @@
[ "mapi_autosense" ]
[ "mapi_open" ]
[ "mapi_port" ]
-[ "minimal_pipe" ]
[ "monet_daemon" ]
[ "monet_mod_path" ]
[ "monet_pid" ]
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
@@ -30,42 +30,42 @@
% clob # type
% 0 # length
function user.s0_1{autoCommit=true}():void;
- _2 := sql.mvc();
- _13:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",0);
- _11:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",2);
- _15 := algebra.kdifference(_13,_11);
- _16 := algebra.kunion(_15,_11);
- _10:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",1);
- _17 := algebra.kunion(_16,_10);
- _6:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","sf_2596114",1);
- _9 := bat.reverse(_6);
- _18 := algebra.kdifference(_17,_9);
- _19:bat[:oid,:dbl] := batmmath.pow(_18,2:dbl);
- _20 := sql.resultSet(1,1,_19);
- sql.rsColumn(_20,"sys.","power_x","double",53,0,_19);
- _25 := io.stdout();
- sql.exportResult(_25,_20);
+ 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);
+ X_15 := algebra.kdifference(X_13,X_11);
+ X_16 := algebra.kunion(X_15,X_11);
+ X_10:bat[:oid,:dbl] := sql.bind(X_2,"sys","sf_2596114","x",1);
+ X_17 := algebra.kunion(X_16,X_10);
+ X_6:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","sf_2596114",1);
+ X_9 := bat.reverse(X_6);
+ X_18 := algebra.kdifference(X_17,X_9);
+ X_19:bat[:oid,:dbl] := batmmath.pow(X_18,2:dbl);
+ X_20 := sql.resultSet(1,1,X_19);
+ 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;
% .explain # table_name
% mal # name
% clob # type
% 0 # length
function user.s1_1{autoCommit=true}():void;
- _2 := sql.mvc();
- _13:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",0);
- _11:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",2);
- _15 := algebra.kdifference(_13,_11);
- _16 := algebra.kunion(_15,_11);
- _10:bat[:oid,:dbl] := sql.bind(_2,"sys","sf_2596114","x",1);
- _17 := algebra.kunion(_16,_10);
- _6:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","sf_2596114",1);
- _9 := bat.reverse(_6);
- _18 := algebra.kdifference(_17,_9);
- _19:bat[:oid,:dbl] := batcalc.*(_18,_18);
- _20 := sql.resultSet(1,1,_19);
- sql.rsColumn(_20,"sys.","sql_mul_x","double",53,0,_19);
- _25 := io.stdout();
- sql.exportResult(_25,_20);
+ 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);
+ X_15 := algebra.kdifference(X_13,X_11);
+ X_16 := algebra.kunion(X_15,X_11);
+ X_10:bat[:oid,:dbl] := sql.bind(X_2,"sys","sf_2596114","x",1);
+ X_17 := algebra.kunion(X_16,X_10);
+ X_6:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","sf_2596114",1);
+ X_9 := bat.reverse(X_6);
+ X_18 := algebra.kdifference(X_17,X_9);
+ X_19:bat[:oid,:dbl] := batcalc.*(X_18,X_18);
+ X_20 := sql.resultSet(1,1,X_19);
+ 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;
# 23:02:30 >
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
@@ -132,20 +132,20 @@
% clob # type
% 0 # length
function user.s1_1{autoCommit=true}():void;
- _2 := sql.mvc();
- _9:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","oblo",1);
- _12 := bat.reverse(_9);
- _13:bat[:oid,:int] := sql.bind(_2,"sys","oblo","a",1);
- _14:bat[:oid,:int] := sql.bind(_2,"sys","oblo","a",2);
- _16:bat[:oid,:int] := sql.bind(_2,"sys","oblo","a",0);
- _18 := algebra.kdifference(_16,_14);
- _19 := algebra.kunion(_18,_14);
- _20 := algebra.kunion(_19,_13);
- _21 := algebra.kdifference(_20,_12);
- _22 := sql.resultSet(1,1,_21);
- sql.rsColumn(_22,"sys.oblo","a","int",32,0,_21);
- _27 := io.stdout();
- sql.exportResult(_27,_22);
+ X_2 := sql.mvc();
+ X_9:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
+ X_12 := bat.reverse(X_9);
+ X_13:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",1);
+ X_14:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",2);
+ X_16:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
+ X_18 := algebra.kdifference(X_16,X_14);
+ X_19 := algebra.kunion(X_18,X_14);
+ X_20 := algebra.kunion(X_19,X_13);
+ X_21 := algebra.kdifference(X_20,X_12);
+ X_22 := sql.resultSet(1,1,X_21);
+ 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;
#EXPLAIN select * from oblo OFFSET 2;
% .explain # table_name
@@ -153,27 +153,27 @@
% clob # type
% 0 # length
function user.s2_1{autoCommit=true}():void;
- _2 := sql.mvc();
- _11:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","oblo",1);
- _14 := bat.reverse(_11);
- _15:bat[:oid,:int] := sql.bind(_2,"sys","oblo","a",1);
- _16:bat[:oid,:int] := sql.bind(_2,"sys","oblo","a",2);
- _18:bat[:oid,:int] := sql.bind(_2,"sys","oblo","a",0);
- _20 := algebra.kdifference(_18,_16);
- _21 := algebra.kunion(_20,_16);
- _22 := algebra.kunion(_21,_15);
- _23 := algebra.kdifference(_22,_14);
- _24 := calc.wrd(nil:wrd);
- _26 := calc.wrd(2:wrd);
- _30 := calc.+(_26,_24);
- _31 := calc.-(_30,1);
- _32 := algebra.slice(_23,_26,_31);
- _33 := bat.mirror(_32);
- _34 := algebra.leftjoin(_33,_23);
- _35 := sql.resultSet(1,1,_34);
- sql.rsColumn(_35,"sys.oblo","a","int",32,0,_34);
- _41 := io.stdout();
- sql.exportResult(_41,_35);
+ X_2 := sql.mvc();
+ X_11:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
+ X_14 := bat.reverse(X_11);
+ X_15:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",1);
+ X_16:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",2);
+ X_18:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
+ X_20 := algebra.kdifference(X_18,X_16);
+ X_21 := algebra.kunion(X_20,X_16);
+ X_22 := algebra.kunion(X_21,X_15);
+ X_23 := algebra.kdifference(X_22,X_14);
+ X_24 := calc.wrd(nil:wrd);
+ X_26 := calc.wrd(2:wrd);
+ X_30 := calc.+(X_26,X_24);
+ X_31 := calc.-(X_30,1);
+ X_32 := algebra.slice(X_23,X_26,X_31);
+ X_33 := bat.mirror(X_32);
+ X_34 := algebra.leftjoin(X_33,X_23);
+ X_35 := sql.resultSet(1,1,X_34);
+ 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;
#EXPLAIN select * from oblo LIMIT 2;
% .explain # table_name
@@ -181,27 +181,27 @@
% clob # type
% 0 # length
function user.s3_1{autoCommit=true}():void;
- _2 := sql.mvc();
- _11:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","oblo",1);
- _14 := bat.reverse(_11);
- _15:bat[:oid,:int] := sql.bind(_2,"sys","oblo","a",1);
- _16:bat[:oid,:int] := sql.bind(_2,"sys","oblo","a",2);
- _18:bat[:oid,:int] := sql.bind(_2,"sys","oblo","a",0);
- _20 := algebra.kdifference(_18,_16);
- _21 := algebra.kunion(_20,_16);
- _22 := algebra.kunion(_21,_15);
- _23 := algebra.kdifference(_22,_14);
- _24 := calc.wrd(2:wrd);
- _26 := calc.wrd(0:wrd);
- _30 := calc.+(_26,_24);
- _31 := calc.-(_30,1);
- _32 := algebra.slice(_23,_26,_31);
- _33 := bat.mirror(_32);
- _34 := algebra.leftjoin(_33,_23);
- _35 := sql.resultSet(1,1,_34);
- sql.rsColumn(_35,"sys.oblo","a","int",32,0,_34);
- _41 := io.stdout();
- sql.exportResult(_41,_35);
+ X_2 := sql.mvc();
+ X_11:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
+ X_14 := bat.reverse(X_11);
+ X_15:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",1);
+ X_16:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",2);
+ X_18:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
+ X_20 := algebra.kdifference(X_18,X_16);
+ X_21 := algebra.kunion(X_20,X_16);
+ X_22 := algebra.kunion(X_21,X_15);
+ X_23 := algebra.kdifference(X_22,X_14);
+ X_24 := calc.wrd(2:wrd);
+ X_26 := calc.wrd(0:wrd);
+ X_30 := calc.+(X_26,X_24);
+ X_31 := calc.-(X_30,1);
+ X_32 := algebra.slice(X_23,X_26,X_31);
+ X_33 := bat.mirror(X_32);
+ X_34 := algebra.leftjoin(X_33,X_23);
+ X_35 := sql.resultSet(1,1,X_34);
+ 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;
#EXPLAIN select * from oblo LIMIT 1 OFFSET 2;
% .explain # table_name
@@ -209,27 +209,27 @@
% clob # type
% 0 # length
function user.s4_1{autoCommit=true}():void;
- _2 := sql.mvc();
- _11:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","oblo",1);
- _14 := bat.reverse(_11);
- _15:bat[:oid,:int] := sql.bind(_2,"sys","oblo","a",1);
- _16:bat[:oid,:int] := sql.bind(_2,"sys","oblo","a",2);
- _18:bat[:oid,:int] := sql.bind(_2,"sys","oblo","a",0);
- _20 := algebra.kdifference(_18,_16);
- _21 := algebra.kunion(_20,_16);
- _22 := algebra.kunion(_21,_15);
- _23 := algebra.kdifference(_22,_14);
- _24 := calc.wrd(1:wrd);
- _26 := calc.wrd(2:wrd);
- _30 := calc.+(_26,_24);
- _31 := calc.-(_30,1);
- _32 := algebra.slice(_23,_26,_31);
- _33 := bat.mirror(_32);
- _34 := algebra.leftjoin(_33,_23);
- _35 := sql.resultSet(1,1,_34);
- sql.rsColumn(_35,"sys.oblo","a","int",32,0,_34);
- _41 := io.stdout();
- sql.exportResult(_41,_35);
+ X_2 := sql.mvc();
+ X_11:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","oblo",1);
+ X_14 := bat.reverse(X_11);
+ X_15:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",1);
+ X_16:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",2);
+ X_18:bat[:oid,:int] := sql.bind(X_2,"sys","oblo","a",0);
+ X_20 := algebra.kdifference(X_18,X_16);
+ X_21 := algebra.kunion(X_20,X_16);
+ X_22 := algebra.kunion(X_21,X_15);
+ X_23 := algebra.kdifference(X_22,X_14);
+ X_24 := calc.wrd(1:wrd);
+ X_26 := calc.wrd(2:wrd);
+ X_30 := calc.+(X_26,X_24);
+ X_31 := calc.-(X_30,1);
+ X_32 := algebra.slice(X_23,X_26,X_31);
+ X_33 := bat.mirror(X_32);
+ X_34 := algebra.leftjoin(X_33,X_23);
+ X_35 := sql.resultSet(1,1,X_34);
+ 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;
#EXPLAIN select * from oblo LIMIT 2 OFFSET 1;
% .explain # table_name
@@ -237,27 +237,27 @@
% clob # type
% 0 # length
function user.s5_1{autoCommit=true}():void;
- _2 := sql.mvc();
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
