Changeset: 18ba2b7f4f3b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=18ba2b7f4f3b
Removed Files:
sql/backends/monet5/vaults/71_mseed.mal
sql/backends/monet5/vaults/mseed.c
sql/backends/monet5/vaults/mseed.h
sql/backends/monet5/vaults/mseed.mal
sql/backends/monet5/vaults/mseed.sql
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
configure.ag
debian/rules
sql/ChangeLog
sql/backends/monet5/vaults/Makefile.ag
sql/backends/monet5/vaults/vault.c
sql/backends/monet5/vaults/vault.sql
testing/Mtest.py.in
Branch: default
Log Message:
Removed support for the mseed library.
diffs (truncated from 737 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -880,7 +880,6 @@ developer, but if you do want to test, t
--with-bz2=yes \
--with-geos=%{?with_geos:yes}%{!?with_geos:no} \
--with-java=no \
- --with-mseed=no \
--with-perl=yes \
--with-perl-libdir=lib/perl5 \
--with-pthread=yes \
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -357,9 +357,6 @@
/* Define to 1 if you have the `mremap' function. */
/* #undef HAVE_MREMAP */
-/* Define if you have the mseed library */
-/* #undef HAVE_MSEED */
-
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
/* #undef HAVE_NDIR_H */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -384,11 +384,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_MONETDB5_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_MSEED
- $(ECHO) HAVE_MSEED_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_MSEED_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_ODBC
$(ECHO) HAVE_ODBC_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2352,45 +2352,6 @@ else
fi
AM_CONDITIONAL(HAVE_ODBC, test x$have_unixodbc != xno)
-# mseed, only used by sql
-org_have_mseed="auto"
-have_mseed=$org_have_mseed
-AC_ARG_WITH(mseed,
- AS_HELP_STRING([--with-mseed=DIR],[mseed library is installed in DIR]),
- [have_mseed="$withval"])
-if test "x$have_mseed" != xno; then
-
- case "$have_mseed" in
- auto|yes)
- ;;
- *)
- MSEED_CFLAGS="-I$have_mseed/include"
- MSEED_LIBS="-L$have_mseed/lib -lmseed"
- ;;
- esac
-
- save_CPPFLAGS="$CPPFLAGS"
- save_LDFLAGS="$LDFLAGS"
- CPPFLAGS="$CPPFLAGS $MSEED_CFLAGS"
- LDFLAGS="$LDFLAGS $MSEED_LIBS"
- AC_CHECK_HEADER(libmseed.h,
- AC_CHECK_LIB(mseed, msr_init,
- AC_DEFINE(HAVE_MSEED, 1, [Define if you have the mseed
library]),
- [ if test "x$have_mseed" != xauto; then
AC_MSG_ERROR([-lmseed library not found]); fi
- have_mseed=no; why_have_mseed="(mseed library not
found)" ], "-lm"),
- [ if test "x$have_mseed" != xauto; then
AC_MSG_ERROR([libmseed.h header not found]); fi
- have_mseed=no; why_have_mseed="(libmseed.h header not found)"
])
- LDFLAGS="$save_LDFLAGS"
- CPPFLAGS="$save_CPPFLAGS"
- if test "x$have_mseed" = "xyes" -o "x$have_mseed" = "xauto"; then
- MSEED_CFLAGS=
- MSEED_LIBS="-lmseed"
- fi
-fi
-AC_SUBST(MSEED_CFLAGS, $MSEED_CFLAGS)
-AC_SUBST(MSEED_LIBS, $MSEED_LIBS)
-AM_CONDITIONAL(HAVE_MSEED, test x"$have_mseed" != xno)
-
# samtools, only used by sql
org_have_samtools="auto"
have_samtools=$org_have_samtools
@@ -3362,7 +3323,6 @@ for comp in \
'java_control ' \
'java_jdbc ' \
'libxml2 ' \
- 'mseed ' \
'openssl ' \
'pcre ' \
'perl ' \
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,6 @@ override_dh_auto_configure:
--with-bz2=yes \
--with-geos=yes \
--with-java=no \
- --with-mseed=no \
--with-perl=yes \
--with-perl-libdir=lib/perl5 \
--with-pthread=yes \
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Wed Feb 18 2015 Sjoerd Mullender <sjo...@acm.org>
+- Removed support for the mseed library.
+
* Tue Feb 17 2015 Sjoerd Mullender <sjo...@acm.org>
- Removed support for RDF.
- Removed DataCell. It was experimental code that was never enabled.
diff --git a/sql/backends/monet5/vaults/71_mseed.mal
b/sql/backends/monet5/vaults/71_mseed.mal
deleted file mode 100644
--- a/sql/backends/monet5/vaults/71_mseed.mal
+++ /dev/null
@@ -1,19 +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-2015 MonetDB B.V.
-# All Rights Reserved.
-
-# delayed until it all works
-#include mseed;
diff --git a/sql/backends/monet5/vaults/Makefile.ag
b/sql/backends/monet5/vaults/Makefile.ag
--- a/sql/backends/monet5/vaults/Makefile.ag
+++ b/sql/backends/monet5/vaults/Makefile.ag
@@ -30,7 +30,7 @@ INCLUDES = ../../../include \
../../../../common/stream \
../../../../common/utils \
../../../../gdk \
- $(READLINE_INCS) $(MSEED_CFLAGS) $(cfitsio_CFLAGS) $(curl_CFLAGS)
+ $(READLINE_INCS) $(cfitsio_CFLAGS) $(curl_CFLAGS)
lib__vault = {
MODULE
@@ -58,37 +58,6 @@ headers_autoload = {
SOURCES = 70_vault.mal
}
-lib__mseed = {
- MODULE
- COND = HAVE_MSEED
- DIR = libdir/monetdb5
- SOURCES = mseed.c
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- ../../../../gdk/libbat \
- $(MSEED_LIBS)
-}
-
-headers_mseedmal = {
- COND = HAVE_MSEED
- HEADERS = mal
- DIR = libdir/monetdb5
- SOURCES = mseed.mal
-}
-
-headers_mseedsql = {
- COND = HAVE_MSEED
- HEADERS = sql
- DIR = libdir/monetdb5
- SOURCES = mseed.sql
-}
-
-headers_mseedautoload = {
- COND = HAVE_MSEED
- HEADERS = mal
- DIR = libdir/monetdb5/autoload
- SOURCES = 71_mseed.mal
-}
-
lib__fits = {
MODULE
COND = HAVE_FITS
@@ -120,7 +89,6 @@ headers_fitsautoload = {
}
EXTRA_DIST_DIR = Tests
-EXTRA_DIST = 70_vault.mal 71_mseed.mal 72_fits.mal \
+EXTRA_DIST = 70_vault.mal 72_fits.mal \
fits.mal 72_fits.sql fits.h \
- mseed.mal mseed.sql mseed.h \
vault.mal vault.sql vault.h
diff --git a/sql/backends/monet5/vaults/mseed.c
b/sql/backends/monet5/vaults/mseed.c
deleted file mode 100644
--- a/sql/backends/monet5/vaults/mseed.c
+++ /dev/null
@@ -1,312 +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-2015 MonetDB B.V.
- * All Rights Reserved.
- */
-
-/*
- * @f mseed
- * @a Martin Kersten
- * @v 0.1
- * @+ Mseed
- * These routines are meant to interpret mseed files already stored in the
vault.
- * The simplifying situation is that mseed has a single model.
- * The code base assumes that libmseed has been installed on your system.
- *
- * The mseed catalog initialization script should have been run.
- * @begin verbatim
- * -- this schema is intended to experiment with accessing mseed files
- * DROP FUNCTION mseedImport();
- * DROP TABLE mseedCatalog;
- *
- * -- all records in the mseed files correspond to a row in the catalog
- * CREATE TABLE mseedCatalog (
- * mseed int, -- Vault file id
- * seqno int, -- SEED record sequence
number, should be between 0 and 999999
- * PRIMARY KEY (mseed,seqno),
- * dataquality char, -- Data record indicator,
should be 'D=data unknown qual',
- * -- 'R=raw no
quality', 'Q= quality controlled' or 'M'
- * network varchar(11), -- Network
- * station varchar(11), -- Station
- * location varchar(11), -- Location
- * channel varchar(11), -- Channel
- * starttime timestamp, -- Record start time, the time
of the first sample, as a high precision epoch time
- * samplerate double, -- Nominal sample rate (Hz)
- * sampleindex int, -- record offset in the file
- * samplecnt int, -- Number of samples in record
- * sampletype string, -- storage type in mseed record
- * minval float, -- statistics for
search later
- * maxval float
- * );
- *
- * -- The reference table for querying is simply
- * CREATE TABLE mseed(
- * mseed int, -- Vault file id
- * seqno int, -- SEED record sequence
number, should be between 0 and 999999
- * time timestamp, -- click
- * data int, -- The actual
measurement value.
- * FOREIGN KEY (mseed,seqno) REFERENCES mseedCatalog(mseed,seqno)
- * );
- *
- * SELECT * FROM mseed WHERE data >3000;
- * -- can be answered by preselecting the catalog first.
- * SELECT mseed FROM mseedcatalog WHERE maxval >3000;
- * -- followed by loading the corresponding files if they are not cached yet
- * SELECT * from mseed((SELECT * FROM tmp));
- *
- * -- this function inserts the mseed record information into the catalog
- * -- errors are returned for off-line analysis.
- *
- * CREATE FUNCTION mseedImport(vid int, entry string)
- * RETURNS int
- * EXTERNAL NAME mseed.import;
- *
- * CREATE FUNCTION mseedLoad(entry string)
- * RETURNS TABLE(time timestamp, data int)
- * EXTERNAL NAME mseed.load;
- * @end verbatim
- *
- * @- How to use the mseed catalog.
- * First, the vault directory is populated with the location of the mseed
source files.
- * This information is gathered with a script, which also creates the tables
for the
- * individual stations.
- * The corresponding local name is set using the basename property,
- * and all files creation and access times are set to null.
- * Following, a limited number of files are loaded into the vault and analysed.
- * The information extracted ends up in the catalog, and remains there forever.
- * The underlying mseed file is not decrypted directly, it will be done as soon
- * as a query requests it.
- *
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
