Changeset: f46675e42b9f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f46675e42b9f
Removed Files:
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/crackers_AVL_index.mx
monetdb5/extras/crackers/crackers_core_ordered.mx
monetdb5/extras/crackers/crackers_crackmerge.mx
monetdb5/extras/crackers/crackers_joins.mx
monetdb5/extras/crackers/crackers_joinselect_ops.mx
monetdb5/extras/crackers/crackers_partial_sideways.mx
monetdb5/extras/crackers/crackers_populate.mx
monetdb5/extras/crackers/crackers_pq.c
monetdb5/extras/crackers/crackers_pq.h
monetdb5/extras/crackers/crackers_sideways.mx
monetdb5/extras/crackers/crackers_sortmerge.mx
monetdb5/extras/crackers/crackers_updates.mx
monetdb5/extras/crackers/crackers_validation.mx
monetdb5/extras/crackers/opt_crack.mx
monetdb5/extras/crackers/opt_sidcrack.mx
Modified Files:
monetdb5/extras/crackers/60_crackers.mal
monetdb5/extras/crackers/Makefile.ag
monetdb5/extras/crackers/crackers.mx
monetdb5/extras/crackers/crackers_AVL_tree.mx
monetdb5/extras/crackers/crackers_core_unordered.mx
monetdb5/extras/crackers/crackers_index.mx
monetdb5/extras/crackers/crackers_select_ops.mx
monetdb5/optimizer/opt_pipes.c
Branch: holindex
Log Message:
Crackers cleanup: removed all code but selection cracking
As a starting point of holistic indexing,
we clean up the crackers code base by
removing all (experimental) code except
the basic selection cracking.
diffs (truncated from 20185 to 300 lines):
diff --git a/monetdb5/extras/crackers/60_crackers.mal
b/monetdb5/extras/crackers/60_crackers.mal
--- a/monetdb5/extras/crackers/60_crackers.mal
+++ b/monetdb5/extras/crackers/60_crackers.mal
@@ -17,8 +17,6 @@
# This loads the MonetDB/Crackers module
library crackers;
-include opt_crack;
-include opt_sidcrack;
include opt_selcrack;
include crackers;
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
@@ -33,22 +33,9 @@ lib_crackers = {
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.c crackers_pq.h \
- crackers_populate.mx \
- opt_crack.mx \
- opt_selcrack.mx \
- opt_sidcrack.mx
+ opt_selcrack.mx
LIBS = ../../tools/libmonetdb5 \
../../../gdk/libbat \
../../../common/stream/libstream \
@@ -59,9 +46,7 @@ headers_mal = {
HEADERS = mal
DIR = libdir/monetdb5
SOURCES = crackers.mx \
- opt_crack.mx \
- opt_selcrack.mx \
- opt_sidcrack.mx
+ opt_selcrack.mx
}
headers_crackersautoload = {
diff --git a/monetdb5/extras/crackers/Tests/fastcrack00.mal
b/monetdb5/extras/crackers/Tests/fastcrack00.mal
deleted file mode 100644
--- a/monetdb5/extras/crackers/Tests/fastcrack00.mal
+++ /dev/null
@@ -1,34 +0,0 @@
-# The first reference case for fast cracking
-include microbenchmark;
-
-tuples:= 1024*1024; #67108864= 64* 1024*1024
-b:= microbenchmark.uniform(0@0,tuples,tuples);
-
-size:= bat.getBatSize(b);
-io.printf("# tuples %d\n",tuples);
-io.printf("# BAT size %d\n",size);
-
-crackers.new(b);
-
-total:=0:lng;
-n:= 25;
-barrier (go,i):= (true,0);
- low:int:= mmath.rand();
- low := low % tuples;
- hgh:int:= mmath.rand();
- hgh := hgh % tuples;
- redo go := low>hgh;
-t0:= alarm.usec();
- crackers.crack(b,low);
-t1:= alarm.usec();
- time:= t1 - t0;
- total:= total+time;
- io.print(low,hgh,time);
- redo (go,i):= language.nextElement(1,n);
-exit (go,i);
-
-m:= calc.lng(n);
-f:= total/m;
-io.print(f);
-crackers.destroy(b);
-
diff --git a/monetdb5/extras/crackers/Tests/fastcrack_OneOrdered.mal
b/monetdb5/extras/crackers/Tests/fastcrack_OneOrdered.mal
deleted file mode 100644
--- a/monetdb5/extras/crackers/Tests/fastcrack_OneOrdered.mal
+++ /dev/null
@@ -1,39 +0,0 @@
-# The first reference case for fast cracking
-
-include microbenchmark;
-include crackers;
-
-tuples:=1048576;
-values:= tuples;
-io.printf(" tuples %d\n",tuples);
-io.printf(" values %d\n",values);
-
-b:= microbenchmark.uniform(0@0,tuples,values);
-size:= bat.getBatSize(b);
-io.printf(" BAT size %d\n",size);
-
-n:=30;
-t:=0:lng;
-barrier (go,i):= (true,0);
- b:= microbenchmark.uniform(0@0,tuples,values);
- mid:int:= mmath.rand();
- mid := mid % values;
-
-t0:= alarm.usec();
- c:=crackers.crackOrdered(b,mid);
-t1:= alarm.usec();
- time:= t1 - t0;
- t := t + time;
- v := crackers.crackOrdered_validate(c,mid);
- io.print(values,mid,time,v);
-
- values:int:= mmath.rand();
- values:= values % tuples;
- values:= values + 1;
-
- redo (go,i):= language.nextElement(1,n);
-exit (go,i);
-
-io.print("");
-t := t / n;
-io.print("OneOrdered",t);
diff --git a/monetdb5/extras/crackers/Tests/fastcrack_One_00.mal
b/monetdb5/extras/crackers/Tests/fastcrack_One_00.mal
deleted file mode 100644
--- a/monetdb5/extras/crackers/Tests/fastcrack_One_00.mal
+++ /dev/null
@@ -1,40 +0,0 @@
-# The first reference case for fast cracking
-
-include microbenchmark;
-include crackers;
-
-tuples:=1048576;
-values:= tuples;
-io.printf(" tuples %d\n",tuples);
-io.printf(" values %d\n",values);
-
-b:= microbenchmark.uniform(0@0,tuples,values);
-size:= bat.getBatSize(b);
-io.printf(" BAT size %d\n",size);
-
-n:=30;
-t:=0:lng;
-barrier (go,i):= (true,0);
- b:= microbenchmark.uniform(0@0,tuples,values);
- mid:int:= mmath.rand();
- mid := mid % values;
-
-t0:= alarm.usec();
- c:=crackers.crack(b,mid);
-t1:= alarm.usec();
- time:= t1 - t0;
- t := t + time;
- v := crackers.crack_validate(c,mid);
- io.print(values,mid,time,v);
- crackers.destroy(b);
-
- values:int:= mmath.rand();
- values:= values % tuples;
- values:= values + 1;
-
- redo (go,i):= language.nextElement(1,n);
-exit (go,i);
-
-io.print("");
-t := t / n;
-io.print("One_00",t);
diff --git a/monetdb5/extras/crackers/Tests/fastcrack_ThreeOrdered.mal
b/monetdb5/extras/crackers/Tests/fastcrack_ThreeOrdered.mal
deleted file mode 100644
--- a/monetdb5/extras/crackers/Tests/fastcrack_ThreeOrdered.mal
+++ /dev/null
@@ -1,42 +0,0 @@
-# The first reference case for fast cracking
-
-include microbenchmark;
-include crackers;
-
-tuples:=1048576;
-values:= tuples;
-io.printf(" tuples %d\n",tuples);
-io.printf(" values %d\n",values);
-
-b:= microbenchmark.uniform(0@0,tuples,values);
-size:= bat.getBatSize(b);
-io.printf(" BAT size %d\n",size);
-
-n:=30;
-t:=0:lng;
-barrier (go,i):= (true,0);
- b:= microbenchmark.uniform(0@0,tuples,values);
- low:int:= mmath.rand();
- low := low % values;
- hgh:int:= mmath.rand();
- hgh := hgh % values;
- redo go := low>hgh;
-
-t0:= alarm.usec();
- c:=crackers.zcrackOrdered(b,low,hgh);
-t1:= alarm.usec();
- time:= t1 - t0;
- t := t + time;
- v := crackers.zcrackOrdered_validate(c,low,hgh);
- io.print(values,low,hgh,time,v);
-
- values:int:= mmath.rand();
- values:= values % tuples;
- values:= values + 1;
-
- redo (go,i):= language.nextElement(1,n);
-exit (go,i);
-
-io.print("");
-t := t / n;
-io.print("ThreeOrdered",t);
diff --git a/monetdb5/extras/crackers/Tests/fastcrack_Three_00.mal
b/monetdb5/extras/crackers/Tests/fastcrack_Three_00.mal
deleted file mode 100644
--- a/monetdb5/extras/crackers/Tests/fastcrack_Three_00.mal
+++ /dev/null
@@ -1,43 +0,0 @@
-# The first reference case for fast cracking
-
-include microbenchmark;
-include crackers;
-
-tuples:=1048576;
-values:= tuples;
-io.printf(" tuples %d\n",tuples);
-io.printf(" values %d\n",values);
-
-b:= microbenchmark.uniform(0@0,tuples,values);
-size:= bat.getBatSize(b);
-io.printf(" BAT size %d\n",size);
-
-n:=30;
-t:=0:lng;
-barrier (go,i):= (true,0);
- b:= microbenchmark.uniform(0@0,tuples,values);
- low:int:= mmath.rand();
- low := low % values;
- hgh:int:= mmath.rand();
- hgh := hgh % values;
- redo go := low>hgh;
-
-t0:= alarm.usec();
- c:=crackers.crack(b,low,hgh);
-t1:= alarm.usec();
- time:= t1 - t0;
- t := t + time;
- v := crackers.zcrack_validate(c,low,hgh);
- io.print(values,low,hgh,time,v);
- crackers.destroy(b);
-
- values:int:= mmath.rand();
- values:= values % tuples;
- values:= values + 1;
-
- redo (go,i):= language.nextElement(1,n);
-exit (go,i);
-
-io.print("");
-t := t / n;
-io.print("Three_00",t);
diff --git a/monetdb5/extras/crackers/Tests/fastcrack_Two_00.mal
b/monetdb5/extras/crackers/Tests/fastcrack_Two_00.mal
deleted file mode 100644
--- a/monetdb5/extras/crackers/Tests/fastcrack_Two_00.mal
+++ /dev/null
@@ -1,43 +0,0 @@
-# The first reference case for fast cracking
-
-include microbenchmark;
-include crackers;
-
-tuples:=1048576;
-values:= tuples;
-io.printf(" tuples %d\n",tuples);
-io.printf(" values %d\n",values);
-
-b:= microbenchmark.uniform(0@0,tuples,values);
-size:= bat.getBatSize(b);
-io.printf(" BAT size %d\n",size);
-
-n:=30;
-t:=0:lng;
-barrier (go,i):= (true,0);
- b:= microbenchmark.uniform(0@0,tuples,values);
- low:int:= mmath.rand();
- low := low % values;
- hgh:int:= mmath.rand();
- hgh := hgh % values;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
