Changeset: 9bdf251461bb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9bdf251461bb
Modified Files:
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
Branch: Aug2018
Log Message:
Merged with Mar2018 branch.
diffs (truncated from 597 to 300 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
@@ -15,6 +15,7 @@
#include "opt_prelude.h"
#include "optimizer_private.h"
+/* ! please keep this list sorted for easier maintenance ! */
str abortRef;
str actionRef;
str affectedRowsRef;
@@ -47,6 +48,7 @@ str bandjoinRef;
str basketRef;
str batalgebraRef;
str batcalcRef;
+str batcapiRef;
str batmalRef;
str batmmathRef;
str batmtimeRef;
@@ -67,6 +69,7 @@ str blockRef;
str bpmRef;
str bstreamRef;
str calcRef;
+str capiRef;
str catalogRef;
str clear_tableRef;
str closeRef;
@@ -99,6 +102,7 @@ str defineRef;
str deleteRef;
str deltaRef;
str dense_rankRef;
+str dense_rankRef;
str differenceRef;
str diffRef;
str disconnectRef;
@@ -132,9 +136,9 @@ str grant_functionRef;
str grantRef;
str grant_rolesRef;
str groupbyRef;
+str group_concatRef;
str groupdoneRef;
str groupRef;
-str group_concatRef;
str hashRef;
str hgeRef;
str identityRef;
@@ -216,14 +220,10 @@ str pyapimapRef;
str pyapiRef;
str querylogRef;
str queryRef;
-str capiRef;
-str batcapiRef;
-str subeval_aggrRef;
-str rankRef;
-str dense_rankRef;
str raiseRef;
str rangejoinRef;
str rankRef;
+str rankRef;
str rapiRef;
str reconnectRef;
str refineRef;
@@ -272,6 +272,7 @@ str subcountRef;
str subdeltaRef;
str subdiffRef;
str subeval_aggrRef;
+str subeval_aggrRef;
str subgroupdoneRef;
str subgroupRef;
str subinterRef;
@@ -304,229 +305,220 @@ str vectorRef;
str wlcRef;
str wlrRef;
str zero_or_oneRef;
+/* ! please keep this list sorted for easier maintenance ! */
void optimizerInit(void)
{
+/* ! please keep this list sorted for easier maintenance ! */
abortRef = putName("abort");
actionRef = putName("action");
affectedRowsRef = putName("affectedRows");
aggrRef = putName("aggr");
alarmRef = putName("alarm");
algebraRef = putName("algebra");
- andRef = putName("and");
- appendidxRef = putName("append_idxbat");
- appendRef = putName("append");
- assertRef = putName("assert");
- attachRef = putName("attach");
+ alter_add_tableRef = putName("alter_add_table");
+ alter_constraintRef = putName("alter_constraint");
+ alter_del_tableRef = putName("alter_del_table");
+ alter_functionRef = putName("alter_function");
+ alter_indexRef = putName("alter_index");
+ alter_roleRef = putName("alter_role");
+ alter_schemaRef = putName("alter_schema");
alter_seqRef = putName("alter_seq");
- alter_schemaRef = putName("alter_schema");
- alter_viewRef = putName("alter_view");
+ alter_set_tableRef = putName("alter_set_table");
alter_tableRef = putName("alter_table");
- alter_constraintRef = putName("alter_constraint");
+ alter_triggerRef = putName("alter_trigger");
alter_typeRef = putName("alter_type");
alter_userRef = putName("alter_user");
- alter_roleRef = putName("alter_role");
alter_userRef = putName("alter_user");
- alter_indexRef = putName("alter_index");
- alter_functionRef = putName("alter_function");
- alter_triggerRef = putName("alter_trigger");
- alter_add_tableRef = putName("alter_add_table");
- alter_del_tableRef = putName("alter_del_table");
- alter_set_tableRef = putName("alter_set_table");
+ alter_viewRef = putName("alter_view");
+ andRef = putName("and");
+ antijoinRef = putName("antijoin");
+ appendidxRef = putName("append_idxbat");
+ appendRef = putName("append");
+ arrayRef = putName("array");
+ assertRef = putName("assert");
+ attachRef = putName("attach");
avgRef = putName("avg");
- arrayRef = putName("array");
- batRef = putName("bat");
+ bandjoinRef = putName("bandjoin");
+ basketRef = putName("basket");
batalgebraRef = putName("batalgebra");
batcalcRef = putName("batcalc");
- basketRef = putName("basket");
- batstrRef = putName("batstr");
+ batcapiRef = putName("batcapi");
+ batmalRef = putName("batmal");
+ batmmathRef = putName("batmmath");
batmtimeRef = putName("batmtime");
- batmmathRef = putName("batmmath");
+ batpyapi3Ref = putName("batpyapi3");
+ batpyapiRef = putName("batpyapi");
+ batrapiRef = putName("batrapi");
+ batRef = putName("bat");
+ batsqlRef = putName("batsql");
+ batstrRef = putName("batstr");
batxmlRef = putName("batxml");
- batsqlRef = putName("batsql");
+ bbpRef = putName("bbp");
betweenRef = putName("between");
betweensymmetricRef = putName("betweensymmetric");
- blockRef = putName("block");
- bbpRef = putName("bbp");
- tidRef = putName("tid");
- deltaRef = putName("delta");
- subdeltaRef = putName("subdelta");
- projectdeltaRef = putName("projectdelta");
binddbatRef = putName("bind_dbat");
bindidxRef = putName("bind_idxbat");
bindRef = putName("bind");
- emptybindRef = putName("emptybind");
- emptybindidxRef = putName("emptybindidx");
+ blockRef = putName("block");
bpmRef = putName("bpm");
bstreamRef = putName("bstream");
calcRef = putName("calc");
+ capiRef = putName("capi");
catalogRef = putName("catalog");
clear_tableRef = putName("clear_table");
closeRef = putName("close");
+ columnBindRef = putName("columnBind");
columnRef = putName("column");
- columnBindRef = putName("columnBind");
comment_onRef = putName("comment_on");
commitRef = putName("commit");
connectRef = putName("connect");
- countRef = putName("count");
- subcountRef = putName("subcount");
+ copy_fromRef = putName("copy_from");
copyRef = putName("copy");
- copy_fromRef = putName("copy_from");
- export_tableRef = putName("export_table");
count_no_nilRef = putName("count_no_nil");
- crossRef = putName("crossproduct");
+ countRef = putName("count");
+ create_constraintRef = putName("create_constraint");
+ create_functionRef = putName("create_function");
+ create_indexRef = putName("create_index");
createRef = putName("create");
- create_seqRef = putName("create_seq");
+ create_roleRef = putName("create_role");
create_schemaRef = putName("create_schema");
- create_viewRef = putName("create_view");
+ create_seqRef = putName("create_seq");
create_tableRef = putName("create_table");
- create_constraintRef = putName("create_constraint");
+ create_triggerRef = putName("create_trigger");
create_typeRef = putName("create_type");
create_userRef = putName("create_user");
- create_roleRef = putName("create_role");
create_userRef = putName("create_user");
- create_indexRef = putName("create_index");
- create_functionRef = putName("create_function");
- create_triggerRef = putName("create_trigger");
+ create_viewRef = putName("create_view");
+ crossRef = putName("crossproduct");
+ dataflowRef = putName("dataflow");
dateRef = putName("date");
- dataflowRef = putName("dataflow");
dblRef = putName("dbl");
defineRef = putName("define");
deleteRef = putName("delete");
+ deltaRef = putName("delta");
+ dense_rankRef = putName("dense_rank");
differenceRef = putName("difference");
- intersectRef = putName("intersect");
- drop_seqRef = putName("drop_seq");
+ disconnectRef= putName("disconnect");
+ divRef = putName("/");
+ drop_constraintRef = putName("drop_constraint");
+ drop_functionRef = putName("drop_function");
+ drop_indexRef = putName("drop_index");
+ drop_roleRef = putName("drop_role");
drop_schemaRef = putName("drop_schema");
- drop_viewRef = putName("drop_view");
+ drop_seqRef = putName("drop_seq");
drop_tableRef = putName("drop_table");
- drop_constraintRef = putName("drop_constraint");
+ drop_triggerRef = putName("drop_trigger");
drop_typeRef = putName("drop_type");
drop_userRef = putName("drop_user");
- drop_roleRef = putName("drop_role");
drop_userRef = putName("drop_user");
- drop_indexRef = putName("drop_index");
- drop_functionRef = putName("drop_function");
- drop_triggerRef = putName("drop_trigger");
- mergecandRef= putName("mergecand");
- mergepackRef= putName("mergepack");
- intersectcandRef= putName("intersectcand");
+ drop_viewRef = putName("drop_view");
+ emptybindidxRef = putName("emptybindidx");
+ emptybindRef = putName("emptybind");
eqRef = putName("==");
- disconnectRef= putName("disconnect");
evalRef = putName("eval");
execRef = putName("exec");
expandRef = putName("expand");
exportOperationRef = putName("exportOperation");
+ export_tableRef = putName("export_table");
findRef = putName("find");
finishRef = putName("finish");
firstnRef = putName("firstn");
+ generatorRef = putName("generator");
getRef = putName("get");
getTraceRef = putName("getTrace");
- generatorRef = putName("generator");
+ grant_functionRef = putName("grant_function");
grantRef = putName("grant");
grant_rolesRef = putName("grant_roles");
- grant_functionRef = putName("grant_function");
- groupRef = putName("group");
- groupdoneRef = putName("groupdone");
+ groupbyRef = putName("groupby");
group_concatRef = putName("group_concat");
- subgroupRef = putName("subgroup");
- subgroupdoneRef= putName("subgroupdone");
- groupbyRef = putName("groupby");
+ groupdoneRef = putName("groupdone");
+ groupRef = putName("group");
+ hashRef = putName("hash");
hgeRef = putName("hge");
- hashRef = putName("hash");
identityRef = putName("identity");
ifthenelseRef = putName("ifthenelse");
+ ilikeRef = putName("ilike");
+ ilikeselectRef = putName("ilikeselect");
+ ilikethetaselectRef = putName("ilikethetaselect");
inplaceRef = putName("inplace");
+ intersectcandRef= putName("intersectcand");
+ intersectRef = putName("intersect");
intRef = putName("int");
ioRef = putName("io");
iteratorRef = putName("iterator");
- projectionpathRef = putName("projectionpath");
+ jitRef = putName("jit");
joinRef = putName("join");
- semijoinRef = putName("semijoin");
- leftjoinRef = putName("leftjoin");
- antijoinRef = putName("antijoin");
- bandjoinRef = putName("bandjoin");
- rangejoinRef = putName("rangejoin");
- thetajoinRef = putName("thetajoin");
- jitRef = putName("jit");
jsonRef = putName("json");
languageRef= putName("language");
- projectionRef = putName("projection");
- likeselectRef = putName("likeselect");
- listRef = putName("list");
+ leftjoinRef = putName("leftjoin");
likeRef = putName("like");
- ilikeRef = putName("ilike");
- ilikeselectRef = putName("ilikeselect");
+ likeselectRef = putName("likeselect");
likethetaselectRef = putName("likethetaselect");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
