Changeset: d6150f3c060c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d6150f3c060c
Modified Files:
monetdb5/optimizer/opt_emptybind.c
monetdb5/optimizer/opt_matpack.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_projectionpath.c
monetdb5/optimizer/opt_support.c
Branch: default
Log Message:
Revert optimizer defense lines
The optimizerIsApplied encounters NULL instruction pointers
or doesn't find optimizer that has been called.
More search is needed
diffs (98 lines):
diff --git a/monetdb5/optimizer/opt_emptybind.c
b/monetdb5/optimizer/opt_emptybind.c
--- a/monetdb5/optimizer/opt_emptybind.c
+++ b/monetdb5/optimizer/opt_emptybind.c
@@ -45,8 +45,8 @@ OPTemptybindImplementation(Client cntxt,
str sch,tbl;
int etop= 0, esize= 256;
- if ( optimizerIsApplied(mb,"emptybind") )
- return 0;
+ //if ( optimizerIsApplied(mb,"emptybind") )
+ //return 0;
// use an instruction reference table to keep
// track of where 'emptybind' results are produced
marked = (int *) GDKzalloc(mb->vsize * sizeof(int));
diff --git a/monetdb5/optimizer/opt_matpack.c b/monetdb5/optimizer/opt_matpack.c
--- a/monetdb5/optimizer/opt_matpack.c
+++ b/monetdb5/optimizer/opt_matpack.c
@@ -24,8 +24,8 @@ OPTmatpackImplementation(Client cntxt, M
char buf[256];
lng usec = GDKusec();
- if ( !optimizerIsApplied(mb,"multiplex") )
- return 0;
+ //if ( !optimizerIsApplied(mb,"multiplex") )
+ //return 0;
(void) pci;
(void) cntxt;
(void) stk; /* to fool compilers */
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -1569,8 +1569,8 @@ OPTmergetableImplementation(Client cntxt
char buf[256];
lng usec = GDKusec();
- if( optimizerIsApplied(mb, "mergetable") ||
!optimizerIsApplied(mb,"mitosis"))
- return 0;
+ //if( optimizerIsApplied(mb, "mergetable") ||
!optimizerIsApplied(mb,"mitosis"))
+ //return 0;
old = mb->stmt;
oldtop= mb->stop;
#ifdef DEBUG_OPT_MERGETABLE
diff --git a/monetdb5/optimizer/opt_mitosis.c b/monetdb5/optimizer/opt_mitosis.c
--- a/monetdb5/optimizer/opt_mitosis.c
+++ b/monetdb5/optimizer/opt_mitosis.c
@@ -43,8 +43,8 @@ OPTmitosisImplementation(Client cntxt, M
char buf[256];
lng usec = GDKusec();
- if ( optimizerIsApplied(mb,"mitosis") )
- return 0;
+ //if ( optimizerIsApplied(mb,"mitosis") )
+ //return 0;
(void) cntxt;
(void) stk;
if (!eligible(mb))
diff --git a/monetdb5/optimizer/opt_multiplex.c
b/monetdb5/optimizer/opt_multiplex.c
--- a/monetdb5/optimizer/opt_multiplex.c
+++ b/monetdb5/optimizer/opt_multiplex.c
@@ -41,8 +41,8 @@ OPTexpandMultiplex(Client cntxt, MalBlkP
int tt;
int bat = (getModuleId(pci) == batmalRef) ;
- if ( optimizerIsApplied(mb,"multiplex"))
- return 0;
+ //if ( optimizerIsApplied(mb,"multiplex"))
+ //return 0;
(void) cntxt;
(void) stk;
for (i = 0; i < pci->retc; i++) {
diff --git a/monetdb5/optimizer/opt_projectionpath.c
b/monetdb5/optimizer/opt_projectionpath.c
--- a/monetdb5/optimizer/opt_projectionpath.c
+++ b/monetdb5/optimizer/opt_projectionpath.c
@@ -166,8 +166,8 @@ OPTprojectionpathImplementation(Client c
(void) stk;
if ( mb->inlineProp)
return 0;
- if ( optimizerIsApplied(mb,"projectionpath") )
- return 0;
+ //if ( optimizerIsApplied(mb,"projectionpath") )
+ //return 0;
#ifdef DEBUG_OPT_PROJECTIONPATH
mnstr_printf(cntxt->fdout,"#projectionpath optimizer start \n");
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -76,9 +76,7 @@ optimizerIsApplied(MalBlkPtr mb, str opt
int i;
for( i = mb->stop; i < mb->ssize; i++){
p = getInstrPtr(mb,i);
- if( p == NULL)
- return 0;
- if (getModuleId(p) == optimizerRef && p->token == REMsymbol &&
strcmp(getFunctionId(p),optname) == 0)
+ if (p && getModuleId(p) == optimizerRef && p->token ==
REMsymbol && strcmp(getFunctionId(p),optname) == 0)
return 1;
}
return 0;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
