Changeset: cc206e92ebdb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc206e92ebdb
Modified Files:
MonetDB5/src/optimizer/opt_dataflow.mx
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
merged bug fixes and test from Jun2010
diffs (truncated from 308 to 300 lines):
diff -r e3e3d12993a9 -r cc206e92ebdb MonetDB5/src/optimizer/opt_dataflow.mx
--- a/MonetDB5/src/optimizer/opt_dataflow.mx Tue Jul 27 11:19:28 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_dataflow.mx Tue Jul 27 20:08:17 2010 +0200
@@ -90,6 +90,19 @@
#include "mal_interpreter.h"
static int
+dflowAssignTest(Lifespan span, InstrPtr p, int i)
+{
+ int j;
+ /* flow blocks should be closed (and not opened) when we reach a point
+ where a variable is assigned that is not the last
+ */
+ for(j=0; j<p->retc; j++)
+ if (getLastUpdate(span, getArg(p,j)) != i)
+ return 1;
+ return 0;
+}
+
+static int
OPTdataflowImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p)
{
int i,j, cnt, start=1,entries=0, actions=0;
@@ -141,7 +154,7 @@
if (p->token == ENDsymbol)
break;
- if (hasSideEffects(p,TRUE) || isUnsafeFunction(p) ||
blockCntrl(p) || (!dumbcopy && blockExit(p))){
+ if (hasSideEffects(p,TRUE) || isUnsafeFunction(p) ||
blockCntrl(p) || (!dumbcopy && blockExit(p)) || dflowAssignTest(span,p,i) ){
@:flowblock@
pushInstruction(mb,p);
continue;
@@ -175,6 +188,9 @@
for(j=p->retc; j<p->argc; j++)
if (getLastUpdate(span, getArg(p,j)) <= start)
cnt++;
+ if ( dflowAssignTest(span,p,i))
+ cnt = 0;
+
if (cnt && cnt == p->argc-p->retc)
entries++;
}
diff -r e3e3d12993a9 -r cc206e92ebdb sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All Tue Jul 27 11:19:28 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/All Tue Jul 27 20:08:17 2010 +0200
@@ -36,3 +36,4 @@
error-truncated.Bug-2615
LIMIT_OFFSET_big-endian.Bug-2622
decimal-function.BUG-2624
+function_results_NULL.Bug-2626
diff -r e3e3d12993a9 -r cc206e92ebdb
sql/src/test/BugTracker-2010/Tests/function_results_NULL.Bug-2626.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/function_results_NULL.Bug-2626.sql
Tue Jul 27 20:08:17 2010 +0200
@@ -0,0 +1,129 @@
+CREATE SEQUENCE "seq_frequencybands" AS INTEGER;
+
+CREATE TABLE frequencybands (
+ freqbandid INT NOT NULL DEFAULT NEXT VALUE FOR "seq_frequencybands",
+ freq_low DOUBLE DEFAULT NULL,
+ freq_high DOUBLE DEFAULT NULL,
+ PRIMARY KEY (freqbandid)
+);
+
+INSERT INTO frequencybands
+ (freq_low
+ ,freq_high
+ )
+VALUES
+ (30000000 - 900000 / 2
+ ,30000000 + 900000 / 2
+ )
+ ,
+ (34000000 - 960000 / 2
+ ,34000000 + 960000 / 2
+ )
+ ,
+ (38000000 - 1040000 / 2
+ ,38000000 + 1040000 / 2
+ )
+ ,
+ (42000000 - 1100000 / 2
+ ,42000000 + 1100000 / 2
+ )
+ ,
+ (120000000 - 350000 / 2
+ ,120000000 + 350000 / 2
+ )
+ ,
+ (130000000 - 450000 / 2
+ ,130000000 + 450000 / 2
+ )
+ ,
+ (140000000 - 550000 / 2
+ ,140000000 + 550000 / 2
+ )
+ ,
+ (150000000 - 700000 / 2
+ ,150000000 + 700000 / 2
+ )
+ ,
+ (160000000 - 850000 / 2
+ ,160000000 + 850000 / 2
+ )
+ ,
+ (170000000 - 1100000 / 2
+ ,170000000 + 1100000 / 2
+ )
+ ,
+ (350000000 - 100000000 / 2
+ ,350000000 + 100000000 / 2
+ )
+ ,
+ (640000000 - 100000000 / 2
+ ,640000000 + 100000000 / 2
+ )
+ ,
+ (850000000 - 100000000 / 2
+ ,850000000 + 100000000 / 2
+ )
+ ,
+ (1400000000 - 260000000 / 2
+ ,1400000000 + 260000000 / 2
+ )
+ ,
+ (2300000000 - 250000000 / 2
+ ,2300000000 + 250000000 / 2
+ )
+ ,
+ (4800000000 - 250000000 / 2
+ ,4800000000 + 250000000 / 2
+ )
+ ,
+ (8500000000 - 250000000 / 2
+ ,8500000000 + 250000000 / 2
+ )
+ ;
+
+CREATE FUNCTION getBand(ifreq_eff DOUBLE) RETURNS INT
+BEGIN
+
+ DECLARE nfreqbandid, ifreqbandid, ofreqbandid INT;
+ DECLARE ibandwidth DOUBLE;
+
+ /* For now, we default the bandwidth of a new band to 10MHz */
+ SET ibandwidth = 10000000;
+
+ set nfreqbandid = (
+ SELECT COUNT(*)
+ FROM frequencybands
+ WHERE freq_low <= ifreq_eff
+ AND freq_high >= ifreq_eff
+ );
+
+ IF nfreqbandid = 1 THEN
+ set ifreqbandid = ( SELECT freqbandid
+ FROM frequencybands
+ WHERE freq_low <= ifreq_eff
+ AND freq_high >= ifreq_eff
+ ) ;
+ ELSE
+ set ifreqbandid = (SELECT NEXT VALUE FOR seq_frequencybands);
+ INSERT INTO frequencybands
+ (freqbandid
+ ,freq_low
+ ,freq_high
+ ) VALUES
+ (ifreqbandid
+ ,ifreq_eff - (ibandwidth / 2)
+ ,ifreq_eff + (ibandwidth / 2)
+ )
+ ;
+ END IF;
+
+ SET ofreqbandid = ifreqbandid;
+ RETURN ofreqbandid;
+
+END;
+
+select getBand(300000000.0);
+
+drop function getBand;
+drop table frequencybands;
+-- drop sequence "seq_frequencybands";
diff -r e3e3d12993a9 -r cc206e92ebdb
sql/src/test/BugTracker-2010/Tests/function_results_NULL.Bug-2626.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/function_results_NULL.Bug-2626.stable.err
Tue Jul 27 20:08:17 2010 +0200
@@ -0,0 +1,78 @@
+stderr of test 'function_results_NULL.Bug-2626` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 19:45:02 >
+# 19:45:02 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=1 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=33097 --set
xrpc_port=44416 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 19:45:02 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.4
+# builtin opt prefix =
/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${exec_prefix}/lib64/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 50000
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix =
/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix =
/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${exec_prefix}/lib64/MonetDB5:${exec_prefix}/lib64/MonetDB5/lib:${exec_prefix}/lib64/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt sql_optimizer = default_pipe
+# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,derivePath,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt dictionary_pipe =
inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt compression_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,compression,dataflow,history,multiplex,garbageCollector
+# cmdline opt config =
/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 1
+# cmdline opt monet_mod_path =
/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin
+# cmdline opt gdk_dbfarm =
/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 33097
+# cmdline opt xrpc_port = 44416
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2010
+# cmdline opt mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see
/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf)
+
+# 19:45:02 >
+# 19:45:02 > mclient -lsql -ftest -i -e --host=rig --port=33097
+# 19:45:02 >
+
+
+# 19:45:02 >
+# 19:45:02 > Done.
+# 19:45:02 >
+
diff -r e3e3d12993a9 -r cc206e92ebdb
sql/src/test/BugTracker-2010/Tests/function_results_NULL.Bug-2626.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/function_results_NULL.Bug-2626.stable.out
Tue Jul 27 20:08:17 2010 +0200
@@ -0,0 +1,39 @@
+stdout of test 'function_results_NULL.Bug-2626` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 19:45:02 >
+# 19:45:02 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=1 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=33097 --set
xrpc_port=44416 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 19:45:02 >
+
+# MonetDB server v5.20.4, based on kernel v1.38.4
+# Not released
+# Serving database 'mTests_src_test_BugTracker-2010', using 1 thread
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.751 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2010 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:33097/
+# MonetDB/SQL module v2.38.4 loaded
+# MonetDB/GIS module v0.18.4 loaded
+
+Ready.
+
+Over..
+
+# 19:45:02 >
+# 19:45:02 > mclient -lsql -ftest -i -e --host=rig --port=33097
+# 19:45:02 >
+
+[ 17 ]
+#select getBand(300000000.0);
+% . # table_name
+% getband_single_value # name
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
