Changeset: 72801dbcdcfb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72801dbcdcfb
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_reorder.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/optimizer.mal
Branch: default
Log Message:
Remove some cruft
diffs (215 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -8129,8 +8129,6 @@ Ready.
[ "optimizer", "constants", "pattern
optimizer.constants(mod:str,fcn:str):str ", "OPTwrapper;", "Duplicate
constant removal optimizer" ]
[ "optimizer", "costModel", "pattern optimizer.costModel():str ",
"OPTwrapper;", "" ]
[ "optimizer", "costModel", "pattern
optimizer.costModel(mod:str,fcn:str):str ", "OPTwrapper;", "Estimate the
cost of a relational expression" ]
-[ "optimizer", "crackers", "pattern optimizer.crackers():str ",
"OPTwrapper;", "" ]
-[ "optimizer", "crackers", "pattern
optimizer.crackers(mod:str,fcn:str):str ", "OPTwrapper;", "Replace algebra
select with crackers select" ]
[ "optimizer", "dataflow", "pattern optimizer.dataflow():str ",
"OPTwrapper;", "" ]
[ "optimizer", "dataflow", "pattern
optimizer.dataflow(mod:str,fcn:str):str ", "OPTwrapper;", "Dataflow
bracket code injection" ]
[ "optimizer", "deadcode", "pattern optimizer.deadcode():str ",
"OPTwrapper;", "" ]
@@ -8191,8 +8189,6 @@ Ready.
[ "optimizer", "remoteQueries", "pattern
optimizer.remoteQueries(mod:str,fcn:str):str ", "OPTwrapper;", "Resolve
the multi-table definitions" ]
[ "optimizer", "reorder", "pattern optimizer.reorder():str ",
"OPTwrapper;", "" ]
[ "optimizer", "reorder", "pattern optimizer.reorder(mod:str,fcn:str):str
", "OPTwrapper;", "Reorder by dataflow dependencies" ]
-[ "optimizer", "selcrack", "pattern optimizer.selcrack():str ",
"OPTwrapper;", "" ]
-[ "optimizer", "selcrack", "pattern
optimizer.selcrack(mod:str,fcn:str):str ", "OPTwrapper;", "Selection
cracking" ]
[ "optimizer", "sql_append", "pattern optimizer.sql_append():str ",
"OPTsql_append;", "Avoid extra BAT copy with sql.append() whenever
possible." ]
[ "optimizer", "sql_append", "pattern
optimizer.sql_append(mod:str,fcn:str):str ", "OPTsql_append;", "Avoid
extra BAT copy with sql.append() whenever possible." ]
[ "optimizer", "trace", "pattern optimizer.trace():str ",
"OPTwrapper;", "" ]
@@ -8543,16 +8539,16 @@ Ready.
[ "streams", "socketWriteBytes", "command
streams.socketWriteBytes(skt:int,name:str):streams ",
"mnstr_socket_wstreamwrap;", "open a socket stream for writing" ]
[ "streams", "writeInt", "command
streams.writeInt(s:streams,data:int):void ", "mnstr_writeIntwrap;", "write
data on the stream" ]
[ "streams", "writeStr", "command
streams.writeStr(s:streams,data:str):void ", "mnstr_write_stringwrap;",
"write data on the stream" ]
-[ "sysmon", "pause", "pattern sysmon.pause(id:int):void ",
"SYSMONpause;", "" ]
-[ "sysmon", "pause", "pattern sysmon.pause(id:lng):void ",
"SYSMONpause;", "Temporary suspend a single query" ]
-[ "sysmon", "pause", "pattern sysmon.pause(id:sht):void ",
"SYSMONpause;", "" ]
+[ "sysmon", "pause", "pattern sysmon.pause(id:int):void ",
"SYSMONpause;", "Suspend a running query" ]
+[ "sysmon", "pause", "pattern sysmon.pause(id:lng):void ",
"SYSMONpause;", "Suspend a running query" ]
+[ "sysmon", "pause", "pattern sysmon.pause(id:sht):void ",
"SYSMONpause;", "Suspend a running query" ]
[ "sysmon", "queue", "pattern sysmon.queue()
(tag:bat[:lng],user:bat[:str],started:bat[:timestamp],estimate:bat[:timestamp],progress:bat[:int],status:bat[:str],qrytag:bat[:oid],query:bat[:str])
", "SYSMONqueue;", "" ]
-[ "sysmon", "resume", "pattern sysmon.resume(id:int):void ",
"SYSMONresume;", "" ]
-[ "sysmon", "resume", "pattern sysmon.resume(id:lng):void ",
"SYSMONresume;", "Resume processing " ]
-[ "sysmon", "resume", "pattern sysmon.resume(id:sht):void ",
"SYSMONresume;", "" ]
-[ "sysmon", "stop", "pattern sysmon.stop(id:int):void ", "SYSMONstop;",
"" ]
+[ "sysmon", "resume", "pattern sysmon.resume(id:int):void ",
"SYSMONresume;", "Resume processing of a query " ]
+[ "sysmon", "resume", "pattern sysmon.resume(id:lng):void ",
"SYSMONresume;", "Resume processing of a query " ]
+[ "sysmon", "resume", "pattern sysmon.resume(id:sht):void ",
"SYSMONresume;", "Resume processing of a query " ]
+[ "sysmon", "stop", "pattern sysmon.stop(id:int):void ", "SYSMONstop;",
"Stop a single query a.s.a.p." ]
[ "sysmon", "stop", "pattern sysmon.stop(id:lng):void ", "SYSMONstop;",
"Stop a single query a.s.a.p." ]
-[ "sysmon", "stop", "pattern sysmon.stop(id:sht):void ", "SYSMONstop;",
"" ]
+[ "sysmon", "stop", "pattern sysmon.stop(id:sht):void ", "SYSMONstop;",
"Stop a single query a.s.a.p." ]
[ "timestamp", "!=", "pattern timestamp.!=(v:timestamp,w:timestamp):bit ",
"CMDvarNE;", "Equality of two timestamps" ]
[ "timestamp", "#fromstr", "command timestamp.#fromstr():void ",
"timestamp_fromstr;", "" ]
[ "timestamp", "#tostr", "command timestamp.#tostr():void ",
"timestamp_tostr;", "" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -10491,8 +10491,6 @@ Ready.
[ "optimizer", "constants", "pattern
optimizer.constants(mod:str,fcn:str):str ", "OPTwrapper;", "Duplicate
constant removal optimizer" ]
[ "optimizer", "costModel", "pattern optimizer.costModel():str ",
"OPTwrapper;", "" ]
[ "optimizer", "costModel", "pattern
optimizer.costModel(mod:str,fcn:str):str ", "OPTwrapper;", "Estimate the
cost of a relational expression" ]
-[ "optimizer", "crackers", "pattern optimizer.crackers():str ",
"OPTwrapper;", "" ]
-[ "optimizer", "crackers", "pattern
optimizer.crackers(mod:str,fcn:str):str ", "OPTwrapper;", "Replace algebra
select with crackers select" ]
[ "optimizer", "dataflow", "pattern optimizer.dataflow():str ",
"OPTwrapper;", "" ]
[ "optimizer", "dataflow", "pattern
optimizer.dataflow(mod:str,fcn:str):str ", "OPTwrapper;", "Dataflow
bracket code injection" ]
[ "optimizer", "deadcode", "pattern optimizer.deadcode():str ",
"OPTwrapper;", "" ]
@@ -10553,8 +10551,6 @@ Ready.
[ "optimizer", "remoteQueries", "pattern
optimizer.remoteQueries(mod:str,fcn:str):str ", "OPTwrapper;", "Resolve
the multi-table definitions" ]
[ "optimizer", "reorder", "pattern optimizer.reorder():str ",
"OPTwrapper;", "" ]
[ "optimizer", "reorder", "pattern optimizer.reorder(mod:str,fcn:str):str
", "OPTwrapper;", "Reorder by dataflow dependencies" ]
-[ "optimizer", "selcrack", "pattern optimizer.selcrack():str ",
"OPTwrapper;", "" ]
-[ "optimizer", "selcrack", "pattern
optimizer.selcrack(mod:str,fcn:str):str ", "OPTwrapper;", "Selection
cracking" ]
[ "optimizer", "sql_append", "pattern optimizer.sql_append():str ",
"OPTsql_append;", "Avoid extra BAT copy with sql.append() whenever
possible." ]
[ "optimizer", "sql_append", "pattern
optimizer.sql_append(mod:str,fcn:str):str ", "OPTsql_append;", "Avoid
extra BAT copy with sql.append() whenever possible." ]
[ "optimizer", "trace", "pattern optimizer.trace():str ",
"OPTwrapper;", "" ]
@@ -10907,16 +10903,16 @@ Ready.
[ "streams", "socketWriteBytes", "command
streams.socketWriteBytes(skt:int,name:str):streams ",
"mnstr_socket_wstreamwrap;", "open a socket stream for writing" ]
[ "streams", "writeInt", "command
streams.writeInt(s:streams,data:int):void ", "mnstr_writeIntwrap;", "write
data on the stream" ]
[ "streams", "writeStr", "command
streams.writeStr(s:streams,data:str):void ", "mnstr_write_stringwrap;",
"write data on the stream" ]
-[ "sysmon", "pause", "pattern sysmon.pause(id:int):void ",
"SYSMONpause;", "" ]
-[ "sysmon", "pause", "pattern sysmon.pause(id:lng):void ",
"SYSMONpause;", "Temporary suspend a single query" ]
-[ "sysmon", "pause", "pattern sysmon.pause(id:sht):void ",
"SYSMONpause;", "" ]
+[ "sysmon", "pause", "pattern sysmon.pause(id:int):void ",
"SYSMONpause;", "Suspend a running query" ]
+[ "sysmon", "pause", "pattern sysmon.pause(id:lng):void ",
"SYSMONpause;", "Suspend a running query" ]
+[ "sysmon", "pause", "pattern sysmon.pause(id:sht):void ",
"SYSMONpause;", "Suspend a running query" ]
[ "sysmon", "queue", "pattern sysmon.queue()
(tag:bat[:lng],user:bat[:str],started:bat[:timestamp],estimate:bat[:timestamp],progress:bat[:int],status:bat[:str],qrytag:bat[:oid],query:bat[:str])
", "SYSMONqueue;", "" ]
-[ "sysmon", "resume", "pattern sysmon.resume(id:int):void ",
"SYSMONresume;", "" ]
-[ "sysmon", "resume", "pattern sysmon.resume(id:lng):void ",
"SYSMONresume;", "Resume processing " ]
-[ "sysmon", "resume", "pattern sysmon.resume(id:sht):void ",
"SYSMONresume;", "" ]
-[ "sysmon", "stop", "pattern sysmon.stop(id:int):void ", "SYSMONstop;",
"" ]
+[ "sysmon", "resume", "pattern sysmon.resume(id:int):void ",
"SYSMONresume;", "Resume processing of a query " ]
+[ "sysmon", "resume", "pattern sysmon.resume(id:lng):void ",
"SYSMONresume;", "Resume processing of a query " ]
+[ "sysmon", "resume", "pattern sysmon.resume(id:sht):void ",
"SYSMONresume;", "Resume processing of a query " ]
+[ "sysmon", "stop", "pattern sysmon.stop(id:int):void ", "SYSMONstop;",
"Stop a single query a.s.a.p." ]
[ "sysmon", "stop", "pattern sysmon.stop(id:lng):void ", "SYSMONstop;",
"Stop a single query a.s.a.p." ]
-[ "sysmon", "stop", "pattern sysmon.stop(id:sht):void ", "SYSMONstop;",
"" ]
+[ "sysmon", "stop", "pattern sysmon.stop(id:sht):void ", "SYSMONstop;",
"Stop a single query a.s.a.p." ]
[ "timestamp", "!=", "pattern timestamp.!=(v:timestamp,w:timestamp):bit ",
"CMDvarNE;", "Equality of two timestamps" ]
[ "timestamp", "#fromstr", "command timestamp.#fromstr():void ",
"timestamp_fromstr;", "" ]
[ "timestamp", "#tostr", "command timestamp.#tostr():void ",
"timestamp_tostr;", "" ]
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
@@ -1997,7 +1997,6 @@ int cpyConstant(MalBlkPtr mb, VarPtr vr)
str createException(enum malexception, const char *, _In_z_
_Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__,
3, 4)));
str createRef;
str crossRef;
-str datacyclotronRef;
str dataflowRef;
str dateRef;
int date_fromstr(const char *buf, int *len, date **d);
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
@@ -70,7 +70,6 @@ str count_no_nilRef;
str crossRef;
str createRef;
str dataflowRef;
-str datacyclotronRef;
str dblRef;
str defineRef;
str deleteRef;
@@ -299,7 +298,6 @@ void optimizerInit(void)
createRef = putName("create");
dateRef = putName("date");
dataflowRef = putName("dataflow");
- datacyclotronRef = putName("datacyclotron");
dblRef = putName("dbl");
defineRef = putName("define");
deleteRef = putName("delete");
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
@@ -68,7 +68,6 @@ mal_export str count_no_nilRef;
mal_export str crossRef;
mal_export str createRef;
mal_export str dataflowRef;
-mal_export str datacyclotronRef;
mal_export str dblRef;
mal_export str defineRef;
mal_export str deleteRef;
diff --git a/monetdb5/optimizer/opt_reorder.c b/monetdb5/optimizer/opt_reorder.c
--- a/monetdb5/optimizer/opt_reorder.c
+++ b/monetdb5/optimizer/opt_reorder.c
@@ -282,11 +282,6 @@ OPTreorderImplementation(Client cntxt, M
pushInstruction(mb,old[0]);
old[0]=0;
- for( i=1; i<limit; i++)
- if ( getModuleId(old[i]) == datacyclotronRef &&
getFunctionId(old[i]) == bindRef){
- pushInstruction(mb,old[i]);
- old[i] = 0;
- }
start=1;
for (i=1; i<limit; i++){
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
@@ -32,13 +32,10 @@ struct OPTcatalog {
{"commonTerms", 0, 0, 0},
{"constants", 0, 0, 0},
{"costModel", 0, 0, 0},
-{"crack", 0, 0, 0},
-{"datacyclotron",0, 0, 0},
{"dataflow", 0, 0, 0},
{"deadcode", 0, 0, 0},
{"emptybind", 0, 0, 0},
{"evaluate", 0, 0, 0},
-{"factorize", 0, 0, 0},
{"garbage", 0, 0, 0},
{"generator", 0, 0, 0},
{"history", 0, 0, 0},
@@ -51,16 +48,11 @@ struct OPTcatalog {
{"mergetable", 0, 0, 0},
{"mitosis", 0, 0, 0},
{"multiplex", 0, 0, 0},
-{"origin", 0, 0, 0},
-{"peephole", 0, 0, 0},
{"reduce", 0, 0, 0},
{"remap", 0, 0, 0},
{"remote", 0, 0, 0},
{"reorder", 0, 0, 0},
{"replication", 0, 0, 0},
-{"selcrack", 0, 0, 0},
-{"sidcrack", 0, 0, 0},
-{"strengthreduction", 0, 0, 0},
{"pushselect", 0, 0, 0},
{ 0, 0, 0, 0}
};
diff --git a/monetdb5/optimizer/optimizer.mal b/monetdb5/optimizer/optimizer.mal
--- a/monetdb5/optimizer/optimizer.mal
+++ b/monetdb5/optimizer/optimizer.mal
@@ -66,14 +66,6 @@ pattern optimizer.costModel(mod:str, fcn
address OPTwrapper
comment "Estimate the cost of a relational expression";
-#opt_crackers.mal
-
-pattern optimizer.crackers():str
-address OPTwrapper;
-pattern optimizer.crackers(mod:str, fcn:str):str
-address OPTwrapper
-comment "Replace algebra select with crackers select";
-
#opt_dataflow.mal
pattern optimizer.dataflow():str
@@ -299,14 +291,6 @@ pattern optimizer.reorder(mod:str, fcn:s
address OPTwrapper
comment "Reorder by dataflow dependencies";
-#opt_selcrack.mal
-
-pattern optimizer.selcrack():str
-address OPTwrapper;
-pattern optimizer.selcrack(mod:str, fcn:str):str
-address OPTwrapper
-comment "Selection cracking";
-
#opt_statistics.mal
command inspect.getStatistics(nme:str):bat[:any_2]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
