MonetDB: default - Removed some unused variables.

[Sjoerd Mullender]

Changeset: ebc0a151d539 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ebc0a151d539
Modified Files:
        clients/Tests/exports.stable.out
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
        monetdb5/optimizer/opt_pushselect.c
Branch: default
Log Message:

Removed some unused variables.


diffs (77 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2172,7 +2172,6 @@ str dense_rank_grpRef;
 str depositRef;
 void deriveModule(Module scope, str nme);
 malType destinationType(MalBlkPtr mb, InstrPtr p);
-str differenceRef;
 str disconnectRef;
 void displayVolume(Client cntxt, lng vol);
 str divRef;
@@ -2700,7 +2699,6 @@ int tableProp;
 str takeOid(oid id, str *val);
 str takeRef;
 str tdiffRef;
-str tdifferenceRef;
 str thetajoinRef;
 str thetasubselectRef;
 str tidRef;
@@ -2711,7 +2709,6 @@ int timestamp_tostr(str *buf, int *len, 
 int timestamp_tz_fromstr(const char *buf, int *len, timestamp **ret);
 int timestamp_tz_tostr(str *buf, int *len, const timestamp *val, const tzone 
*timezone);
 str tinterRef;
-str tintersectRef;
 int tlbProp;
 int toriginProp;
 void trimMalBlk(MalBlkPtr mb);
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
@@ -69,9 +69,6 @@ str dblRef;
 str defineRef;
 str deleteRef;
 str depositRef;
-str differenceRef;
-str tdifferenceRef;
-str tintersectRef;
 str tdiffRef;
 str tinterRef;
 str mergecandRef;
@@ -323,9 +320,6 @@ void optimizerInit(void)
        defineRef = putName("define",6);
        deleteRef = putName("delete",6);
        depositRef = putName("deposit",7);
-       differenceRef= putName("difference",10);
-       tdifferenceRef= putName("tdifference",11);
-       tintersectRef= putName("tintersect",10);
        tdiffRef= putName("tdiff",5);
        tinterRef= putName("tinter",6);
        mergecandRef= putName("mergecand",9);
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
@@ -67,9 +67,6 @@ opt_export  str dblRef;
 opt_export  str defineRef;
 opt_export  str deleteRef;
 opt_export  str depositRef;
-opt_export  str differenceRef;
-opt_export  str tdifferenceRef;
-opt_export  str tintersectRef;
 opt_export  str tdiffRef;
 opt_export  str tinterRef;
 opt_export  str mergecandRef;
diff --git a/monetdb5/optimizer/opt_pushselect.c 
b/monetdb5/optimizer/opt_pushselect.c
--- a/monetdb5/optimizer/opt_pushselect.c
+++ b/monetdb5/optimizer/opt_pushselect.c
@@ -162,8 +162,8 @@ OPTpushselectImplementation(Client cntxt
                }
 
                if (getModuleId(p) == algebraRef && 
-                       (getFunctionId(p) == tintersectRef || getFunctionId(p) 
== tinterRef || 
-                        getFunctionId(p) == tdifferenceRef || getFunctionId(p) 
== tdiffRef)) {
+                       (getFunctionId(p) == tinterRef || 
+                        getFunctionId(p) == tdiffRef)) {
                        GDKfree(vars);
                        return 0;
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list