Changeset: 93446c850c0a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=93446c850c0a
Removed Files:
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.single
Modified Files:
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.sql
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
Branch: Jul2012
Log Message:
func_iter_vs_bulk.Bug-2826: use sequential pipeline to ensure deterministic
output
also on multi-core systems
This fixes bug 3132.
diffs (111 lines):
diff --git a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.sql
b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.sql
--- a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.sql
+++ b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.sql
@@ -1,3 +1,5 @@
+-- use sequential optimizer pipeline to ensure deterministic output also on
multi-core systems
+set optimizer='sequential_pipe';
create table tab_2826 (d double);
insert into tab_2826 values (1.0),(2.0),(3.0),(4.0),(5.0);
create function func_2826(f real) returns real begin return log10(f); end;
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
@@ -35,8 +35,6 @@ Ready.
% clob # type
% 66 # length
function user.s1_1{autoCommit=true}(A0:flt):void;
- X_24 := nil:bat[:oid,:dbl];
-barrier X_57 := language.dataflow();
X_3 := sql.mvc();
X_4:bat[:oid,:dbl] := sql.bind(X_3,"sys","tab_2826","d",0);
X_9:bat[:oid,:dbl] := sql.bind(X_3,"sys","tab_2826","d",2);
@@ -48,12 +46,11 @@ barrier X_57 := language.dataflow();
X_17 := bat.reverse(X_16);
X_18 := algebra.kdifference(X_15,X_17);
X_19 := batcalc.flt(X_18);
- X_44 := batmmath.log10(X_19);
- X_20 := algebra.thetauselect(X_44,A0,">");
+ X_43 := batmmath.log10(X_19);
+ X_20 := algebra.thetauselect(X_43,A0,">");
X_22 := algebra.markT(X_20,0@0:oid);
X_23 := bat.reverse(X_22);
X_24 := algebra.leftjoin(X_23,X_18);
-exit X_57;
X_25 := sql.resultSet(1,1,X_24);
sql.rsColumn(X_25,"sys.tab_2826","d","double",53,0,X_24);
X_32 := io.stdout();
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
deleted file mode 100644
---
a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.single
+++ /dev/null
@@ -1,70 +0,0 @@
-stdout of test 'func_iter_vs_bulk.Bug-2826` in directory
'test/BugTracker-2011` itself:
-
-
-# 15:25:53 >
-# 15:25:53 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Apr2011/prefix/_/var/MonetDB"
--set mapi_open=true --set mapi_port=36720 --set monet_prompt= --trace
--forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set
mal_listing=0 ; echo ; echo Over..
-# 15:25:53 >
-
-# MonetDB 5 server v11.3.4
-# This is an unreleased version
-# Serving database 'mTests_test_BugTracker-2011', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 7.749 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:36720/
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-
-Ready.
-# SQL catalog created, loading sql scripts once
-
-
-# 15:25:53 >
-# 15:25:53 > mclient -lsql -ftest -i -e --host=rig --port=36720
-# 15:25:53 >
-
-#create table tab_2826 (d double);
-#insert into tab_2826 values (1.0),(2.0),(3.0),(4.0),(5.0);
-[ 5 ]
-#create function func_2826(f real) returns real begin return log10(f); end;
-#explain select * from tab_2826 where func_2826(d) > 1;
-% .explain # table_name
-% mal # name
-% clob # type
-% 66 # length
-function user.s1_1{autoCommit=true}(A0:flt):void;
- X_3 := sql.mvc();
- X_4:bat[:oid,:dbl] := sql.bind(X_3,"sys","tab_2826","d",0);
- X_9:bat[:oid,:dbl] := sql.bind(X_3,"sys","tab_2826","d",2);
- X_11 := algebra.kdifference(X_4,X_9);
- X_12 := algebra.kunion(X_11,X_9);
- X_13:bat[:oid,:dbl] := sql.bind(X_3,"sys","tab_2826","d",1);
- X_15 := algebra.kunion(X_12,X_13);
- X_16:bat[:oid,:oid] := sql.bind_dbat(X_3,"sys","tab_2826",1);
- X_17 := bat.reverse(X_16);
- X_18 := algebra.kdifference(X_15,X_17);
- X_19 := batcalc.flt(X_18);
- X_44 := batmmath.log10(X_19);
- X_20 := algebra.thetauselect(X_44,A0,">");
- X_22 := algebra.markT(X_20,0@0:oid);
- X_23 := bat.reverse(X_22);
- X_24 := algebra.leftjoin(X_23,X_18);
- X_25 := sql.resultSet(1,1,X_24);
- sql.rsColumn(X_25,"sys.tab_2826","d","double",53,0,X_24);
- X_32 := io.stdout();
- sql.exportResult(X_32,X_25);
-end s1_1;
-#select * from tab_2826 where func_2826(d) > 1;
-% sys.tab_2826 # table_name
-% d # name
-% double # type
-% 24 # length
-#drop function func_2826;
-#drop table tab_2826;
-
-# 15:25:53 >
-# 15:25:53 > Done.
-# 15:25:53 >
-
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
