Changeset: a3f50e2aa730 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3f50e2aa730
Modified Files:
MonetDB.spec
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_none.stable.out
clients/mapiclient/dump.c
clients/mapiclient/tomograph.c
common/utils/msabaoth.c
common/utils/muuid.c
configure.ag
gdk/gdk_bbp.c
gdk/gdk_firstn.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_imprints.h
gdk/gdk_posix.c
gdk/gdk_sample.c
geom/monetdb5/geom.c
monetdb5/mal/Makefile.ag
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_function.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_resolve.c
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/json.mal
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/kernel/mmath.c
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/remote.c
monetdb5/optimizer/opt_mapreduce.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/tests/gdkTests/Tests/firstn.stable.out
monetdb5/tools/Makefile.ag
sql/backends/monet5/datacell/sensor.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/rest/Makefile.ag
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/vaults/fits.c
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/02-plan.stable.out
sql/benchmarks/tpch/Tests/10-plan.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-plan.stable.out
sql/benchmarks/tpch/Tests/18-plan.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-plan.stable.out
sql/benchmarks/tpch/Tests/21-plan.stable.out
sql/include/sql_catalog.h
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_planner.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_decimal.c
sql/server/sql_env.c
sql/server/sql_parser.y
sql/storage/bat/bat_logger.c
sql/storage/sql_catalog.c
sql/storage/store.c
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
testing/difflib.c
tools/merovingian/daemon/connections.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/utils/Makefile.ag
tools/merovingian/utils/utils.c
Branch: Oct2014
Log Message:
merge
Unterschiede (gekürzt von 6647 auf 300 Zeilen):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -18,31 +18,69 @@
%define release %{buildno}%{?dist}%{?oidsuf}
+# On RedHat Enterprise Linux and derivatives, if the Extra Packages
+# for Enterprise Linux (EPEL) repository is available, you can define
+# the _with_epel macro. When using mock to build the RPMs, this can
+# be done using the --with=epel option to mock.
+# If the EPEL repository is availabe, or if building for Fedora, all
+# optional sub packages can be built. We indicate that here by
+# setting the macro fedpkgs to 1. If the EPEL repository is not
+# available and we are not building for Fedora, we set fedpkgs to 0.
+%if %{?rhel:1}%{!?rhel:0}
+# RedHat Enterprise Linux (or CentOS or Scientific Linux)
+%if %{?_with_epel:1}%{!?_with_epel:0}
+# EPEL is enabled through the command line
+%define fedpkgs 1
+%else
+# EPEL is not enabled
+%define fedpkgs 0
+%endif
+%else
+# Not RHEL (so presumably Fedora)
+%define fedpkgs 1
+%endif
+
# On Fedora, the geos library is available, and so we can require it
# and build the geom modules. On RedHat Enterprise Linux and
# derivatives (CentOS, Scientific Linux), the geos library is not
# available. However, the geos library is available in the Extra
-# Packages for Enterprise Linux (EPEL). If the _with_epel macro is
-# set, we assume that EPEL is available, and so we enable building the
-# geom modules. The _with_epel macro can be set when using mock by
-# passing it the flag --with epel.
-%if %{?rhel:1}%{!?rhel:0}
-%if %{?_with_epel:1}%{!?_with_epel:0}
-# RedHat Enterprise Linux and derivatives with EPEL enabled
-%define with_geos 1
-%endif
-%else
-# Fedora
+# Packages for Enterprise Linux (EPEL). In other words, we can check
+# the fedpkgs macro (see above).
+%if %{fedpkgs}
%define with_geos 1
%endif
-%if %{?_with_samtools:1}%{!?_with_samtools:0}
+%if %{?rhel:0}%{!?rhel:1}
+# If the _without_samtools macro is set, the MonetDB-bam-MonetDB5 RPM
+# will be created. The macro can be set when using mock by passing it
+# the flag --without=samtools.
+# Note that the samtools-devel RPM is not available on RedHat
+# Enterprise Linux and derivatives, even with EPEL availabe.
+# (Actually, at the moment of writing, samtools-devel is available in
+# EPEL for RHEL 6, but not for RHEL 7. We don't make the distinction
+# here and just not build the MonetDB-bam-MonetDB5 RPM.)
+%if %{?_without_samtools:0}%{!?_without_samtools:1}
%define with_samtools 1
%endif
+%endif
-%if %{?_with_rintegration:1}%{!?_with_rintegration:0}
+%if %{fedpkgs}
+# If the _without_rintegration macro is not set, the MonetDB-R RPM
+# will be created. The macro can be set when using mock by passing it
+# the flag --without=rintegration.
+%if %{?_without_rintegration:0}%{!?_without_rintegration:1}
%define with_rintegration 1
%endif
+%endif
+
+%if %{fedpkgs}
+# If the _with_fits macro is set, the MonetDB-cfitsio RPM will be
+# created. The macro can be set when using mock by passing it the
+# flag --with=fits.
+%if %{?_with_fits:1}%{!?_with_fits:0}
+%define with_fits 1
+%endif
+%endif
Name: %{name}
Version: %{version}
@@ -57,13 +95,18 @@ Source: http://dev.monetdb.org/downloads
BuildRequires: bison
BuildRequires: bzip2-devel
-# BuildRequires: cfitsio-devel
+%if %{?with_fits:1}%{!?with_fits:0}
+BuildRequires: cfitsio-devel
+%endif
BuildRequires: flex
%if %{?with_geos:1}%{!?with_geos:0}
BuildRequires: geos-devel >= 3.0.0
%endif
BuildRequires: gsl-devel
+BuildRequires: libatomic_ops-devel
BuildRequires: libcurl-devel
+# BuildRequires: libmicrohttpd-devel
+# BuildRequires: libsphinxclient-devel
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
@@ -85,6 +128,7 @@ BuildRequires: rubygems
BuildRequires: rubygems-devel
%endif
BuildRequires: unixODBC-devel
+# BuildRequires: uriparser-devel
BuildRequires: zlib-devel
%if %{?with_samtools:1}%{!?with_samtools:0}
BuildRequires: samtools-devel
@@ -463,7 +507,7 @@ numerical analysis (gsl).
%{_libdir}/monetdb5/gsl.mal
%{_libdir}/monetdb5/lib_gsl.so
-%if %{?_with_samtools:1}%{!?_with_samtools:0}
+%if %{?with_samtools:1}%{!?with_samtools:0}
%package bam-MonetDB5
Summary: MonetDB5 SQL interface to the bam library
Group: Applications/Databases
@@ -486,11 +530,10 @@ version of Sequence Alignment/Map) data.
%{_libdir}/monetdb5/lib_bam.so
%endif
-%if %{?_with_rintegration:1}%{!?_with_rintegration:0}
+%if %{?with_rintegration:1}%{!?with_rintegration:0}
%package R
-Summary: MonetDB5 SQL interface to the bam library
+Summary: Integration of MonetDB and R, allowing use of R from within SQL
Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
Requires: MonetDB-SQL-server5 = %{version}-%{release}
%description R
@@ -508,12 +551,33 @@ install it.
%files R
%defattr(-,root,root)
-%{_includedir}/monetdb/rapi*.h
%{_libdir}/monetdb5/rapi.*
%{_libdir}/monetdb5/autoload/*_rapi.mal
%{_libdir}/monetdb5/lib_rapi.so
%endif
+%if %{?with_fits:1}%{!?with_fits:0}
+%package cfitsio
+Summary: MonetDB: Add on module that provides support for FITS files
+Group: Applications/Databases
+Requires: MonetDB-SQL-server5 = %{version}-%{release}
+
+%description cfitsio
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators. It also has an SQL frontend.
+
+This package contains a module for accessing data in the FITS file
+format.
+
+%files cfitsio
+%defattr(-,root,root)
+%{_libdir}/monetdb5/fits.mal
+%{_libdir}/monetdb5/autoload/*_fits.mal
+%{_libdir}/monetdb5/lib_fits.so
+%endif
+
%package -n MonetDB5-server
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
@@ -559,34 +623,43 @@ fi
%{_libdir}/libmonetdb5.so.*
%dir %{_libdir}/monetdb5
%dir %{_libdir}/monetdb5/autoload
+%if %{?with_fits:1}%{!?with_fits:0}
+%exclude %{_libdir}/monetdb5/fits.mal
+%endif
%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/geom.mal
%endif
%exclude %{_libdir}/monetdb5/gsl.mal
-%if %{?_with_rintegration:1}%{!?_with_rintegration:0}
+%if %{?with_rintegration:1}%{!?with_rintegration:0}
%exclude %{_libdir}/monetdb5/rapi.mal
%endif
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
%{_libdir}/monetdb5/*.mal
+%if %{?with_fits:1}%{!?with_fits:0}
+%exclude %{_libdir}/monetdb5/autoload/*_fits.mal
+%endif
%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/autoload/*_geom.mal
%endif
%exclude %{_libdir}/monetdb5/autoload/*_gsl.mal
-%if %{?_with_rintegration:1}%{!?_with_rintegration:0}
+%if %{?with_rintegration:1}%{!?with_rintegration:0}
%exclude %{_libdir}/monetdb5/autoload/*_rapi.mal
%endif
# %exclude %{_libdir}/monetdb5/autoload/*_rdf.mal
%exclude %{_libdir}/monetdb5/autoload/*_sql.mal
%{_libdir}/monetdb5/autoload/*.mal
+%if %{?with_fits:1}%{!?with_fits:0}
+%exclude %{_libdir}/monetdb5/lib_fits.so
+%endif
%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/lib_geom.so
%endif
%exclude %{_libdir}/monetdb5/lib_gsl.so
-%if %{?_with_rintegration:1}%{!?_with_rintegration:0}
+%if %{?with_rintegration:1}%{!?with_rintegration:0}
%exclude %{_libdir}/monetdb5/lib_rapi.so
%endif
-%if %{?_with_samtools:1}%{!?_with_samtools:0}
+%if %{?with_samtools:1}%{!?with_samtools:0}
%exclude %{_libdir}/monetdb5/bam.mal
%exclude %{_libdir}/monetdb5/autoload/*_bam.mal
%exclude %{_libdir}/monetdb5/lib_bam.so
@@ -684,7 +757,7 @@ systemd-tmpfiles --create %{_sysconfdir}
%exclude %{_libdir}/monetdb5/createdb/*_geom.sql
%endif
%exclude %{_libdir}/monetdb5/createdb/*_gsl.sql
-%if %{?_with_samtools:1}%{!?_with_samtools:0}
+%if %{?with_samtools:1}%{!?with_samtools:0}
%exclude %{_libdir}/monetdb5/createdb/*_bam.sql
%endif
# %exclude %{_libdir}/monetdb5/createdb/*_rdf.sql
@@ -814,13 +887,15 @@ developer, but if you do want to test, t
--enable-datacell=no \
--enable-debug=no \
--enable-developer=no \
- --enable-fits=no \
+ --enable-fits=%{?with_fits:yes}%{!?with_fits:no} \
--enable-gdk=yes \
--enable-geom=%{?with_geos:yes}%{!?with_geos:no} \
--enable-gsl=yes \
--enable-instrument=no \
--enable-jdbc=no \
+ --enable-jsonstore=no \
--enable-merocontrol=no \
+ --enable-microhttpd=no \
--enable-monetdb5=yes \
--enable-odbc=yes \
--enable-oid32=%{?oid32:yes}%{!?oid32:no} \
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -2943,7 +2943,7 @@ comment Execute a simple R script value
pattern batrapi.subeval_aggr(fptr:ptr,expr:str,arg:any...):any...
address RAPIevalAggr;
-comment Execute a simple R script value
+comment grouped aggregates through R
command batsql.alpha(dec:dbl,theta:bat[:oid,:dbl]):bat[:oid,:dbl]
address SQLcst_alpha_bat;
@@ -39460,7 +39460,7 @@ comment Create an iterator with fixed gr
command json.dump(j:json):void
address JSONdump;
-pattern json.fold(k:bat[:oid,:any]):json
+pattern json.fold(v:bat[:oid,:any]):json
address JSONfold;
comment Combine the value list into a single json array object.
@@ -41536,6 +41536,10 @@ pattern sql.copy_from(sname:str,tname:st
address mvc_import_table_wrap;
comment Import a table from bstream s with the given tuple and
seperators (sep/rsep)
+pattern sql.create_func_upgrade_oct2014(f:str):int
+address UPGcreate_func;
+comment Create the function described by f, needed for the Oct2014 upgrade
+
pattern sql.clear_table{unsafe}(sname:str,tname:str):wrd
address mvc_clear_table_wrap;
comment Clear table
@@ -41636,6 +41640,10 @@ pattern sql.db_users():bat[:oid,:str]
address db_users_wrap;
comment return table of users with sql scenario
+pattern sql.drop_func_upgrade_oct2014(id:int):int
+address UPGdrop_func;
+comment Drop the function identified by id, needed for the Oct2014 upgrade
+
pattern sql.dropDeclaredTables{unsafe}(nr:int):void
address mvc_drop_declared_tables_wrap;
comment drop top n declared tables
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out
b/clients/Tests/MAL-signatures_fits_geom.stable.out
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out
@@ -39376,7 +39376,7 @@ comment Create an iterator with fixed gr
command json.dump(j:json):void
address JSONdump;
-pattern json.fold(k:bat[:oid,:any]):json
+pattern json.fold(v:bat[:oid,:any]):json
address JSONfold;
comment Combine the value list into a single json array object.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
