Changeset: 06d28203f180 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=06d28203f180
Added Files:
monetdb5/extras/bwd/91_opt_bwd.mal
monetdb5/extras/bwd/Makefile.ag
monetdb5/extras/bwd/bwd.c
monetdb5/extras/bwd/opt_bwd.mal
Modified Files:
configure.ag
monetdb5/extras/Makefile.ag
Branch: bwd
Log Message:
* started the bitwise decomposition implementation for monetdb by adding a
module and changing the makefile/configure autogen files
Unterschiede (137 Zeilen):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -227,6 +227,23 @@ no-auto)
;;
esac
+dft_bwd=no
+AC_ARG_ENABLE(bwd,
+ AS_HELP_STRING([--enable-bwd],
+ [enable Bitwise Decomposition of Data (default=no)]),
+ enable_bwd=$enableval,
+ enable_bwd=$dft_bwd)
+
+case "$enable_monetdb5-$enable_bwd" in
+no-yes)
+ AC_MSG_ERROR([Bitwise Decomposition requires MonetDB5.])
+ ;;
+no-auto)
+ enable_bwd=no
+ disable_bwd="(Bitwise Decomposition requires MonetDB5.)"
+ ;;
+esac
+
dft_odbc=auto
AC_ARG_ENABLE(odbc,
AS_HELP_STRING([--enable-odbc],
@@ -2004,6 +2021,8 @@ AM_CONDITIONAL(HAVE_RAPTOR, test x"$have
AM_CONDITIONAL(ENABLE_DATACELL, test x"$enable_datacell" != xno)
+AM_CONDITIONAL(ENABLE_BWD, test x"$enable_bwd" != xno)
+
PKG_CHECK_MODULES([curl], [libcurl], [have_curl="yes"], [have_curl="no"])
if test x"$have_curl" = x"yes" ; then
AC_DEFINE(HAVE_CURL, 1, [Define if you have the cURL library])
@@ -2720,11 +2739,19 @@ if test x"$enable_jaql" = xauto && test
fi
fi
+if test x"$enable_bwd" = xauto && test x"$enable_monetdb5" = x"no" ; then
+ enable_bwd=no
+ if test "x$disable_bwd" = x; then
+ disable_bwd="(Bitwise Decomposition requires MonetDB5)"
+ fi
+fi
+
dnl output
AM_CONDITIONAL(HAVE_GDK, test "x$enable_gdk" = xyes -o "x$enable_gdk" = xauto)
AM_CONDITIONAL(HAVE_MONETDB5, test "x$enable_monetdb5" = xyes -o
"x$enable_monetdb5" = xauto)
AM_CONDITIONAL(HAVE_SQL, test "x$enable_sql" = xyes -o "x$enable_sql" = xauto)
AM_CONDITIONAL(HAVE_JAQL, test "x$enable_jaql" = xyes -o "x$enable_jaql" =
xauto)
+AM_CONDITIONAL(HAVE_BWD, test "x$enable_bwd" = xyes -o "x$enable_bwd" = xauto)
AM_CONDITIONAL(HAVE_GEOM, test "x$enable_geom" = xyes -o "x$enable_geom" =
xauto)
AM_CONDITIONAL(HAVE_TESTING, test "x$enable_testing" = xyes -o
"x$enable_testing" = xauto)
AM_CONDITIONAL(HAVE_DEVELOPER, test "x$enable_developer" = xyes)
@@ -3048,6 +3075,7 @@ for comp in \
monetdb5 \
sql \
jaql \
+ bwd \
geom \
fits \
rdf \
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 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 ENABLE_BWD?bwd
diff --git a/monetdb5/extras/bwd/91_opt_bwd.mal
b/monetdb5/extras/bwd/91_opt_bwd.mal
new file mode 100644
diff --git a/monetdb5/extras/bwd/Makefile.ag b/monetdb5/extras/bwd/Makefile.ag
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/bwd/Makefile.ag
@@ -0,0 +1,52 @@
+# 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 = \
+ ../../optimizer \
+ ../../mal \
+ ../../../gdk \
+ ../../../common/stream \
+ ../../../common/options
+
+MTSAFE
+
+lib_bwd = {
+ MODULE
+ DIR = libdir/monetdb5
+ SEP = _
+ SOURCES = bwd.c
+ LIBS = ../../tools/libmonetdb5 \
+ ../../../gdk/libbat \
+ ../../../common/stream/libstream \
+ $(MALLOC_LIBS)
+}
+
+headers_mal = {
+ HEADERS = mal
+ DIR = libdir/monetdb5
+ SOURCES = opt_bwd.mal
+}
+
+headers_bwd = {
+ HEADERS = mal
+ DIR = libdir/monetdb5/autoload
+ SOURCES = 91_opt_bwd.mal
+}
+
+EXTRA_DIST = 91_opt_bwd.mal
+
+EXTRA_DIST_DIR = Tests
diff --git a/monetdb5/extras/bwd/bwd.c b/monetdb5/extras/bwd/bwd.c
new file mode 100644
diff --git a/monetdb5/extras/bwd/opt_bwd.mal b/monetdb5/extras/bwd/opt_bwd.mal
new file mode 100644
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
