MonetDB: default - Avoid name clash in groups optimizer

[Martin Kersten]

Changeset: 12888203a521 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=12888203a521
Modified Files:
        monetdb5/optimizer/opt_groups.mx
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
Branch: default
Log Message:

Avoid name clash in groups optimizer


diffs (51 lines):

diff --git a/monetdb5/optimizer/opt_groups.mx b/monetdb5/optimizer/opt_groups.mx
--- a/monetdb5/optimizer/opt_groups.mx
+++ b/monetdb5/optimizer/opt_groups.mx
@@ -51,7 +51,7 @@ pattern optimizer.groups(mod:str, fcn:st
 address OPTgroups
 comment "Join path constructor";
 
-pattern group.new(l:bat[:oid,:any]...)(grp:bat[:oid,:any],ext:bat[:oid,:any])
+pattern 
group.multicolumn(l:bat[:oid,:any]...)(grp:bat[:oid,:any],ext:bat[:oid,:any])
 address GRPmulticolumngroup
 comment "Derive a group index over multiple columns.";
 @h
@@ -104,7 +104,7 @@ OPTgroupsImplementation(Client cntxt, Ma
        for (i = 0; i<limit; i++){
                p= old[i];
                if (getModuleId(p) == groupRef && p->argc == 3 && 
getFunctionId(p) == newRef ){
-                               setFunctionId(p,newRef);
+                               setFunctionId(p, multicolumnsRef);
                                pc[getArg(p,0)] = i;
                                pc[getArg(p,1)] = i;
                                actions++;
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -134,6 +134,7 @@ str mitosisRef;
 str mkeyRef;
 str mmathRef;
 str multiplexRef;
+str multicolumnsRef;
 str mvcRef;
 str newRef;
 str notRef;
@@ -356,6 +357,7 @@ void optimizerInit(void){
                mkeyRef = putName("mkey", 4);
                mmathRef = putName("mmath", 5);
                multiplexRef = putName("multiplex", 9);
+               multicolumnsRef = putName("multicolumns", 12);
                mvcRef = putName("mvc", 3);
                newRef = putName("new",3);
                notRef = putName("not",3);
diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h
--- a/monetdb5/optimizer/opt_prelude.h
+++ b/monetdb5/optimizer/opt_prelude.h
@@ -133,6 +133,7 @@ opt_export  str mitosisRef;
 opt_export  str mkeyRef;
 opt_export  str mmathRef;
 opt_export  str multiplexRef;
+opt_export  str multicolumnsRef;
 opt_export  str mvcRef;
 opt_export  str newRef;
 opt_export  str notRef;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list