Changeset: 65476578ccc1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65476578ccc1
Modified Files:
monetdb5/optimizer/opt_accumulators.c
monetdb5/optimizer/opt_aliases.c
monetdb5/optimizer/opt_centipede.c
monetdb5/optimizer/opt_cluster.h
monetdb5/optimizer/opt_coercion.c
monetdb5/optimizer/opt_commonTerms.c
monetdb5/optimizer/opt_compression.c
monetdb5/optimizer/opt_constants.c
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_datacyclotron.c
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_deadcode.c
monetdb5/optimizer/opt_dictionary.c
monetdb5/optimizer/opt_emptySet.c
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_factorize.c
monetdb5/optimizer/opt_garbageCollector.c
monetdb5/optimizer/opt_groups.c
monetdb5/optimizer/opt_history.c
monetdb5/optimizer/opt_inline.c
monetdb5/optimizer/opt_joinpath.c
monetdb5/optimizer/opt_mapreduce.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_octopus.c
monetdb5/optimizer/opt_origin.c
monetdb5/optimizer/opt_prejoin.c
monetdb5/optimizer/opt_pushranges.c
monetdb5/optimizer/opt_qep.c
monetdb5/optimizer/opt_recycler.c
monetdb5/optimizer/opt_reduce.c
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_remoteQueries.c
monetdb5/optimizer/opt_reorder.c
monetdb5/optimizer/opt_singleton.c
monetdb5/optimizer/opt_strengthReduction.c
monetdb5/optimizer/opt_trace.c
monetdb5/optimizer/opt_wrapper.c
Branch: default
Log Message:
Remove superflous include file
diffs (truncated from 429 to 300 lines):
diff --git a/monetdb5/optimizer/opt_accumulators.c
b/monetdb5/optimizer/opt_accumulators.c
--- a/monetdb5/optimizer/opt_accumulators.c
+++ b/monetdb5/optimizer/opt_accumulators.c
@@ -29,7 +29,6 @@
#include "monetdb_config.h"
#include "opt_accumulators.h"
#include "mal_builder.h"
-#include "opt_statistics.h"
int
OPTaccumulatorsImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci)
diff --git a/monetdb5/optimizer/opt_aliases.c b/monetdb5/optimizer/opt_aliases.c
--- a/monetdb5/optimizer/opt_aliases.c
+++ b/monetdb5/optimizer/opt_aliases.c
@@ -18,7 +18,6 @@
*/
#include "monetdb_config.h"
#include "opt_aliases.h"
-#include "opt_statistics.h"
int
OPTisAlias(InstrPtr p){
diff --git a/monetdb5/optimizer/opt_centipede.c
b/monetdb5/optimizer/opt_centipede.c
--- a/monetdb5/optimizer/opt_centipede.c
+++ b/monetdb5/optimizer/opt_centipede.c
@@ -28,7 +28,6 @@
#include "mal_builder.h"
#include "mal_recycle.h"
#include "mal_interpreter.h"
-#include "opt_statistics.h"
#include "algebra.h"
/* #define DEBUG_OPT_DETAIL*/
diff --git a/monetdb5/optimizer/opt_cluster.h b/monetdb5/optimizer/opt_cluster.h
--- a/monetdb5/optimizer/opt_cluster.h
+++ b/monetdb5/optimizer/opt_cluster.h
@@ -20,7 +20,6 @@
#define _OPT_CLUSTER
#include "opt_prelude.h"
#include "opt_support.h"
-#include "opt_statistics.h"
#define CLUSTER_THRESHOLD (BUN)(64*1024)
diff --git a/monetdb5/optimizer/opt_coercion.c
b/monetdb5/optimizer/opt_coercion.c
--- a/monetdb5/optimizer/opt_coercion.c
+++ b/monetdb5/optimizer/opt_coercion.c
@@ -19,7 +19,6 @@
#include "monetdb_config.h"
#include "opt_coercion.h"
-#include "opt_statistics.h"
static int
coercionOptimizerStep(MalBlkPtr mb, int i, InstrPtr p)
diff --git a/monetdb5/optimizer/opt_commonTerms.c
b/monetdb5/optimizer/opt_commonTerms.c
--- a/monetdb5/optimizer/opt_commonTerms.c
+++ b/monetdb5/optimizer/opt_commonTerms.c
@@ -19,7 +19,6 @@
#include "monetdb_config.h"
#include "opt_commonTerms.h"
#include "mal_exception.h"
-#include "opt_statistics.h"
/*
* Caveat. A lot of time was lost due to constants that are indistinguisable
* at the surface level. It may miss common expressions if their constants
diff --git a/monetdb5/optimizer/opt_compression.c
b/monetdb5/optimizer/opt_compression.c
--- a/monetdb5/optimizer/opt_compression.c
+++ b/monetdb5/optimizer/opt_compression.c
@@ -18,7 +18,6 @@
*/
#include "monetdb_config.h"
#include "opt_compression.h"
-#include "opt_statistics.h"
int
OPTcompressionImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p)
diff --git a/monetdb5/optimizer/opt_constants.c
b/monetdb5/optimizer/opt_constants.c
--- a/monetdb5/optimizer/opt_constants.c
+++ b/monetdb5/optimizer/opt_constants.c
@@ -32,7 +32,6 @@
#include "monetdb_config.h"
#include "mal_instruction.h"
#include "opt_constants.h"
-#include "opt_statistics.h"
int
OPTconstantsImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p)
diff --git a/monetdb5/optimizer/opt_costModel.c
b/monetdb5/optimizer/opt_costModel.c
--- a/monetdb5/optimizer/opt_costModel.c
+++ b/monetdb5/optimizer/opt_costModel.c
@@ -18,7 +18,6 @@
*/
#include "monetdb_config.h"
#include "opt_costModel.h"
-#include "opt_statistics.h"
/*
* The cost formula are repetative
diff --git a/monetdb5/optimizer/opt_datacyclotron.c
b/monetdb5/optimizer/opt_datacyclotron.c
--- a/monetdb5/optimizer/opt_datacyclotron.c
+++ b/monetdb5/optimizer/opt_datacyclotron.c
@@ -19,7 +19,6 @@
#include "monetdb_config.h"
#include "opt_datacyclotron.h"
#include "mal_instruction.h"
-#include "opt_statistics.h"
str
addRegWrap (Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc) {
diff --git a/monetdb5/optimizer/opt_dataflow.c
b/monetdb5/optimizer/opt_dataflow.c
--- a/monetdb5/optimizer/opt_dataflow.c
+++ b/monetdb5/optimizer/opt_dataflow.c
@@ -23,7 +23,6 @@
#include "opt_dataflow.h"
#include "mal_instruction.h"
#include "mal_interpreter.h"
-#include "opt_statistics.h"
/*
* dataflow processing incurs overhead and is only
diff --git a/monetdb5/optimizer/opt_deadcode.c
b/monetdb5/optimizer/opt_deadcode.c
--- a/monetdb5/optimizer/opt_deadcode.c
+++ b/monetdb5/optimizer/opt_deadcode.c
@@ -18,7 +18,6 @@
*/
#include "monetdb_config.h"
#include "opt_deadcode.h"
-#include "opt_statistics.h"
int
OPTdeadcodeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci)
diff --git a/monetdb5/optimizer/opt_dictionary.c
b/monetdb5/optimizer/opt_dictionary.c
--- a/monetdb5/optimizer/opt_dictionary.c
+++ b/monetdb5/optimizer/opt_dictionary.c
@@ -22,7 +22,6 @@
#include "mal_instruction.h"
#include "mal_interpreter.h"
#include "algebra.h"
-#include "opt_statistics.h"
#define isDiction(X) (idx[X] && val[X])
diff --git a/monetdb5/optimizer/opt_emptySet.c
b/monetdb5/optimizer/opt_emptySet.c
--- a/monetdb5/optimizer/opt_emptySet.c
+++ b/monetdb5/optimizer/opt_emptySet.c
@@ -21,7 +21,6 @@
#include "opt_aliases.h"
#include "opt_deadcode.h"
#include "mal_builder.h"
-#include "opt_statistics.h"
#define propagate(X)
\
do {
\
diff --git a/monetdb5/optimizer/opt_evaluate.c
b/monetdb5/optimizer/opt_evaluate.c
--- a/monetdb5/optimizer/opt_evaluate.c
+++ b/monetdb5/optimizer/opt_evaluate.c
@@ -19,7 +19,6 @@
#include "monetdb_config.h"
#include "opt_evaluate.h"
#include "opt_aliases.h"
-#include "opt_statistics.h"
static int
OPTallConstant(Client cntxt, MalBlkPtr mb, InstrPtr p)
diff --git a/monetdb5/optimizer/opt_factorize.c
b/monetdb5/optimizer/opt_factorize.c
--- a/monetdb5/optimizer/opt_factorize.c
+++ b/monetdb5/optimizer/opt_factorize.c
@@ -20,7 +20,6 @@
#include "opt_factorize.h"
#include "mal_interpreter.h" /* for showErrors() */
#include "mal_builder.h"
-#include "opt_statistics.h"
/*
* @+ Factorize Implementation
diff --git a/monetdb5/optimizer/opt_garbageCollector.c
b/monetdb5/optimizer/opt_garbageCollector.c
--- a/monetdb5/optimizer/opt_garbageCollector.c
+++ b/monetdb5/optimizer/opt_garbageCollector.c
@@ -22,7 +22,6 @@
#include "mal_builder.h"
#include "opt_prelude.h"
#include "mal_properties.h"
-#include "opt_statistics.h"
/*
* Keeping variables around beyond their end-of-life-span
diff --git a/monetdb5/optimizer/opt_groups.c b/monetdb5/optimizer/opt_groups.c
--- a/monetdb5/optimizer/opt_groups.c
+++ b/monetdb5/optimizer/opt_groups.c
@@ -19,7 +19,6 @@
#include "monetdb_config.h"
#include "opt_groups.h"
#include "group.h"
-#include "opt_statistics.h"
int
OPTgroupsImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
diff --git a/monetdb5/optimizer/opt_history.c b/monetdb5/optimizer/opt_history.c
--- a/monetdb5/optimizer/opt_history.c
+++ b/monetdb5/optimizer/opt_history.c
@@ -22,7 +22,6 @@
*/
#include "monetdb_config.h"
#include "opt_history.h"
-#include "opt_statistics.h"
str
OPTforgetPrevious(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
diff --git a/monetdb5/optimizer/opt_inline.c b/monetdb5/optimizer/opt_inline.c
--- a/monetdb5/optimizer/opt_inline.c
+++ b/monetdb5/optimizer/opt_inline.c
@@ -18,7 +18,6 @@
*/
#include "monetdb_config.h"
#include "opt_inline.h"
-#include "opt_statistics.h"
extern int OPTinlineMultiplex(Client cntxt, MalBlkPtr mb, InstrPtr p);
diff --git a/monetdb5/optimizer/opt_joinpath.c
b/monetdb5/optimizer/opt_joinpath.c
--- a/monetdb5/optimizer/opt_joinpath.c
+++ b/monetdb5/optimizer/opt_joinpath.c
@@ -28,7 +28,6 @@
#include "monetdb_config.h"
#include "opt_joinpath.h"
#include "cluster.h"
-#include "opt_statistics.h"
typedef struct{
int cnt;
diff --git a/monetdb5/optimizer/opt_mapreduce.c
b/monetdb5/optimizer/opt_mapreduce.c
--- a/monetdb5/optimizer/opt_mapreduce.c
+++ b/monetdb5/optimizer/opt_mapreduce.c
@@ -39,7 +39,6 @@ result sets should be assembled.
#include "opt_mapreduce.h"
#include "mal_interpreter.h"
#include "remote.h"
-#include "opt_statistics.h"
typedef struct _mapnode {
str uri;
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -18,7 +18,6 @@
*/
#include "monetdb_config.h"
#include "opt_mergetable.h"
-#include "opt_statistics.h"
typedef enum mat_type {
mat_none = 0, /* Simple mat aligned operations (ie batcalc etc) */
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
@@ -20,7 +20,6 @@
#include "opt_mitosis.h"
#include "opt_octopus.h"
#include "mal_interpreter.h"
-#include "opt_statistics.h"
static int eligible(MalBlkPtr mb )
{
diff --git a/monetdb5/optimizer/opt_multiplex.c
b/monetdb5/optimizer/opt_multiplex.c
--- a/monetdb5/optimizer/opt_multiplex.c
+++ b/monetdb5/optimizer/opt_multiplex.c
@@ -19,7 +19,6 @@
#include "monetdb_config.h"
#include "opt_multiplex.h"
#include "mal_interpreter.h"
-#include "opt_statistics.h"
/*
* @-
diff --git a/monetdb5/optimizer/opt_octopus.c b/monetdb5/optimizer/opt_octopus.c
--- a/monetdb5/optimizer/opt_octopus.c
+++ b/monetdb5/optimizer/opt_octopus.c
@@ -156,7 +156,6 @@
#include "mal_sabaoth.h"
#include "remote.h"
#include "mal_recycle.h"
-#include "opt_statistics.h"
typedef struct MALPART {
str sch;
diff --git a/monetdb5/optimizer/opt_origin.c b/monetdb5/optimizer/opt_origin.c
--- a/monetdb5/optimizer/opt_origin.c
+++ b/monetdb5/optimizer/opt_origin.c
@@ -27,7 +27,6 @@
*/
#include "monetdb_config.h"
#include "opt_origin.h"
-#include "opt_statistics.h"
int
OPToriginImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci)
diff --git a/monetdb5/optimizer/opt_prejoin.c b/monetdb5/optimizer/opt_prejoin.c
--- a/monetdb5/optimizer/opt_prejoin.c
+++ b/monetdb5/optimizer/opt_prejoin.c
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
