MonetDB: SciQL-2 - Merged with Feb2013 branch.

[Stefan Manegold]

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

Merged with Feb2013 branch.


diffs (41 lines):

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
@@ -43,7 +43,6 @@ str boxRef;
 str batstrRef;
 str batmtimeRef;
 str batmmathRef;
-str batxmlRef;
 str bbpRef;
 str tidRef;
 str deltaRef;
@@ -304,7 +303,6 @@ void optimizerInit(void){
                batstrRef = putName("batstr",6);
                batmtimeRef = putName("batmtime",8);
                batmmathRef = putName("batmmath",8);
-               batxmlRef = putName("batxml",6);
                bbpRef = putName("bbp",3);
                tidRef = putName("tid",3);
                deltaRef = putName("delta",5);
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
@@ -42,7 +42,6 @@ opt_export  str boxRef;
 opt_export  str batstrRef;
 opt_export  str batmtimeRef;
 opt_export  str batmmathRef;
-opt_export  str batxmlRef;
 opt_export  str bbpRef;
 opt_export  str tidRef;
 opt_export  str deltaRef;
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
@@ -827,7 +827,6 @@ int isMapOp(InstrPtr p){
                (getModuleId(p)== batmtimeRef) ||
                (getModuleId(p)== batstrRef) ||
                (getModuleId(p)== batmmathRef) ||
-               (getModuleId(p)== batxmlRef) ||
                (getModuleId(p)== mkeyRef);
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list