Changeset: 44bf171a05c6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=44bf171a05c6
Modified Files:
monetdb5/optimizer/opt_constants.mx
monetdb5/optimizer/opt_mitosis.mx
monetdb5/optimizer/opt_pipes.mx
sql/test/BugTracker-2010/Tests/All
sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.sql
sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.err
sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.out
Branch: default
Log Message:
Fixing the constants optimizer
The parser or optimizers may introduce duplicate constants.
Filtering them out may help trap some identical instructions with the
commonTerms
optimizer later on.
diffs (177 lines):
diff --git a/monetdb5/optimizer/opt_constants.mx
b/monetdb5/optimizer/opt_constants.mx
--- a/monetdb5/optimizer/opt_constants.mx
+++ b/monetdb5/optimizer/opt_constants.mx
@@ -62,9 +62,9 @@
OPTDEBUGconstants mnstr_printf(cntxt->fdout,"#OPT_CONSTANTS: MATCHING
CONSTANTS ELEMENTS\n");
- alias= (int*) GDKmalloc(sizeof(int) * mb->vtop);
- cst= (VarPtr*) GDKmalloc(sizeof(VarPtr) * mb->vtop);
- index= (int*) GDKmalloc(sizeof(int) * mb->vtop);
+ alias= (int*) GDKzalloc(sizeof(int) * mb->vtop);
+ cst= (VarPtr*) GDKzalloc(sizeof(VarPtr) * mb->vtop);
+ index= (int*) GDKzalloc(sizeof(int) * mb->vtop);
if ( alias == NULL || cst == NULL || index == NULL){
if( alias) GDKfree(alias);
@@ -76,15 +76,17 @@
(void) stk;
(void) cntxt;
- for (i=0; i< getInstrPtr(mb,0)->argc; i++)
- alias[i]=i;
- for (; i< mb->vtop; i++)
- if ( isVarConstant(mb,i) ){
- x= getVar(mb,i); fnd = 0;
+ for (i=0; i< mb->vtop; i++)
+ alias[ i]= i;
+ for (i=0; i< mb->vtop; i++)
+ if ( isVarConstant(mb,i) && isVarFixed(mb,i) ){
+ x= getVar(mb,i);
+ fnd = 0;
+ if ( x->type && x->value.vtype)
for( k= n-1; k>=0; k--){
y= cst[k];
- if ( x->type && x->type == y->type &&
- x->value.vtype && x->value.vtype ==
y->value.vtype &&
+ if ( x->type == y->type &&
+ x->value.vtype == y->value.vtype &&
ATOMcmp(x->value.vtype,
VALget(&x->value), VALget(&y->value)) == 0){
OPTDEBUGconstants {
mnstr_printf(cntxt->fdout,"#opt_constants: matching elements %s %d %d ",
getVarName(mb,i), i,k);
@@ -102,11 +104,9 @@
OPTDEBUGconstants
mnstr_printf(cntxt->fdout,"swith elements %d %d\n", i,n);
cst[n]= x;
index[n]= i;
- alias[i]= index[n];
n++;
}
- } else
- alias[i]=i;
+ }
for (i = 0; i < mb->stop; i++){
p= getInstrPtr(mb,i);
diff --git a/monetdb5/optimizer/opt_mitosis.mx
b/monetdb5/optimizer/opt_mitosis.mx
--- a/monetdb5/optimizer/opt_mitosis.mx
+++ b/monetdb5/optimizer/opt_mitosis.mx
@@ -155,7 +155,7 @@
/* ensure that GDKnr_threads partitions fit into main memory */
r = (BUN) (monet_memory / typewidth / threads);
if (rowcnt > r)
- pieces = (int) MAX ( (rowcnt / r + 1) , (wrd) threads );
+ pieces = (int) MAX ( (rowcnt / r ? rowcnt/r :1) ,
(wrd) threads );
else
/* exploit parallelism, but ensure minimal partition size to
limit overhead */
if (rowcnt > MINPARTCNT)
diff --git a/monetdb5/optimizer/opt_pipes.mx b/monetdb5/optimizer/opt_pipes.mx
--- a/monetdb5/optimizer/opt_pipes.mx
+++ b/monetdb5/optimizer/opt_pipes.mx
@@ -55,7 +55,7 @@
* The default pipe line contains as of Feb2010 mitosis-mergetable-reorder,
* aimed at large tables and improved access locality
*/
-{ "default_pipe",
"inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector"
},
+{ "default_pipe",
"inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector"
},
/*
* The no_mitosis pipe line is (and should be kept!) identical to the default
pipeline,
diff --git a/sql/test/BugTracker-2010/Tests/All
b/sql/test/BugTracker-2010/Tests/All
--- a/sql/test/BugTracker-2010/Tests/All
+++ b/sql/test/BugTracker-2010/Tests/All
@@ -86,3 +86,4 @@
vacuum
with-between.Bug-2732
sequence-restart-with-null.Bug-2648
+constants-optimizer.Bug-2317.sql
diff --git a/sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.sql
b/sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.sql
@@ -0,0 +1,3 @@
+-- following gave a crash when constants optimizer was set.
+create table x( id serial, a varchar(1000));
+drop table x;
diff --git
a/sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.err
b/sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.err
@@ -0,0 +1,39 @@
+stderr of test 'constants-optimizer.Bug-2317` in directory
'test/BugTracker-2010` itself:
+
+
+# 00:10:51 >
+# 00:10:51 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/ufs/mk/current//Linux/var/MonetDB" --set mapi_open=true --set
mapi_port=37160 --set monet_prompt= --trace --forcemito --set mal_listing=2
"--dbname=mTests_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo Over..
+# 00:10:51 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = /ufs/mk/current//Linux/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_dbfarm = /ufs/mk/current//Linux/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 37160
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2010
+# cmdline opt mal_listing = 0
+
+# 00:10:51 >
+# 00:10:51 > mclient -lsql -ftest -i -e --host=eir --port=37160
+# 00:10:51 >
+
+
+# 00:10:51 >
+# 00:10:51 > Done.
+# 00:10:51 >
+
diff --git
a/sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.out
b/sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2010/Tests/constants-optimizer.Bug-2317.stable.out
@@ -0,0 +1,34 @@
+stdout of test 'constants-optimizer.Bug-2317` in directory
'test/BugTracker-2010` itself:
+
+
+# 00:10:51 >
+# 00:10:51 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/ufs/mk/current//Linux/var/MonetDB" --set mapi_open=true --set
mapi_port=37160 --set monet_prompt= --trace --forcemito --set mal_listing=2
"--dbname=mTests_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo Over..
+# 00:10:51 >
+
+# MonetDB 5 server v11.4.0
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2010', 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-2011 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37160/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+Over..
+
+# 00:10:51 >
+# 00:10:51 > mclient -lsql -ftest -i -e --host=eir --port=37160
+# 00:10:51 >
+
+#create table x( id serial, a varchar(1000));
+#drop table x;
+
+# 00:10:51 >
+# 00:10:51 > Done.
+# 00:10:51 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
