Changeset: 048406a43fbf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=048406a43fbf
Modified Files:
monetdb5/mal/mal_instruction.c
monetdb5/optimizer/opt_deadcode.c
monetdb5/optimizer/opt_reduce.c
Branch: iot
Log Message:
Merge with default
diffs (56 lines):
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -1088,9 +1088,7 @@ freeVariable(MalBlkPtr mb, int varid)
/* A special action is to reduce the variable space by removing all
* that do not contribute.
- * Beware that properties are represented as variables as well. They
- * must be retained and the references must be corrected after the
- * stack has been reduced. */
+ */
void
trimMalVariables_(MalBlkPtr mb, bit *used, MalStkPtr glb)
{
diff --git a/monetdb5/optimizer/opt_deadcode.c
b/monetdb5/optimizer/opt_deadcode.c
--- a/monetdb5/optimizer/opt_deadcode.c
+++ b/monetdb5/optimizer/opt_deadcode.c
@@ -105,11 +105,12 @@ OPTdeadcodeImplementation(Client cntxt,
GDKfree(old);
GDKfree(varused);
/* Defense line against incorrect plans */
- if( actions > 0){
- chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
+ /* we don't create or change existing structures */
+ //if( actions > 0){
+ //chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
chkFlow(cntxt->fdout, mb);
- chkDeclarations(cntxt->fdout, mb);
- }
+ //chkDeclarations(cntxt->fdout, mb);
+ //}
/* keep all actions taken as a post block comment */
snprintf(buf,256,"%-20s actions=%2d time=" LLFMT "
usec","deadcode",actions, GDKusec() - usec);
newComment(mb,buf);
diff --git a/monetdb5/optimizer/opt_reduce.c b/monetdb5/optimizer/opt_reduce.c
--- a/monetdb5/optimizer/opt_reduce.c
+++ b/monetdb5/optimizer/opt_reduce.c
@@ -25,11 +25,13 @@ OPTreduceImplementation(Client cntxt, Ma
actions = actions - mb->vtop;
/* Defense line against incorrect plans */
- if( actions > 0){
- chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
- chkFlow(cntxt->fdout, mb);
- chkDeclarations(cntxt->fdout, mb);
- }
+ /* plan is not changed */
+ /* plan is not changed */
+ //if( actions > 0){
+ //chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
+ //chkFlow(cntxt->fdout, mb);
+ //chkDeclarations(cntxt->fdout, mb);
+ //}
/* keep all actions taken as a post block comment */
snprintf(buf,256,"%-20s actions=%2d time=" LLFMT "
usec","reduce",actions,GDKusec() - usec);
newComment(mb,buf);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
