Changeset: 53b8ba33e986 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53b8ba33e986
Modified Files:
        sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
        sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: default
Log Message:

approve test after querylog interface change


diffs (103 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
@@ -27,7 +27,7 @@ Ready.
 % .explain # table_name
 % mal # name
 % clob # type
-% 84 # length
+% 78 # length
 function user.s0_1{autoCommit=true}(A0:dbl):void;
     X_3 := sql.mvc();
     X_4:bat[:oid,:oid]  := sql.tid(X_3,"sys","sf_2596114");
@@ -46,7 +46,7 @@ end s0_1;
 % .explain # table_name
 % mal # name
 % clob # type
-% 77 # length
+% 71 # length
 function user.s1_1{autoCommit=true}():void;
     X_2 := sql.mvc();
     X_3:bat[:oid,:oid]  := sql.tid(X_2,"sys","sf_2596114");
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out 
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -23,20 +23,20 @@ Ready.
 
 Operation successful
 
-+------------------------------------------------------------------------------------+
++------------------------------------------------------------------------------+
 | mal    |
-+====================================================================================+
++==============================================================================+
 | function user.s0_1{autoCommit=true}():void;                         |
 |     X_3:bat[:oid,:str]  := bat.new(nil:oid,nil:str);                |
 |     X_2 := sql.mvc(); |
 |     X_9 := sql.bind(X_2,"sys","_tables","type",0);             |
 |     X_6:bat[:oid,:oid]  := sql.tid(X_2,"sys","_tables");       |
-|     X_62 := algebra.subselect(X_9,X_6,2:sht,2:sht,true,true,true);           
           |
+|     X_61 := algebra.subselect(X_9,X_6,2:sht,2:sht,true,true,true);           
|
 |     (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2);    |
-|     X_63 := algebra.subselect(r1_12,2:sht,2:sht,true,true,true);             
           |
+|     X_62 := algebra.subselect(r1_12,2:sht,2:sht,true,true,true);             
|
 |     X_15 := sql.bind(X_2,"sys","_tables","type",1);            |
-|     X_64 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true);          
           |
-|     X_17 := sql.subdelta(X_62,X_12,X_63,X_64);                               
           |
+|     X_63 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true);          
|
+|     X_17 := sql.subdelta(X_61,X_12,X_62,X_63);                               
|
 |     X_18 := sql.bind(X_2,"sys","_tables","name",0);                  |
 |     (X_20,r1_28) := sql.bind(X_2,"sys","_tables","name",2);          |
 |     X_22 := sql.bind(X_2,"sys","_tables","name",1);                  |
@@ -55,8 +55,8 @@ Operation successful
 |     X_45 := io.stdout();                                             |
 |     sql.exportResult(X_45,X_39);                                     |
 | end s0_1;                                                           |
-| # querylog.define("explain select \"name\" from 
\"tables\";","default_pipe",0:lng) |
-+------------------------------------------------------------------------------------+
+| # querylog.define("explain select \"name\" from \"tables\";","default_pipe") 
|
++------------------------------------------------------------------------------+
 30 rows
 
 
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
@@ -47,20 +47,20 @@ 20 rows
 
 Operation successful
 
-+--------------------------------------------------------------------------------+
++--------------------------------------------------------------------------+
 | mal                                                                 |
-+================================================================================+
++==========================================================================+
 | function user.s1_1{autoCommit=true}():void;                         |
 |     X_3:bat[:oid,:wrd]  := bat.new(nil:oid,nil:wrd);                |
 |     X_2 := sql.mvc();                                               |
 |     X_9 := sql.bind(X_2,"sys","_tables","type",0);          |
 |     X_6:bat[:oid,:oid]  := sql.tid(X_2,"sys","_tables");    |
-|     X_68 := algebra.subselect(X_9,X_6,2:sht,2:sht,true,true,true);           
       |
+|     X_67 := algebra.subselect(X_9,X_6,2:sht,2:sht,true,true,true);       |
 |     (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); |
-|     X_69 := algebra.subselect(r1_12,2:sht,2:sht,true,true,true);             
       |
+|     X_68 := algebra.subselect(r1_12,2:sht,2:sht,true,true,true);         |
 |     X_15 := sql.bind(X_2,"sys","_tables","type",1);         |
-|     X_70 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true);          
       |
-|     X_17 := sql.subdelta(X_68,X_12,X_69,X_70);                               
       |
+|     X_69 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true);      |
+|     X_17 := sql.subdelta(X_67,X_12,X_68,X_69);                           |
 |     X_18 := sql.bind(X_2,"sys","_tables","id",0);                    |
 |     (X_20,r1_28) := sql.bind(X_2,"sys","_tables","id",2);            |
 |     X_22 := sql.bind(X_2,"sys","_tables","id",1);                    |
@@ -81,8 +81,8 @@ Operation successful
 |     X_44:wrd  := aggr.sum(X_43);                                     |
 |     sql.exportValue(1,".tables","L1","wrd",64,0,6,X_44,"");          |
 | end s1_1;                                                           |
-| # querylog.define("explain select count(*) from 
tables;","default_pipe",0:lng) |
-+--------------------------------------------------------------------------------+
+| # querylog.define("explain select count(*) from tables;","default_pipe") |
++--------------------------------------------------------------------------+
 32 rows
 
 
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to