MonetDB: default - Remove history because nowadays we don't use ...

[martin kersten]

Changeset: 648ffbc94052 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/648ffbc94052
Modified Files:
        monetdb5/mal/mal_debugger.c
        monetdb5/mal/mal_instruction.c
        monetdb5/mal/mal_instruction.h
Branch: default
Log Message:

Remove history because nowadays we don't use cached queries anymore.


diffs (66 lines):

diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -1441,18 +1441,16 @@ runMALDebugger(Client cntxt, MalBlkPtr m
 {
        str oldprompt= cntxt->prompt;
        int oldtrace = cntxt->itrace;
-       int oldhist = cntxt->curprg->def->keephistory;
        str msg;
 
        cntxt->itrace = 'n';
-       cntxt->curprg->def->keephistory = TRUE;
 
        msg = runMAL(cntxt, mb, 0, 0);
 
-       cntxt->curprg->def->keephistory = oldhist;
        cntxt->prompt =oldprompt;
        cntxt->itrace = oldtrace;
        mnstr_printf(cntxt->fdout, "mdb>#EOD\n");
+       removeMalBlkHistory(mb);
        return msg;
 }
 
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
@@ -237,8 +237,10 @@ freeMalBlk(MalBlkPtr mb)
        GDKfree(mb->var);
        mb->var = 0;
 
-       if (mb->history)
+       if (mb->history){
                freeMalBlk(mb->history);
+               mb->history = NULL;
+       }
        mb->binding[0] = 0;
        mb->tag = 0;
        if (mb->help)
@@ -361,6 +363,16 @@ addtoMalBlkHistory(MalBlkPtr mb)
        }
 }
 
+void
+removeMalBlkHistory(MalBlkPtr mb)
+{
+       if(mb->history){
+               removeMalBlkHistory(mb->history);
+               freeMalBlk(mb->history);
+               mb->history = NULL;
+       }
+}
+
 MalBlkPtr
 getMalBlkHistory(MalBlkPtr mb, int idx)
 {
diff --git a/monetdb5/mal/mal_instruction.h b/monetdb5/mal/mal_instruction.h
--- a/monetdb5/mal/mal_instruction.h
+++ b/monetdb5/mal/mal_instruction.h
@@ -145,6 +145,7 @@ mal_export int prepareMalBlk(MalBlkPtr m
 mal_export void freeMalBlk(MalBlkPtr mb);
 mal_export MalBlkPtr copyMalBlk(MalBlkPtr mb);
 mal_export void addtoMalBlkHistory(MalBlkPtr mb);
+mal_export void removeMalBlkHistory(MalBlkPtr mb);
 mal_export MalBlkPtr getMalBlkHistory(MalBlkPtr mb, int idx);
 mal_export MalBlkPtr getMalBlkOptimized(MalBlkPtr mb, const char *name);
 mal_export void trimMalVariables(MalBlkPtr mb, MalStkPtr stk);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list