Changeset: 762d570e1511 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=762d570e1511
Modified Files:
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (55 lines):
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
@@ -36,28 +36,29 @@
% clob # type
% 0 # length
function user.s0_1{autoCommit=true}():void;
-barrier _58 := language.dataflow();
- _2 := sql.mvc();
- _10:bat[:oid,:dbl] := sql.bind(_2,"sys","tab_2826","d",0);
- _8:bat[:oid,:dbl] := sql.bind(_2,"sys","tab_2826","d",2);
- _12 := algebra.kdifference(_10,_8);
- _13 := algebra.kunion(_12,_8);
- _5:bat[:oid,:dbl] := sql.bind(_2,"sys","tab_2826","d",1);
- _14 := algebra.kunion(_13,_5);
- _15:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","tab_2826",1);
- _16 := bat.reverse(_15);
- _17 := algebra.kdifference(_14,_16);
- _18 := batcalc.flt(_17);
- _42 := batmmath.log10(_18);
- _19 := algebra.thetauselect(_42,1:flt,">");
- _21 := algebra.markT(_19,0@0:oid);
- _22 := bat.reverse(_21);
- _23 := algebra.leftjoin(_22,_14);
-exit _58;
- _24 := sql.resultSet(1,1,_23);
- sql.rsColumn(_24,"sys.tab_2826","d","double",53,0,_23);
- _30 := io.stdout();
- sql.exportResult(_30,_24);
+ X_23 := nil:bat[:oid,:dbl];
+barrier X_59 := 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_43 := batmmath.log10(X_18);
+ X_19 := algebra.thetauselect(X_43,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_59;
+ 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;
#select * from tab_2826 where func_2826(d) > 1;
% sys.tab_2826 # table_name
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
