MonetDB: default - Avoid useless copy

[mk]

Changeset: e679c9ad9d25 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e679c9ad9d25
Modified Files:
        monetdb5/mal/mal_instruction.mx
Branch: default
Log Message:

Avoid useless copy


diffs (39 lines):

diff --git a/monetdb5/mal/mal_instruction.mx b/monetdb5/mal/mal_instruction.mx
--- a/monetdb5/mal/mal_instruction.mx
+++ b/monetdb5/mal/mal_instruction.mx
@@ -251,7 +251,7 @@
 mal_export int cloneVariable(MalBlkPtr dst, MalBlkPtr src, int varid);
 mal_export void renameVariable(MalBlkPtr mb, int i, str name);
 mal_export void resetVarName(MalBlkPtr mb, int i);
-mal_export void copyVariable(MalBlkPtr dst, MalBlkPtr src, VarPtr v);
+mal_export void copyVariable(MalBlkPtr dst, VarPtr v);
 mal_export void removeVariable(MalBlkPtr mb, int varid);
 mal_export int newTmpVariable(MalBlkPtr mb, malType type);
 mal_export int newTmpSink(MalBlkPtr mb, malType type);
@@ -508,11 +508,10 @@
                return NULL;
        }
        mb->vsize = old->vsize;
-       memcpy((char *) mb->var, old->var, sizeof(VarPtr) * old->vtop);
 
        mb->vtop = 0;
        for (i = 0; i < old->vtop; i++) {
-               copyVariable(mb, old, getVar(old, i));
+               copyVariable(mb, getVar(old, i));
                mb->vtop++;
        }
 
@@ -1285,12 +1284,11 @@
        }
 }
 void
-copyVariable(MalBlkPtr dst, MalBlkPtr src, VarPtr v)
+copyVariable(MalBlkPtr dst, VarPtr v)
 {
        int i;
        VarPtr w;
 
-       (void) src;             /* fool the compiler */
        assert(v->propc <= v->maxprop);
        w = (VarPtr) GDKzalloc(sizeof(VarRecord) + v->maxprop * sizeof(int));
        w->name = v->name ? GDKstrdup(v->name) : 0;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list