Changeset: 236e4049396c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/236e4049396c
Modified Files:
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
Branch: geo-update-dev
Log Message:
Added rtree function ID to optimizers, removed mitosis/mergetable optimizers on
rtree functions.
diffs (44 lines):
diff --git a/monetdb5/optimizer/opt_mitosis.c b/monetdb5/optimizer/opt_mitosis.c
--- a/monetdb5/optimizer/opt_mitosis.c
+++ b/monetdb5/optimizer/opt_mitosis.c
@@ -69,6 +69,10 @@ OPTmitosisImplementation(Client cntxt, M
goto bailout;
}
+ /* rtree functions should not be optimized by mitosis
(single-threaded execution) */
+ if ( getModuleId(p) == rtreeRef)
+ goto bailout;
+
/* do not split up floating point bat that is being summed */
if (p->retc == 1 &&
(((p->argc == 5 || p->argc == 6) &&
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
@@ -266,6 +266,7 @@ const char *rollbackRef;
const char *row_numberRef;
const char *rpcRef;
const char *rsColumnRef;
+const char *rtreeRef;
const char *sampleRef;
const char *schedulerRef;
const char *selectNotNilRef;
@@ -584,6 +585,7 @@ void optimizerInit(void)
row_numberRef = putName("row_number");
rpcRef = putName("rpc");
rsColumnRef = putName("rsColumn");
+ rtreeRef = putName("rtree");
sampleRef= putName("sample");
schedulerRef = putName("scheduler");
selectNotNilRef = putName("selectNotNil");
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
@@ -264,6 +264,7 @@ mal_export const char *rollbackRef;
mal_export const char *row_numberRef;
mal_export const char *rpcRef;
mal_export const char *rsColumnRef;
+mal_export const char *rtreeRef;
mal_export const char *sampleRef;
mal_export const char *schedulerRef;
mal_export const char *selectNotNilRef;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
