Changeset: 12751a4640cf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=12751a4640cf
Modified Files:
        monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
        
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
        sql/test/mapi/Tests/sql_int128.test
Branch: default
Log Message:

Approve


diffs (190 lines):

diff --git 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -24,8 +24,8 @@ function user.main():void;
     X_88:ptr := sql.append_exec(X_85:ptr, X_28:bat[:int]);
     X_91:ptr := sql.append_exec(X_90:ptr, X_29:bat[:int]);
     X_94:ptr := sql.append_exec(X_93:ptr, X_30:bat[:int]);
+    X_40:int := sql.append_finish(X_86:int, X_88:ptr, X_91:ptr, X_94:ptr);
     X_42:lng := aggr.count(X_30:bat[:int]);
-    X_40:int := sql.append_finish(X_86:int, X_88:ptr, X_91:ptr, X_94:ptr);
     sql.affectedRows(X_40:int, X_42:lng);
 end user.main;
 #inline               actions= 0 time=1 usec 
@@ -87,8 +87,8 @@ function user.main():void;
     X_89:ptr := sql.append_exec(X_86:ptr, X_28:bat[:int]);
     X_92:ptr := sql.append_exec(X_91:ptr, X_29:bat[:int]);
     X_95:ptr := sql.append_exec(X_94:ptr, X_30:bat[:int]);
+    X_40:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr);
     X_42:lng := aggr.count(X_30:bat[:int]);
-    X_40:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr);
     sql.affectedRows(X_40:int, X_42:lng);
 end user.main;
 #inline               actions= 0 time=0 usec 
diff --git 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
--- 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++ 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -25,8 +25,8 @@ function user.main():void;
     X_88:ptr := sql.append_exec(X_85:ptr, X_28:bat[:int]);
     X_91:ptr := sql.append_exec(X_90:ptr, X_29:bat[:int]);
     X_94:ptr := sql.append_exec(X_93:ptr, X_30:bat[:int]);
+    X_40:int := sql.append_finish(X_86:int, X_88:ptr, X_91:ptr, X_94:ptr);
     X_42:lng := aggr.count(X_30:bat[:int]);
-    X_40:int := sql.append_finish(X_86:int, X_88:ptr, X_91:ptr, X_94:ptr);
     sql.affectedRows(X_40:int, X_42:lng);
 end user.main;
 #inline               actions= 0 time=0 usec 
@@ -68,8 +68,8 @@ function user.main():void;
     X_88:ptr := sql.append_exec(X_85:ptr, X_28:bat[:int]);
     X_91:ptr := sql.append_exec(X_90:ptr, X_29:bat[:int]);
     X_94:ptr := sql.append_exec(X_93:ptr, X_30:bat[:int]);
+    X_40:int := sql.append_finish(X_86:int, X_88:ptr, X_91:ptr, X_94:ptr);
     X_42:lng := aggr.count(X_30:bat[:int]);
-    X_40:int := sql.append_finish(X_86:int, X_88:ptr, X_91:ptr, X_94:ptr);
     sql.affectedRows(X_40:int, X_42:lng);
 end user.main;
 #inline               actions= 0 time=1 usec 
@@ -128,8 +128,8 @@ function user.main():void;
     X_89:ptr := sql.append_exec(X_86:ptr, X_28:bat[:int]);
     X_92:ptr := sql.append_exec(X_91:ptr, X_29:bat[:int]);
     X_95:ptr := sql.append_exec(X_94:ptr, X_30:bat[:int]);
+    X_40:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr);
     X_42:lng := aggr.count(X_30:bat[:int]);
-    X_40:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr);
     sql.affectedRows(X_40:int, X_42:lng);
 end user.main;
 #inline               actions= 0 time=0 usec 
@@ -172,8 +172,8 @@ function user.main():void;
     X_89:ptr := sql.append_exec(X_86:ptr, X_28:bat[:int]);
     X_92:ptr := sql.append_exec(X_91:ptr, X_29:bat[:int]);
     X_95:ptr := sql.append_exec(X_94:ptr, X_30:bat[:int]);
+    X_40:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr);
     X_42:lng := aggr.count(X_30:bat[:int]);
-    X_40:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr);
     sql.affectedRows(X_40:int, X_42:lng);
 end user.main;
 #inline               actions= 0 time=0 usec 
diff --git a/sql/test/mapi/Tests/sql_int128.test 
b/sql/test/mapi/Tests/sql_int128.test
--- a/sql/test/mapi/Tests/sql_int128.test
+++ b/sql/test/mapi/Tests/sql_int128.test
@@ -16,18 +16,18 @@ querylog.define
 1
 sql.mvc
 1
-sql.update_prep
-1
 sql.tid
 1
 algebra.project
 1
+sql.update_prep
+1
 sql.update_exec
 1
+sql.append_finish
+1
 aggr.count
 1
-sql.append_finish
-1
 sql.affectedRows
 1
 
@@ -40,18 +40,18 @@ querylog.define
 1
 sql.mvc
 1
-sql.update_prep
-1
 sql.tid
 1
 algebra.project
 1
+sql.update_prep
+1
 sql.update_exec
 1
+sql.append_finish
+1
 aggr.count
 1
-sql.append_finish
-1
 sql.affectedRows
 1
 
@@ -64,20 +64,20 @@ querylog.define
 1
 sql.mvc
 1
-sql.update_prep
-1
 sql.tid
 1
 sql.bind
 2
 algebra.projection
 2
+sql.update_prep
+1
 sql.update_exec
 1
+sql.append_finish
+1
 aggr.count
 1
-sql.append_finish
-1
 sql.affectedRows
 1
 
@@ -90,20 +90,20 @@ querylog.define
 1
 sql.mvc
 1
-sql.update_prep
-1
 sql.tid
 1
 sql.bind
 2
 algebra.projection
 2
+sql.update_prep
+1
 sql.update_exec
 1
+sql.append_finish
+1
 aggr.count
 1
-sql.append_finish
-1
 sql.affectedRows
 1
 
@@ -116,20 +116,20 @@ querylog.define
 1
 sql.mvc
 1
-sql.update_prep
-1
 sql.tid
 1
 sql.bind
 2
 algebra.projection
 2
+sql.update_prep
+1
 sql.update_exec
 1
+sql.append_finish
+1
 aggr.count
 1
-sql.append_finish
-1
 sql.affectedRows
 1
 
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to