Changeset: 577df687bc04 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=577df687bc04
Modified Files:
monetdb5/extras/crackers/Makefile.ag
monetdb5/extras/crackers/Tests/fastcrack00.mal
monetdb5/extras/crackers/Tests/fastcrack_OneOrdered.mal
monetdb5/extras/crackers/Tests/fastcrack_One_00.mal
monetdb5/extras/crackers/Tests/fastcrack_ThreeOrdered.mal
monetdb5/extras/crackers/Tests/fastcrack_Three_00.mal
monetdb5/extras/crackers/Tests/fastcrack_Two_00.mal
monetdb5/extras/crackers/Tests/fastcrack_ZeroOrdered.mal
monetdb5/extras/crackers/Tests/fastcrack_Zero_00.mal
monetdb5/extras/crackers/Tests/fastcrack_copy.mal
monetdb5/extras/crackers/Tests/fastcrack_scan.mal
monetdb5/extras/crackers/Tests/fastcrack_sel_ALL.mal
monetdb5/extras/crackers/Tests/fastcrack_sel_EQ_mid.mal
monetdb5/extras/crackers/Tests/fastcrack_sel_LE_mid.mal
monetdb5/extras/crackers/Tests/fastcrack_sel_low_hgh.mal
monetdb5/extras/crackers/Tests/fastcrack_select_low_hgh.mal
monetdb5/extras/crackers/Tests/fastcrack_select_mid.mal
monetdb5/extras/crackers/Tests/fastcrack_select_void_low_hgh.mal
monetdb5/extras/crackers/Tests/fastcrack_select_void_mid.mal
monetdb5/extras/crackers/Tests/fastcrack_sort.mal
monetdb5/extras/crackers/Tests/tstcrack.mal
monetdb5/extras/crackers/opt_crack.mx
monetdb5/extras/crackers/opt_selcrack.mx
monetdb5/extras/crackers/opt_sidcrack.mx
monetdb5/modules/mal/Tests/fastcrack00.mal
monetdb5/modules/mal/Tests/fastcrack_OneOrdered.mal
monetdb5/modules/mal/Tests/fastcrack_One_00.mal
monetdb5/modules/mal/Tests/fastcrack_ThreeOrdered.mal
monetdb5/modules/mal/Tests/fastcrack_Three_00.mal
monetdb5/modules/mal/Tests/fastcrack_Two_00.mal
monetdb5/modules/mal/Tests/fastcrack_ZeroOrdered.mal
monetdb5/modules/mal/Tests/fastcrack_Zero_00.mal
monetdb5/modules/mal/Tests/fastcrack_copy.mal
monetdb5/modules/mal/Tests/fastcrack_scan.mal
monetdb5/modules/mal/Tests/fastcrack_sel_ALL.mal
monetdb5/modules/mal/Tests/fastcrack_sel_EQ_mid.mal
monetdb5/modules/mal/Tests/fastcrack_sel_LE_mid.mal
monetdb5/modules/mal/Tests/fastcrack_sel_low_hgh.mal
monetdb5/modules/mal/Tests/fastcrack_select_low_hgh.mal
monetdb5/modules/mal/Tests/fastcrack_select_mid.mal
monetdb5/modules/mal/Tests/fastcrack_select_void_low_hgh.mal
monetdb5/modules/mal/Tests/fastcrack_select_void_mid.mal
monetdb5/modules/mal/Tests/fastcrack_sort.mal
monetdb5/modules/mal/Tests/tstcrack.mal
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/opt_crack.mx
monetdb5/optimizer/opt_selcrack.mx
monetdb5/optimizer/opt_sidcrack.mx
Branch: Aug2011
Log Message:
crackers: move everything to extras/crackers
diffs (198 lines):
diff --git a/monetdb5/extras/crackers/Makefile.ag
b/monetdb5/extras/crackers/Makefile.ag
--- a/monetdb5/extras/crackers/Makefile.ag
+++ b/monetdb5/extras/crackers/Makefile.ag
@@ -15,7 +15,10 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-INCLUDES = ../../modules/atoms ../../modules/kernel ../../mal \
+INCLUDES = ../../modules/atoms \
+ ../../modules/kernel \
+ ../../mal \
+ ../../optimizer \
../../../common/options \
../../../common/stream \
../../../gdk
@@ -27,10 +30,25 @@
DIR = libdir/monetdb5
SEP = _
SOURCES = crackers.mx \
- crackers_AVL_index.mx crackers_AVL_tree.mx crackers_index.mx \
- crackers_core_ordered.mx crackers_core_unordered.mx
crackers_validation.mx \
- crackers_joinselect_ops.mx crackers_select_ops.mx
crackers_sideways.mx crackers_partial_sideways.mx crackers_updates.mx
crackers_joins.mx crackers_sortmerge.mx crackers_crackmerge.mx crackers_pq.mx \
- crackers_populate.mx
+ crackers_AVL_index.mx \
+ crackers_AVL_tree.mx \
+ crackers_index.mx \
+ crackers_core_ordered.mx \
+ crackers_core_unordered.mx \
+ crackers_validation.mx \
+ crackers_joinselect_ops.mx \
+ crackers_select_ops.mx \
+ crackers_sideways.mx \
+ crackers_partial_sideways.mx \
+ crackers_updates.mx \
+ crackers_joins.mx \
+ crackers_sortmerge.mx \
+ crackers_crackmerge.mx \
+ crackers_pq.mx \
+ crackers_populate.mx \
+ opt_crack.mx \
+ opt_selcrack.mx \
+ opt_sidcrack.mx
LIBS = ../../tools/libmonetdb5 \
../../../gdk/libbat \
../../../common/stream/libstream \
@@ -40,7 +58,10 @@
headers_mal = {
HEADERS = mal
DIR = libdir/monetdb5
- SOURCES = crackers.mx
+ SOURCES = crackers.mx \
+ opt_crack.mx \
+ opt_selcrack.mx \
+ opt_sidcrack.mx
}
-#EXTRA_DIST_DIR = Tests
+EXTRA_DIST_DIR = Tests
diff --git a/monetdb5/modules/mal/Tests/fastcrack00.mal
b/monetdb5/extras/crackers/Tests/fastcrack00.mal
rename from monetdb5/modules/mal/Tests/fastcrack00.mal
rename to monetdb5/extras/crackers/Tests/fastcrack00.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_OneOrdered.mal
b/monetdb5/extras/crackers/Tests/fastcrack_OneOrdered.mal
rename from monetdb5/modules/mal/Tests/fastcrack_OneOrdered.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_OneOrdered.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_One_00.mal
b/monetdb5/extras/crackers/Tests/fastcrack_One_00.mal
rename from monetdb5/modules/mal/Tests/fastcrack_One_00.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_One_00.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_ThreeOrdered.mal
b/monetdb5/extras/crackers/Tests/fastcrack_ThreeOrdered.mal
rename from monetdb5/modules/mal/Tests/fastcrack_ThreeOrdered.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_ThreeOrdered.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_Three_00.mal
b/monetdb5/extras/crackers/Tests/fastcrack_Three_00.mal
rename from monetdb5/modules/mal/Tests/fastcrack_Three_00.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_Three_00.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_Two_00.mal
b/monetdb5/extras/crackers/Tests/fastcrack_Two_00.mal
rename from monetdb5/modules/mal/Tests/fastcrack_Two_00.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_Two_00.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_ZeroOrdered.mal
b/monetdb5/extras/crackers/Tests/fastcrack_ZeroOrdered.mal
rename from monetdb5/modules/mal/Tests/fastcrack_ZeroOrdered.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_ZeroOrdered.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_Zero_00.mal
b/monetdb5/extras/crackers/Tests/fastcrack_Zero_00.mal
rename from monetdb5/modules/mal/Tests/fastcrack_Zero_00.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_Zero_00.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_copy.mal
b/monetdb5/extras/crackers/Tests/fastcrack_copy.mal
rename from monetdb5/modules/mal/Tests/fastcrack_copy.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_copy.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_scan.mal
b/monetdb5/extras/crackers/Tests/fastcrack_scan.mal
rename from monetdb5/modules/mal/Tests/fastcrack_scan.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_scan.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_sel_ALL.mal
b/monetdb5/extras/crackers/Tests/fastcrack_sel_ALL.mal
rename from monetdb5/modules/mal/Tests/fastcrack_sel_ALL.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_sel_ALL.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_sel_EQ_mid.mal
b/monetdb5/extras/crackers/Tests/fastcrack_sel_EQ_mid.mal
rename from monetdb5/modules/mal/Tests/fastcrack_sel_EQ_mid.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_sel_EQ_mid.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_sel_LE_mid.mal
b/monetdb5/extras/crackers/Tests/fastcrack_sel_LE_mid.mal
rename from monetdb5/modules/mal/Tests/fastcrack_sel_LE_mid.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_sel_LE_mid.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_sel_low_hgh.mal
b/monetdb5/extras/crackers/Tests/fastcrack_sel_low_hgh.mal
rename from monetdb5/modules/mal/Tests/fastcrack_sel_low_hgh.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_sel_low_hgh.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_select_low_hgh.mal
b/monetdb5/extras/crackers/Tests/fastcrack_select_low_hgh.mal
rename from monetdb5/modules/mal/Tests/fastcrack_select_low_hgh.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_select_low_hgh.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_select_mid.mal
b/monetdb5/extras/crackers/Tests/fastcrack_select_mid.mal
rename from monetdb5/modules/mal/Tests/fastcrack_select_mid.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_select_mid.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_select_void_low_hgh.mal
b/monetdb5/extras/crackers/Tests/fastcrack_select_void_low_hgh.mal
rename from monetdb5/modules/mal/Tests/fastcrack_select_void_low_hgh.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_select_void_low_hgh.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_select_void_mid.mal
b/monetdb5/extras/crackers/Tests/fastcrack_select_void_mid.mal
rename from monetdb5/modules/mal/Tests/fastcrack_select_void_mid.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_select_void_mid.mal
diff --git a/monetdb5/modules/mal/Tests/fastcrack_sort.mal
b/monetdb5/extras/crackers/Tests/fastcrack_sort.mal
rename from monetdb5/modules/mal/Tests/fastcrack_sort.mal
rename to monetdb5/extras/crackers/Tests/fastcrack_sort.mal
diff --git a/monetdb5/modules/mal/Tests/tstcrack.mal
b/monetdb5/extras/crackers/Tests/tstcrack.mal
rename from monetdb5/modules/mal/Tests/tstcrack.mal
rename to monetdb5/extras/crackers/Tests/tstcrack.mal
diff --git a/monetdb5/optimizer/opt_crack.mx
b/monetdb5/extras/crackers/opt_crack.mx
rename from monetdb5/optimizer/opt_crack.mx
rename to monetdb5/extras/crackers/opt_crack.mx
--- a/monetdb5/optimizer/opt_crack.mx
+++ b/monetdb5/extras/crackers/opt_crack.mx
@@ -117,7 +117,7 @@
return actions;
}
-@include optimizerWrapper.mx
+@include ../../optimizer/optimizerWrapper.mx
@h
@:exportOptimizer(crack)@
#endif
diff --git a/monetdb5/optimizer/opt_selcrack.mx
b/monetdb5/extras/crackers/opt_selcrack.mx
rename from monetdb5/optimizer/opt_selcrack.mx
rename to monetdb5/extras/crackers/opt_selcrack.mx
--- a/monetdb5/optimizer/opt_selcrack.mx
+++ b/monetdb5/extras/crackers/opt_selcrack.mx
@@ -204,7 +204,7 @@
return actions;
}
-@include optimizerWrapper.mx
+@include ../../optimizer/optimizerWrapper.mx
@c
#include "opt_statistics.h"
@:wrapOptimizer(selcrack,OPT_CHECK_ALL)@
diff --git a/monetdb5/optimizer/opt_sidcrack.mx
b/monetdb5/extras/crackers/opt_sidcrack.mx
rename from monetdb5/optimizer/opt_sidcrack.mx
rename to monetdb5/extras/crackers/opt_sidcrack.mx
--- a/monetdb5/optimizer/opt_sidcrack.mx
+++ b/monetdb5/extras/crackers/opt_sidcrack.mx
@@ -464,7 +464,7 @@
return actions;
}
-@include optimizerWrapper.mx
+@include ../../optimizer/optimizerWrapper.mx
@c
#include "opt_statistics.h"
@:wrapOptimizer(sidcrack,OPT_CHECK_ALL)@
diff --git a/monetdb5/optimizer/Makefile.ag b/monetdb5/optimizer/Makefile.ag
--- a/monetdb5/optimizer/Makefile.ag
+++ b/monetdb5/optimizer/Makefile.ag
@@ -37,7 +37,6 @@
opt_compression.mx \
opt_constants.mx \
opt_costModel.mx \
- opt_crack.mx \
opt_datacyclotron.mx \
opt_dataflow.mx \
opt_deadcode.mx \
@@ -71,8 +70,6 @@
opt_remap.mx \
opt_remoteQueries.mx \
opt_reorder.mx \
- opt_selcrack.mx \
- opt_sidcrack.mx \
opt_singleton.mx \
opt_statistics.mx \
opt_strengthReduction.mx \
@@ -85,7 +82,7 @@
HEADERS = mal
DIR = libdir/monetdb5
SOURCES = opt_prelude.mx \
- opt_support.mx opt_crack.mx optimizer.mx opt_factorize.mx \
+ opt_support.mx optimizer.mx opt_factorize.mx \
opt_deadcode.mx opt_garbageCollector.mx
opt_strengthReduction.mx \
opt_aliases.mx opt_constants.mx opt_commonTerms.mx
opt_datacyclotron.mx \
opt_coercion.mx opt_emptySet.mx opt_peephole.mx
opt_multiplex.mx \
@@ -97,7 +94,7 @@
opt_accessmode.mx opt_joinpath.mx opt_heuristics.mx
opt_remap.mx \
opt_statistics.mx opt_trace.mx opt_recycler.mx opt_dataflow.mx
\
opt_cluster.mx opt_dictionary.mx opt_mapreduce.mx opt_origin.mx
\
- opt_mitosis.mx opt_octopus.mx opt_tarantula.mx opt_history.mx
opt_selcrack.mx opt_sidcrack.mx
+ opt_mitosis.mx opt_octopus.mx opt_tarantula.mx opt_history.mx
}
EXTRA_DIST = optimizerWrapper.mx
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
