MonetDB: default - Remove obsolete names.

[Martin Kersten]

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

Remove obsolete names.


diffs (72 lines):

diff --git a/monetdb5/optimizer/opt_emptySet.c 
b/monetdb5/optimizer/opt_emptySet.c
--- a/monetdb5/optimizer/opt_emptySet.c
+++ b/monetdb5/optimizer/opt_emptySet.c
@@ -155,8 +155,6 @@ ESevaluate(Client cntxt, MalBlkPtr mb, c
                                        if ( f == likeRef  || 
                                             f == sortRef  || 
                                             f == sortTailRef  ||
-                                            f == sortHTRef  || 
-                                            f == sortTHRef  || 
                                             f == semijoinRef ||
                                             f == fragmentRef ){
 
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
@@ -220,12 +220,9 @@ str setWriteModeRef;
 str sinkRef;
 str sliceRef;
 str subsliceRef;
-str sortHRef;
-str sortHTRef;
 str sortRef;
 str sortReverseTailRef;
 str sortTailRef;
-str sortTHRef;
 str sqlRef;
 str srvpoolRef;
 str streamsRef;
@@ -477,12 +474,9 @@ void optimizerInit(void)
        sliceRef = putName("slice",5);
        subsliceRef = putName("subslice",8);
        singleRef = putName("single",6);
-       sortHRef = putName("sortH",5);
-       sortHTRef = putName("sortHT",6);
        sortRef = putName("sort",4);
        sortReverseTailRef = putName("sortReverseTail",15);
        sortTailRef = putName("sortTail",8);
-       sortTHRef = putName("sortTH",6);
        sqlRef = putName("sql",3);
        srvpoolRef = putName("srvpool",7);
        streamsRef = putName("streams",7);
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
@@ -218,12 +218,9 @@ opt_export  str sinkRef;
 opt_export  str sliceRef;
 opt_export  str subsliceRef;
 opt_export  str singleRef;
-opt_export  str sortHRef;
-opt_export  str sortHTRef;
 opt_export  str sortRef;
 opt_export  str sortReverseTailRef;
 opt_export  str sortTailRef;
-opt_export  str sortTHRef;
 opt_export  str sqlRef;
 opt_export  str srvpoolRef;
 opt_export  str streamsRef;
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -812,10 +812,7 @@ isBlocking(InstrPtr p)
        if (blockStart(p) || blockExit(p) || blockCntrl(p))
                return TRUE;
 
-       if ( getFunctionId(p) == sortTailRef ||
-                getFunctionId(p) == sortHRef ||
-                getFunctionId(p) == sortHTRef ||
-                getFunctionId(p) == sortTHRef )
+       if ( getFunctionId(p) == sortTailRef )
                return TRUE;
 
        if( getModuleId(p) == aggrRef ||
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list