MonetDB: batcalc-updated - Sort and approve.

[Sjoerd Mullender]

Changeset: ea066b136e1c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ea066b136e1c
Modified Files:
        clients/Tests/exports.stable.out
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
Branch: batcalc-updated
Log Message:

Sort and approve.


diffs (89 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
@@ -2249,6 +2249,7 @@ int isFragmentGroup2(InstrPtr q);
 int isIdentifier(str s);
 int isLikeOp(InstrPtr q);
 int isLoopBarrier(MalBlkPtr mb, int pc);
+int isMap2Op(InstrPtr q);
 int isMapOp(InstrPtr q);
 int isMatJoinOp(InstrPtr q);
 int isMatLeftJoinOp(InstrPtr q);
@@ -2416,6 +2417,7 @@ int optimizerIsApplied(MalBlkPtr mb, str
 str optimizerRef;
 str optimizer_epilogue(void *ret);
 str optimizer_prelude(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str orRef;
 str pack2Ref;
 str packIncrementRef;
 str packRef;
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
@@ -39,7 +39,6 @@ str alter_typeRef;
 str alter_userRef;
 str alter_viewRef;
 str andRef;
-str orRef;
 str antijoinRef;
 str appendidxRef;
 str appendRef;
@@ -204,6 +203,7 @@ str oidRef;
 str oltpRef;
 str openRef;
 str optimizerRef;
+str orRef;
 str pack2Ref;
 str packIncrementRef;
 str packRef;
@@ -340,7 +340,6 @@ void optimizerInit(void)
        alter_userRef = putName("alter_user");
        alter_viewRef = putName("alter_view");
        andRef = putName("and");
-       orRef = putName("or");
        antijoinRef = putName("antijoin");
        appendidxRef = putName("append_idxbat");
        appendRef = putName("append");
@@ -505,6 +504,7 @@ void optimizerInit(void)
        oltpRef = putName("oltp");
        openRef = putName("open");
        optimizerRef = putName("optimizer");
+       orRef = putName("or");
        pack2Ref = putName("pack2");
        packIncrementRef = putName("packIncrement");
        packRef = putName("pack");
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
@@ -35,7 +35,6 @@ mal_export  str alter_typeRef;
 mal_export  str alter_userRef;
 mal_export  str alter_viewRef;
 mal_export  str andRef;
-mal_export  str orRef;
 mal_export  str antijoinRef;
 mal_export  str appendidxRef;
 mal_export  str appendRef;
@@ -75,6 +74,7 @@ mal_export  str columnRef;
 mal_export  str comment_onRef;
 mal_export  str commitRef;
 mal_export  str connectRef;
+mal_export  str contextRef;
 mal_export  str copy_fromRef;
 mal_export  str copyRef;
 mal_export  str count_no_nilRef;
@@ -119,7 +119,6 @@ mal_export  str drop_viewRef;
 mal_export  str emptybindidxRef;
 mal_export  str emptybindRef;
 mal_export  str eqRef;
-mal_export  str contextRef;
 mal_export  str evalRef;
 mal_export  str execRef;
 mal_export  str expandRef;
@@ -203,6 +202,7 @@ mal_export  str oidRef;
 mal_export  str oltpRef;
 mal_export  str openRef;
 mal_export  str optimizerRef;
+mal_export  str orRef;
 mal_export  str pack2Ref;
 mal_export  str packIncrementRef;
 mal_export  str packRef;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list