Changeset: 48d37e88eb93 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48d37e88eb93
Modified Files:
monetdb5/optimizer/opt_prelude.c
Branch: pythonudf
Log Message:
Merge again.
diffs (truncated from 460 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
@@ -217,7 +217,9 @@ str subavgRef;
str subsortRef;
str takeRef;
str not_uniqueRef;
+str sampleRef;
str subuniqueRef;
+str subuniformRef;
str unlockRef;
str unpackRef;
str unpinRef;
@@ -233,221 +235,225 @@ str zero_or_oneRef;
void optimizerInit(void)
{
+#ifndef HAVE_EMBEDDED
assert(batRef == NULL);
- abortRef = putName("abort",5);
- affectedRowsRef = putName("affectedRows",12);
- aggrRef = putName("aggr",4);
- alarmRef = putName("alarm",5);
- algebraRef = putName("algebra",7);
- batalgebraRef = putName("batalgebra",10);
- appendidxRef = putName("append_idxbat",13);
- appendRef = putName("append",6);
- assertRef = putName("assert",6);
- attachRef = putName("attach",6);
- avgRef = putName("avg",3);
- arrayRef = putName("array",4);
- batcalcRef = putName("batcalc",7);
- basketRef = putName("basket",6);
- batstrRef = putName("batstr",6);
- batmtimeRef = putName("batmtime",8);
- batmmathRef = putName("batmmath",8);
- batxmlRef = putName("batxml",6);
- batsqlRef = putName("batsql",6);
- blockRef = putName("block",5);
- bbpRef = putName("bbp",3);
- tidRef = putName("tid",3);
- deltaRef = putName("delta",5);
- subdeltaRef = putName("subdelta",8);
- projectdeltaRef = putName("projectdelta",12);
- binddbatRef = putName("bind_dbat",9);
- bindidxRef = putName("bind_idxbat",11);
- bindRef = putName("bind",4);
- bpmRef = putName("bpm",3);
- bstreamRef = putName("bstream",7);
- calcRef = putName("calc",4);
- catalogRef = putName("catalog",7);
- clear_tableRef = putName("clear_table",11);
- closeRef = putName("close",5);
- columnRef = putName("column",6);
- columnBindRef = putName("columnBind",10);
- commitRef = putName("commit",6);
- connectRef = putName("connect",7);
- constraintsRef = putName("constraints",11);
- countRef = putName("count",5);
- subcountRef = putName("subcount",8);
- copyRef = putName("copy",4);
- copy_fromRef = putName("copy_from",9);
- export_tableRef = putName("export_table",12);
- count_no_nilRef = putName("count_no_nil",12);
- crossRef = putName("crossproduct",12);
- createRef = putName("create",6);
- dateRef = putName("date",4);
- dataflowRef = putName("dataflow",8);
- datacyclotronRef = putName("datacyclotron",13);
- dblRef = putName("dbl",3);
- defineRef = putName("define",6);
- deleteRef = putName("delete",6);
- depositRef = putName("deposit",7);
- subdiffRef = putName("subdiff",7);
- diffRef = putName("diff",4);
- subinterRef = putName("subinter",8);
- mergecandRef= putName("mergecand",9);
- mergepackRef= putName("mergepack",9);
- intersectcandRef= putName("intersectcand",13);
- eqRef = putName("==",2);
- disconnectRef= putName("disconnect",10);
- evalRef = putName("eval",4);
- execRef = putName("exec",4);
- expandRef = putName("expand",6);
- exportOperationRef = putName("exportOperation",15);
- finishRef = putName("finish",6);
- firstnRef = putName("firstn",6);
- getRef = putName("get",3);
- generatorRef = putName("generator",9);
- grabRef = putName("grab",4);
- groupRef = putName("group",5);
- subgroupRef = putName("subgroup",8);
- subgroupdoneRef= putName("subgroupdone",12);
- groupbyRef = putName("groupby",7);
- hgeRef = putName("hge",3);
- hashRef = putName("hash",4);
- identityRef = putName("identity",8);
- ifthenelseRef = putName("ifthenelse",10);
- inplaceRef = putName("inplace",7);
- insertRef = putName("insert",6);
- intRef = putName("int",3);
- ioRef = putName("io",2);
- iteratorRef = putName("iterator",8);
- projectionpathRef = putName("projectionpath",14);
- subjoinRef = putName("subjoin",7);
- subleftjoinRef = putName("subleftjoin",11);
- subantijoinRef = putName("subantijoin",11);
- subbandjoinRef = putName("subbandjoin",11);
- subrangejoinRef = putName("subrangejoin",12);
- subthetajoinRef = putName("subthetajoin",12);
- jsonRef = putName("json",4);
- languageRef= putName("language",8);
- projectionRef = putName("projection",10);
- likesubselectRef = putName("likesubselect",13);
- ilikesubselectRef = putName("ilikesubselect",14);
- listRef = putName("list",4);
- likeRef = putName("like",4);
- ilikeRef = putName("ilike",5);
- not_likeRef = putName("not_like",8);
- not_ilikeRef = putName("not_ilike",9);
- lockRef = putName("lock",4);
- lookupRef = putName("lookup",6);
- malRef = putName("mal", 3);
- batmalRef = putName("batmal", 6);
- mapiRef = putName("mapi", 4);
- markRef = putName("mark", 4);
- mtimeRef = putName("mtime", 5);
- multicolumnRef = putName("multicolumn", 11);
- matRef = putName("mat", 3);
- max_no_nilRef = putName("max_no_nil", 10);
- maxRef = putName("max", 3);
- submaxRef = putName("submax", 6);
- submedianRef = putName("submedian", 9);
- mdbRef = putName("mdb", 3);
- min_no_nilRef = putName("min_no_nil", 10);
- minRef = putName("min", 3);
- subminRef = putName("submin", 6);
- mirrorRef = putName("mirror", 6);
- mitosisRef = putName("mitosis", 7);
- mkeyRef = putName("mkey", 4);
- mmathRef = putName("mmath", 5);
- multiplexRef = putName("multiplex", 9);
- manifoldRef = putName("manifold", 8);
- mvcRef = putName("mvc", 3);
- newRef = putName("new",3);
- notRef = putName("not",3);
- nextRef = putName("next",4);
- oidRef = putName("oid",3);
- optimizerRef = putName("optimizer",9);
- openRef = putName("open",4);
- parametersRef = putName("parameters",10);
- packRef = putName("pack",4);
- pack2Ref = putName("pack2",5);
- passRef = putName("pass",4);
- partitionRef = putName("partition",9);
- pcreRef = putName("pcre",4);
- pinRef = putName("pin",3);
- plusRef = putName("+",1);
- minusRef = putName("-",1);
- mulRef = putName("*",1);
- divRef = putName("/",1);
- printRef = putName("print",5);
- preludeRef = putName("prelude",7);
- prodRef = putName("prod",4);
- subprodRef = putName("subprod",7);
- profilerRef = putName("profiler",8);
- postludeRef = putName("postlude",8);
- projectRef = putName("project",7);
- putRef = putName("put",3);
- querylogRef = putName("querylog",8);
- queryRef = putName("query",5);
- rapiRef = putName("rapi", 4);
- batrapiRef = putName("batrapi", 7);
- pyapiRef = putName("pyapi", 5);
- batpyapiRef = putName("batpyapi", 8);
- pyapimapRef = putName("batpyapimap", 11);
- subeval_aggrRef = putName("subeval_aggr", 12);
- rankRef = putName("rank", 4);
- dense_rankRef = putName("dense_rank", 10);
- reconnectRef = putName("reconnect",9);
- recycleRef = putName("recycle",7);
- refineRef = putName("refine",6);
- registerRef = putName("register",8);
- remapRef = putName("remap",5);
- remoteRef = putName("remote",6);
- replaceRef = putName("replace",7);
- replicatorRef = putName("replicator",10);
- resultSetRef = putName("resultSet",9);
- reuseRef = putName("reuse",5);
- row_numberRef = putName("row_number",10);
- rpcRef = putName("rpc",3);
- rsColumnRef = putName("rsColumn",8);
- schedulerRef = putName("scheduler",9);
- selectNotNilRef = putName("selectNotNil",12);
- seriesRef = putName("series",6);
- semaRef = putName("sema",4);
- setAccessRef = putName("setAccess",9);
- setWriteModeRef= putName("setWriteMode",12);
- sinkRef = putName("sink",4);
- sliceRef = putName("slice",5);
- subsliceRef = putName("subslice",8);
- singleRef = putName("single",6);
- sortRef = putName("sort",4);
- sortReverseRef = putName("sortReverse",15);
- sqlRef = putName("sql",3);
- srvpoolRef = putName("srvpool",7);
- streamsRef = putName("streams",7);
- startRef = putName("start",5);
- starttraceRef = putName("starttrace",10);
- stopRef = putName("stop",4);
- stoptraceRef = putName("stoptrace",9);
- strRef = putName("str",3);
- sumRef = putName("sum",3);
- subsumRef = putName("subsum",6);
- subavgRef = putName("subavg",6);
- subsortRef = putName("subsort",7);
- takeRef= putName("take",5);
- timestampRef = putName("timestamp", 9);
- not_uniqueRef= putName("not_unique",10);
- subuniqueRef= putName("subunique",9);
- unlockRef= putName("unlock",6);
- unpackRef = putName("unpack",6);
- unpinRef = putName("unpin",5);
- updateRef = putName("update",6);
- subselectRef = putName("subselect",9);
- thetasubselectRef = putName("thetasubselect",14);
- likesubselectRef = putName("likesubselect",13);
- likethetasubselectRef = putName("likethetasubselect",18);
- ilikesubselectRef = putName("ilikesubselect",14);
- ilikethetasubselectRef = putName("ilikethetasubselect",19);
- vectorRef = putName("vector",6);
- zero_or_oneRef = putName("zero_or_one",11);
- userRef = putName("user",4);
+#endif
+ abortRef = putName("abort");
+ affectedRowsRef = putName("affectedRows");
+ aggrRef = putName("aggr");
+ alarmRef = putName("alarm");
+ algebraRef = putName("algebra");
+ batalgebraRef = putName("batalgebra");
+ appendidxRef = putName("append_idxbat");
+ appendRef = putName("append");
+ assertRef = putName("assert");
+ attachRef = putName("attach");
+ avgRef = putName("avg");
+ arrayRef = putName("array");
+ batcalcRef = putName("batcalc");
+ basketRef = putName("basket");
+ batstrRef = putName("batstr");
+ batmtimeRef = putName("batmtime");
+ batmmathRef = putName("batmmath");
+ batxmlRef = putName("batxml");
+ batsqlRef = putName("batsql");
+ 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");
+ bpmRef = putName("bpm");
+ bstreamRef = putName("bstream");
+ calcRef = putName("calc");
+ catalogRef = putName("catalog");
+ clear_tableRef = putName("clear_table");
+ closeRef = putName("close");
+ columnRef = putName("column");
+ columnBindRef = putName("columnBind");
+ commitRef = putName("commit");
+ connectRef = putName("connect");
+ constraintsRef = putName("constraints");
+ countRef = putName("count");
+ subcountRef = putName("subcount");
+ copyRef = putName("copy");
+ copy_fromRef = putName("copy_from");
+ export_tableRef = putName("export_table");
+ count_no_nilRef = putName("count_no_nil");
+ crossRef = putName("crossproduct");
+ createRef = putName("create");
+ dateRef = putName("date");
+ dataflowRef = putName("dataflow");
+ datacyclotronRef = putName("datacyclotron");
+ dblRef = putName("dbl");
+ defineRef = putName("define");
+ deleteRef = putName("delete");
+ depositRef = putName("deposit");
+ subdiffRef = putName("subdiff");
+ diffRef = putName("diff");
+ subinterRef = putName("subinter");
+ mergecandRef= putName("mergecand");
+ mergepackRef= putName("mergepack");
+ intersectcandRef= putName("intersectcand");
+ eqRef = putName("==");
+ disconnectRef= putName("disconnect");
+ evalRef = putName("eval");
+ execRef = putName("exec");
+ expandRef = putName("expand");
+ exportOperationRef = putName("exportOperation");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
