Changeset: e2ab0095fd33 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e2ab0095fd33
Modified Files:
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.mal
Branch: default
Log Message:
Remove the experimental compression optimizer
Nowadays it is easier to use a compressed file system for
the database.
diffs (82 lines):
diff --git a/monetdb5/optimizer/Makefile.ag b/monetdb5/optimizer/Makefile.ag
--- a/monetdb5/optimizer/Makefile.ag
+++ b/monetdb5/optimizer/Makefile.ag
@@ -34,7 +34,6 @@ lib_optimizer = {
opt_cluster.c opt_cluster.h \
opt_coercion.c opt_coercion.h \
opt_commonTerms.c opt_commonTerms.h \
- opt_compression.c opt_compression.h \
opt_constants.c opt_constants.h \
opt_costModel.c opt_costModel.h \
opt_dataflow.c opt_dataflow.h \
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -231,30 +231,6 @@ struct PIPELINES {
"optimizer.garbageCollector();",
"experimental", NULL, NULL, 1},
#endif
-/* The default + compression */
- {"compression_pipe",
- "optimizer.inline();"
- "optimizer.remap();"
- "optimizer.costModel();"
- "optimizer.coercions();"
- "optimizer.evaluate();"
- "optimizer.emptySet();"
- "optimizer.aliases();"
- "optimizer.mergetable();"
- "optimizer.deadcode();"
- "optimizer.constants();"
- "optimizer.commonTerms();"
- //"optimizer.groups();"
- "optimizer.joinPath();"
- "optimizer.deadcode();"
- "optimizer.reduce();"
- "optimizer.dataflow();"
- "optimizer.compression();"
- "optimizer.dataflow();"
- "optimizer.querylog();"
- "optimizer.multiplex();"
- "optimizer.garbageCollector();",
- "experimental", "OPTcompress", NULL, 1},
/* sentinel */
{NULL, NULL, NULL, NULL, NULL, 0}
};
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -43,7 +43,6 @@
#include "opt_cluster.h"
#include "opt_coercion.h"
#include "opt_commonTerms.h"
-#include "opt_compression.h"
#include "opt_constants.h"
#include "opt_costModel.h"
#include "opt_dataflow.h"
@@ -85,7 +84,6 @@ struct{
{"cluster", &OPTclusterImplementation},
{"coercions", &OPTcoercionImplementation},
{"commonTerms", &OPTcommonTermsImplementation},
- {"compression", &OPTcompressionImplementation},
{"constants", &OPTconstantsImplementation},
{"costModel", &OPTcostModelImplementation},
{"dataflow", &OPTdataflowImplementation},
diff --git a/monetdb5/optimizer/optimizer.mal b/monetdb5/optimizer/optimizer.mal
--- a/monetdb5/optimizer/optimizer.mal
+++ b/monetdb5/optimizer/optimizer.mal
@@ -72,14 +72,6 @@ pattern optimizer.commonTerms(mod:any_1,
address OPTwrapper
comment "Common sub-expression optimizer"
-#opt_compression.mal
-
-pattern optimizer.compression():str
-address OPTwrapper;
-pattern optimizer.compression(mod:str, fcn:str):str
-address OPTwrapper
-comment "Compression code injection";
-
#opt_constants
pattern optimizer.constants():str
address OPTwrapper;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
