Changeset: d15b44af80b9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d15b44af80b9 Removed Files: monetdb5/extras/crackers/60_crackers.mal 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/crackers.mx monetdb5/extras/crackers/crackers_AVL_index.mx monetdb5/extras/crackers/crackers_AVL_tree.mx monetdb5/extras/crackers/crackers_core_ordered.mx monetdb5/extras/crackers/crackers_core_unordered.mx monetdb5/extras/crackers/crackers_crackmerge.mx monetdb5/extras/crackers/crackers_index.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_select_ops.mx 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_selcrack.mx monetdb5/extras/crackers/opt_sidcrack.mx monetdb5/modules/mal/Tests/CrackSelectRangeRandom.mal monetdb5/modules/mal/Tests/SelectRangeRandom.mal monetdb5/modules/mal/Tests/SelectSortRangeRandom.mal monetdb5/optimizer/opt_joinselect.mx Modified Files: monetdb5/ChangeLog.Jul2012 monetdb5/RunMtest.bat.in monetdb5/RunMtest.in monetdb5/extras/Makefile.ag monetdb5/modules/mal/mal_init.mal monetdb5/optimizer/Makefile.ag Branch: Jul2012 Log Message:
crackers: remove The crackers code is not ready for general consumption yet. Its development will continue in the holindex branch by Eleni. diffs (truncated from 23669 to 300 lines): diff --git a/monetdb5/ChangeLog.Jul2012 b/monetdb5/ChangeLog.Jul2012 --- a/monetdb5/ChangeLog.Jul2012 +++ b/monetdb5/ChangeLog.Jul2012 @@ -1,3 +1,7 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Thu Jun 14 2012 Fabian Groffen <[email protected]> +- Crackers code has been removed. Development continues in the holindex + branch. + diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in --- a/monetdb5/RunMtest.bat.in +++ b/monetdb5/RunMtest.bat.in @@ -43,7 +43,6 @@ set PATH=%buildbase%\monetdb5\tools;%PAT rem modules (lib_*.dll and *.mal) set MOD_PATH=%buildbase%\geom\monetdb5 set MOD_PATH=%buildbase%\monetdb5\extras\compiler;%MOD_PATH% -set MOD_PATH=%buildbase%\monetdb5\extras\crackers;%MOD_PATH% set MOD_PATH=%buildbase%\monetdb5\modules\atoms;%MOD_PATH% set MOD_PATH=%buildbase%\monetdb5\modules\kernel;%MOD_PATH% set MOD_PATH=%buildbase%\monetdb5\modules\mal;%MOD_PATH% diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in --- a/monetdb5/RunMtest.in +++ b/monetdb5/RunMtest.in @@ -58,7 +58,7 @@ mkdir -p ${buildbase}/geom/monetdb5/crea cp ${srcdir}/geom/sql/[0-9][0-9]_*.sql ${buildbase}/geom/monetdb5/createdb 2>/dev/null # where compiled monetdb5 modules are to be found -for d in optimizer scheduler modules/atoms modules/kernel modules/mal extras/crackers extras/compiler +for d in optimizer scheduler modules/atoms modules/kernel modules/mal extras/compiler do [ -d "${buildbase}/monetdb5/$d/.libs" ] && MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d" diff --git a/monetdb5/extras/Makefile.ag b/monetdb5/extras/Makefile.ag --- a/monetdb5/extras/Makefile.ag +++ b/monetdb5/extras/Makefile.ag @@ -15,5 +15,5 @@ # Copyright August 2008-2012 MonetDB B.V. # All Rights Reserved. -SUBDIRS = compiler ENABLE_CRACKERS?crackers HAVE_RAPTOR?rdf HAVE_SPHINXCLIENT?sphinx HAVE_JAQL?jaql mal_optimizer_template +SUBDIRS = compiler HAVE_RAPTOR?rdf HAVE_SPHINXCLIENT?sphinx HAVE_JAQL?jaql mal_optimizer_template diff --git a/monetdb5/extras/crackers/60_crackers.mal b/monetdb5/extras/crackers/60_crackers.mal deleted file mode 100644 --- a/monetdb5/extras/crackers/60_crackers.mal +++ /dev/null @@ -1,24 +0,0 @@ -# The contents of this file are subject to the MonetDB Public License -# Version 1.1 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://www.monetdb.org/Legal/MonetDBLicense -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the MonetDB Database System. -# -# The Initial Developer of the Original Code is CWI. -# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2012 MonetDB B.V. -# All Rights Reserved. - -# 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 deleted file mode 100644 --- a/monetdb5/extras/crackers/Makefile.ag +++ /dev/null @@ -1,75 +0,0 @@ -# The contents of this file are subject to the MonetDB Public License -# Version 1.1 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://www.monetdb.org/Legal/MonetDBLicense -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -# License for the specific language governing rights and limitations -# under the License. -# -# The Original Code is the MonetDB Database System. -# -# The Initial Developer of the Original Code is CWI. -# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2012 MonetDB B.V. -# All Rights Reserved. - -INCLUDES = ../../modules/atoms \ - ../../modules/kernel \ - ../../mal \ - ../../optimizer \ - ../../../common/options \ - ../../../common/stream \ - ../../../gdk - -MTSAFE - -lib_crackers = { - MODULE - 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.c crackers_pq.h \ - crackers_populate.mx \ - opt_crack.mx \ - opt_selcrack.mx \ - opt_sidcrack.mx - LIBS = ../../tools/libmonetdb5 \ - ../../../gdk/libbat \ - ../../../common/stream/libstream \ - $(MALLOC_LIBS) -} - -headers_mal = { - HEADERS = mal - DIR = libdir/monetdb5 - SOURCES = crackers.mx \ - opt_crack.mx \ - opt_selcrack.mx \ - opt_sidcrack.mx -} - -headers_crackersautoload = { - HEADERS = mal - DIR = libdir/monetdb5/autoload - SOURCES = 60_crackers.mal -} - -EXTRA_DIST = 60_crackers.mal - -EXTRA_DIST_DIR = Tests 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); - _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
