Changeset: cb6f92aca4ec for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb6f92aca4ec
Modified Files:
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/opt_crack.mx
monetdb5/optimizer/opt_datacell.mx
monetdb5/optimizer/opt_selcrack.mx
monetdb5/optimizer/opt_sidcrack.mx
monetdb5/optimizer/opt_slicing.mx
Branch: default
Log Message:
Merge with default
diffs (truncated from 969 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -33,7 +33,10 @@
BuildRequires: bzip2-devel
# BuildRequires: cfitsio-devel
BuildRequires: flex
+%if %{?centos:0}%{!?centos:1}
+# no geos library on CentOS
BuildRequires: geos-devel >= 2.2.0
+%endif
BuildRequires: libcurl-devel
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel
@@ -263,8 +266,8 @@
%{gemdir}/doc/activerecord-monetdb-adapter-0.1/*
%{gemdir}/doc/ruby-monetdb-sql-0.1/*
%{gemdir}/cache/*.gem
-%dir %{gemdir}/gems/activerecord-monetdb-adapter-0.1
-%dir %{gemdir}/gems/ruby-monetdb-sql-0.1
+# %dir %{gemdir}/gems/activerecord-monetdb-adapter-0.1
+# %dir %{gemdir}/gems/ruby-monetdb-sql-0.1
%{gemdir}/gems/activerecord-monetdb-adapter-0.1
%{gemdir}/gems/ruby-monetdb-sql-0.1
%{gemdir}/specifications/*.gemspec
@@ -306,6 +309,7 @@
%{_bindir}/sqlsample.pl
%{_bindir}/sqlsample.py
+%if %{?centos:0}%{!?centos:1}
%package geom-MonetDB5
Summary: MonetDB5 SQL GIS support module
Group: Applications/Databases
@@ -328,6 +332,7 @@
%{_libdir}/monetdb5/createdb/*_geom.sql
%{_libdir}/monetdb5/geom.mal
%{_libdir}/monetdb5/lib_geom.so
+%endif
%package -n MonetDB5-server
Summary: MonetDB - Monet Database Management System
@@ -376,7 +381,9 @@
%{_libdir}/libmonetdb5.so.*
%dir %{_libdir}/monetdb5
%dir %{_libdir}/monetdb5/autoload
+%if %{?centos:0}%{!?centos:1}
%exclude %{_libdir}/monetdb5/geom.mal
+%endif
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
%exclude %{_libdir}/monetdb5/sql_bpm.mal
@@ -385,7 +392,9 @@
%{_libdir}/monetdb5/autoload/*_vault.mal
%{_libdir}/monetdb5/autoload/*_lsst.mal
%{_libdir}/monetdb5/autoload/*_udf.mal
+%if %{?centos:0}%{!?centos:1}
%exclude %{_libdir}/monetdb5/lib_geom.so
+%endif
# %exclude %{_libdir}/monetdb5/lib_rdf.so
%exclude %{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.so
@@ -438,7 +447,9 @@
%{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.sql
%dir %{_libdir}/monetdb5/createdb
+%if %{?centos:0}%{!?centos:1}
%exclude %{_libdir}/monetdb5/createdb/*_geom.sql
+%endif
# %exclude %{_libdir}/monetdb5/createdb/*_rdf.sql
%{_libdir}/monetdb5/createdb/*
%{_libdir}/monetdb5/sql*.mal
@@ -538,6 +549,7 @@
--enable-fits=no \
--with-valgrind=no \
--with-mseed=no \
+ --with-geos=%{?centos:no}%{!?centos:yes}
%{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
%{?_with_netcdf} %{?_without_netcdf}
diff --git a/buildtools/ChangeLog.Apr2011 b/buildtools/ChangeLog.Apr2011
--- a/buildtools/ChangeLog.Apr2011
+++ b/buildtools/ChangeLog.Apr2011
@@ -1,6 +1,10 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Wed Jul 13 2011 Sjoerd Mullender <[email protected]>
+- We can now build RPMs on CentOS 6.0. Since there is no geos library
+ on CentOS, we do not support the geom modules there.
+
* Wed Jun 29 2011 Sjoerd Mullender <[email protected]>
- We can now also build on Fedora 15. This required some very minor
changes.
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -131,4 +131,4 @@
distdir: check_dist
check_dist:
- @if [ "$(SWIG)" = "no" ]; then $(ECHO) "Cannot create distribution
because one of the necessary programs or libraries is missing"; echo "swig =
$(SWIG)"; exit 1; fi
+ @if [ "$(SWIG)" = "no" ]; then echo "Cannot create distribution because
one of the necessary programs or libraries is missing"; echo "swig =
$(SWIG)"; exit 1; fi
diff --git a/clients/perl/Cimpl/Makefile.ag b/clients/perl/Cimpl/Makefile.ag
--- a/clients/perl/Cimpl/Makefile.ag
+++ b/clients/perl/Cimpl/Makefile.ag
@@ -31,7 +31,7 @@
# MapiLib.pm.c: In function 'boot_MapiLib':
# MapiLib.pm.c:6157: warning: passing argument 2 of '_swig_create_magic'
discards qualifiers from pointer target type
# Hence, we have to disable (override) our X_CFLAGS completely:
-#X_CFLAGS = -D_GNU_SOURCE
+X_CFLAGS =
# Likewise, we need to disable W_CFLAGS=-WX (i.e., treating warnings
# as errors) for swig-generated code on Windows
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -166,6 +166,13 @@
enable_rdf=$enableval,
enable_rdf=$dft_rdf)
+dft_crackers=no
+AC_ARG_ENABLE(crackers,
+ AS_HELP_STRING([--enable-crackers],
+ [enable database cracking components (default=no)]),
+ enable_crackers=$enableval,
+ enable_crackers=$dft_crackers)
+
dft_datacell=no
AC_ARG_ENABLE(datacell,
AS_HELP_STRING([--enable-datacell],
@@ -458,13 +465,14 @@
LINUX_DIST=''
case "$host_os" in
linux*)
+ dnl Please keep this aligned / in sync with testing/Mtest.py.in !
AC_MSG_CHECKING(which Linux distribution we're using)
if test -s /etc/fedora-release ; then
LINUX_DIST="`cat /etc/fedora-release | head -n1 \
| sed 's|^.*\(Fedora\).* release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|'`"
elif test -s /etc/centos-release ; then
LINUX_DIST="`cat /etc/centos-release | head -n1 \
- | sed 's|^\(CentOS\) release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|'`"
+ | sed 's|^\(CentOS\).* release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|'`"
elif test -s /etc/yellowdog-release ; then
LINUX_DIST="`cat /etc/yellowdog-release | head -n1 \
| sed 's|^\(Yellow\) Dog Linux release \([[0-9]][[^
\n]]*\)\( .*\)*$|\1:\2|'`"
@@ -472,7 +480,7 @@
LINUX_DIST="`cat /etc/redhat-release | head -n1 \
| sed 's|^.*\(Red\) \(Hat\).* Linux *\([[A-Z]]*\)
release \([[0-9]][[^ \n]]*\)\( .*\)*$|\1\2:\4\3|' \
| sed 's|^Red Hat Enterprise Linux \([[AW]]S\) release
\([[0-9]][[^ \n]]*\)\( .*\)*$|RHEL:\2\1|' \
- | sed 's|^\(CentOS\) release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|' \
+ | sed 's|^\(CentOS\).* release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|' \
| sed 's|^\(Scientific\) Linux SL release \([[0-9]][[^
\n]]*\)\( .*\)*$|\1:\2|'`"
elif test -s /etc/SuSE-release ; then
LINUX_DIST="`cat /etc/SuSE-release | head -n1 \
@@ -569,13 +577,17 @@
;;
esac
case "$CC-$gcc_ver" in
+ *clang*-*|*-4.[[3-9]].*|*-[[5-9]].*)
+ dnl this triggers a warning (-> error) with gcc < 4.3
+ X_CFLAGS="$X_CFLAGS -Wstack-protector"
+ ;;
+ esac
+ case "$CC-$gcc_ver" in
*clang*-*|*-3.[[5-9]].*|*-[[4-9]].*)
dnl gcc < 3.5 does not know these
- X_CFLAGS="$X_CFLAGS -Wstack-protector"
X_CFLAGS="$X_CFLAGS -Wvariadic-macros"
;;
esac
-
case "$CC" in
*clang*)
;;
@@ -595,16 +607,21 @@
X_CFLAGS="$X_CFLAGS -Wjump-misses-init"
dnl these trigger a warning (-> error) with
clang (2.8) & gcc < 4.5
X_CFLAGS="$X_CFLAGS -Wunreachable-code"
- dnl clang (2.8) does not know these
+ dnl clang (2.8) & gcc < 4.3 do not know these
dnl these trigger a warning (-> error) with gcc
< 4.5
X_CFLAGS="$X_CFLAGS -Wlogical-op"
;;
esac
-
;;
esac
- dnl these trigger a warning (-> error) with clang (2.8)
- X_CFLAGS="$X_CFLAGS -Wcast-align"
+ case "$host" in
+ sparc*)
+ ;;
+ *)
+ dnl these trigger a warning (-> error) with clang (2.8)
and on sparc
+ X_CFLAGS="$X_CFLAGS -Wcast-align"
+ ;;
+ esac
;;
esac
@@ -693,12 +710,16 @@
dnl as locally as possbile via "-Wno-strict-aliasing
-Wno-unused-variable -Wno-unused-function -Wno-unused-parameter -Wno-undef
-Wno-missing-field-initializers"
dnl (see also clients/perl/Cimpl/Makefile.ag).
GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-strict-aliasing
-Wno-unused-variable -Wno-unused-function -Wno-unused-parameter -Wno-undef
-Wno-unused-value"
- case "$CC-$gcc_ver" in
- *clang*-*)
+ case "$CC" in
+ *clang*)
;;
- *-3.[[5-9]].*|*-[[4-9]].*)
- dnl clang (2.8) & gcc < 3.5 do not know this
- GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-logical-op"
+ *)
+ case "$gcc_ver" in
+ 4.[[3-9]].*|[[5-9]].*)
+ dnl clang (2.8) & gcc < 4.3 do not know this
+ GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-logical-op"
+ ;;
+ esac
case "$gcc_ver" in
3.[[5-9]].*|4.[[0-4]].*)
dnl 3.4 < gcc < 4.5 trigger a warning (-> error)
without this
@@ -2364,6 +2385,8 @@
fi
AM_CONDITIONAL(HAVE_RAPTOR, test x"$have_raptor" != xno)
+AM_CONDITIONAL(ENABLE_CRACKERS, test x"$enable_crackers" != xno)
+
AM_CONDITIONAL(ENABLE_DATACELL, test x"$enable_datacell" != xno)
PKG_CHECK_MODULES([curl], [libcurl], [have_curl="yes"], [have_curl="no"])
@@ -3369,6 +3392,7 @@
geom \
fits \
rdf \
+ crackers \
datacell \
odbc \
jdbc \
diff --git a/monetdb5/ChangeLog.Aug2011 b/monetdb5/ChangeLog.Aug2011
--- a/monetdb5/ChangeLog.Aug2011
+++ b/monetdb5/ChangeLog.Aug2011
@@ -1,6 +1,10 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Wed Jul 13 2011 Fabian Groffen <[email protected]>
+- Make crackers optional and disable by default, since it wasn't used
+ normally
+
* Fri Apr 22 2011 Fabian Groffen <[email protected]>
- Authorisation no longer takes scenarios into account. Access for only
sql or mal is no longer possible. Any credentials now mean access to
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-2011 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = compiler crackers HAVE_RAPTOR?rdf HAVE_SPHINXCLIENT?sphinx
+SUBDIRS = compiler ENABLE_CRACKERS?crackers HAVE_RAPTOR?rdf
HAVE_SPHINXCLIENT?sphinx
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 \
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
