Changeset: 361a8502171e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=361a8502171e
Added Files:
sql/test/wlcr/Tests/wlc100.py
sql/test/wlcr/Tests/wlc100.stable.err
sql/test/wlcr/Tests/wlc100.stable.out
sql/test/wlcr/Tests/wlc70.py
sql/test/wlcr/Tests/wlc70.stable.err
sql/test/wlcr/Tests/wlc70.stable.out
sql/test/wlcr/Tests/wlr100.py
sql/test/wlcr/Tests/wlr100.stable.err
sql/test/wlcr/Tests/wlr100.stable.out
sql/test/wlcr/Tests/wlr70.py
Removed Files:
monetdb5/extras/sphinx/30_sphinx.mal
monetdb5/extras/sphinx/Makefile.ag
monetdb5/extras/sphinx/sphinx.c
monetdb5/extras/sphinx/sphinx.h
monetdb5/extras/sphinx/sphinx.mal
sql/test/wlcr/Tests/wlc80.py
sql/test/wlcr/Tests/wlc80.stable.err
sql/test/wlcr/Tests/wlc80.stable.out
sql/test/wlcr/Tests/wlr80.py
sql/test/wlcr/Tests/wlr80.stable.err
sql/test/wlcr/Tests/wlr80.stable.out
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/Tests/All
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
configure.ag
debian/rules
monetdb5/ChangeLog
monetdb5/extras/Makefile.ag
sql/backends/monet5/wlr.c
sql/test/wlcr/Tests/All
testing/Mfilter.py
testing/Mtest.py.in
Branch: wlcr
Log Message:
Merge with upstream
diffs (truncated from 778 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -159,7 +159,6 @@ BuildRequires: libatomic_ops-devel
BuildRequires: libcurl-devel
BuildRequires: xz-devel
# BuildRequires: libmicrohttpd-devel
-# BuildRequires: libsphinxclient-devel
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
@@ -918,7 +917,6 @@ developer, but if you do want to test, t
--with-python3=no \
--with-readline=yes \
--with-samtools=%{?with_samtools:yes}%{!?with_samtools:no} \
- --with-sphinxclient=no \
--with-unixodbc=yes \
--with-uuid=yes \
--with-valgrind=no \
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
@@ -493,9 +493,6 @@
/* Define to 1 if the system has the type `socklen_t'. */
#define HAVE_SOCKLEN_T 1
-/* Define if you have the sphinxclient library */
-/* #undef HAVE_SPHINXCLIENT */
-
/* Define if you have the SQLGetPrivateProfileString function */
#define HAVE_SQLGETPRIVATEPROFILESTRING 1
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -396,11 +396,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_SAMTOOLS_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_SPHINXCLIENT
- $(ECHO) HAVE_SPHINXCLIENT_FALSE='#' >>
"$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_SPHINXCLIENT_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_SQL
$(ECHO) HAVE_SQL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,3 +1,3 @@
exports
-HAVE_FITS&HAVE_GEOM&HAVE_LIBPY&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures
+HAVE_FITS&HAVE_GEOM&HAVE_LIBPY&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP?MAL-signatures
MERCURIAL?malcheck
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -8292,12 +8292,6 @@ Ready.
[ "shp", "attach", "pattern shp.attach(filename:str):void ",
"SHPattach;", "Register an ESRI Shapefile in the vault catalog" ]
[ "shp", "import", "pattern shp.import(fileid:int):void ",
"SHPimport;", "Import an ESRI Shapefile with given id into the vault" ]
[ "shp", "import", "pattern shp.import(fileid:int, po:wkb):void ",
"SHPpartialimport;", "Partially import an ESRI Shapefile with given id into
the vault" ]
-[ "sphinx", "search", "function sphinx.search(q:str):bat[:lng];",
"", "" ]
-[ "sphinx", "searchIndex", "function sphinx.searchIndex(q:str,
i:str):bat[:lng];", "", "" ]
-[ "sphinx", "searchIndexLimit", "command sphinx.searchIndexLimit(q:str,
i:str, l:int):bat[:lng] ", "SPHINXsearchIndexLimit;", "Search the
query on the specified index, with limit" ]
-[ "sphinx", "sphinx_search", "function
sphinx.sphinx_search(q:str):bat[:lng];", "", "" ]
-[ "sphinx", "sphinx_searchIndex", "function
sphinx.sphinx_searchIndex(q:str, i:str):bat[:lng];", "", "" ]
-[ "sphinx", "sphinx_searchIndexLimit", "function
sphinx.sphinx_searchIndexLimit(q:str, i:str, l:int):bat[:lng];", "",
"" ]
[ "sql", "abort", "pattern sql.abort():void ", "SQLabort;",
"Trigger the abort operation for a MAL block" ]
[ "sql", "affectedRows", "pattern sql.affectedRows(mvc:int, nr:lng):int
", "mvc_affected_rows_wrap;", "export the number of affected rows by
the current query" ]
[ "sql", "all", "inline function sql.all(b:bat[:any_1], gp:bat[:oid],
gpe:bat[:oid], no_nil:bit):bat[:any_1];", "", "" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -10654,12 +10654,6 @@ Ready.
[ "shp", "attach", "pattern shp.attach(filename:str):void ",
"SHPattach;", "Register an ESRI Shapefile in the vault catalog" ]
[ "shp", "import", "pattern shp.import(fileid:int):void ",
"SHPimport;", "Import an ESRI Shapefile with given id into the vault" ]
[ "shp", "import", "pattern shp.import(fileid:int, po:wkb):void ",
"SHPpartialimport;", "Partially import an ESRI Shapefile with given id into
the vault" ]
-[ "sphinx", "search", "function sphinx.search(q:str):bat[:lng];",
"", "" ]
-[ "sphinx", "searchIndex", "function sphinx.searchIndex(q:str,
i:str):bat[:lng];", "", "" ]
-[ "sphinx", "searchIndexLimit", "command sphinx.searchIndexLimit(q:str,
i:str, l:int):bat[:lng] ", "SPHINXsearchIndexLimit;", "Search the
query on the specified index, with limit" ]
-[ "sphinx", "sphinx_search", "function
sphinx.sphinx_search(q:str):bat[:lng];", "", "" ]
-[ "sphinx", "sphinx_searchIndex", "function
sphinx.sphinx_searchIndex(q:str, i:str):bat[:lng];", "", "" ]
-[ "sphinx", "sphinx_searchIndexLimit", "function
sphinx.sphinx_searchIndexLimit(q:str, i:str, l:int):bat[:lng];", "",
"" ]
[ "sql", "abort", "pattern sql.abort():void ", "SQLabort;",
"Trigger the abort operation for a MAL block" ]
[ "sql", "affectedRows", "pattern sql.affectedRows(mvc:int, nr:lng):int
", "mvc_affected_rows_wrap;", "export the number of affected rows by
the current query" ]
[ "sql", "all", "inline function sql.all(b:bat[:any_1], gp:bat[:oid],
gpe:bat[:oid], no_nil:bit):bat[:any_1];", "", "" ]
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1812,38 +1812,6 @@ AS_VAR_IF([have_valgrind], [no], [], [
[AC_DEFINE([HAVE_VALGRIND], 1, [Define if you have valgrind
installed and want to use it])],
[AS_VAR_IF([have_valgrind], [yes], [AC_MSG_ERROR([no valgrind
support found])])])])
-# check for sphinxclient
-org_have_sphinxclient="auto"
-have_sphinxclient=$org_have_sphinxclient
-AC_ARG_WITH([sphinxclient],
- [AS_HELP_STRING([--with-sphinxclient=DIR], [sphinxclient library is
installed in DIR])],
- [have_sphinxclient="$withval"])
-AS_VAR_IF([have_sphinxclient], [no], [], [
- AS_CASE([$have_sphinxclient],
- [auto|yes], [],
- [
- SPHINXCLIENT_CFLAGS="-I$have_sphinxclient/include"
- SPHINXCLIENT_LIBS="-L$have_sphinxclient/lib"])
-
- save_CPPFLAGS="$CPPFLAGS"
- save_LDFLAGS="$LDFLAGS"
- CPPFLAGS="$CPPFLAGS $SPHINXCLIENT_CFLAGS"
- LDFLAGS="$LDFLAGS $SPHINXCLIENT_LIBS"
- AC_CHECK_HEADER([sphinxclient.h],
- AC_CHECK_LIB([sphinxclient], [sphinx_create],
- [AC_DEFINE([HAVE_SPHINXCLIENT], 1, [Define if you have
the sphinxclient library])]
- [have_sphinxclient=yes]
- [SPHINXCLIENT_LIBS="$SPHINXCLIENT_LIBS -lsphinxclient"],
- [AS_VAR_IF([have_sphinxclient], [auto], [],
[AC_MSG_ERROR([-lsphinxclient library not found])])
- have_sphinxclient=no;
why_have_sphinxclient="(sphinxclient library not found)" ]),
- [AS_VAR_IF([have_sphinxclient], [auto], [],
[AC_MSG_ERROR([sphinxclient.h header not found])])
- have_sphinxclient=no; why_have_sphinxclient="(sphinxclient.h
header not found)" ])
- LDFLAGS="$save_LDFLAGS"
- CPPFLAGS="$save_CPPFLAGS"])
-AC_SUBST([SPHINXCLIENT_CFLAGS], [$SPHINXCLIENT_CFLAGS])
-AC_SUBST([SPHINXCLIENT_LIBS], [$SPHINXCLIENT_LIBS])
-AM_CONDITIONAL([HAVE_SPHINXCLIENT], [test x"$have_sphinxclient" != xno])
-
# R API (R UDFs)
have_libr=no
AS_VAR_IF([enable_rintegration], [no], [], [
@@ -3088,7 +3056,6 @@ for comp in \
'regex ' \
'samtools ' \
'shp ' \
- 'sphinxclient ' \
'unixodbc ' \
'valgrind ' \
'zlib ' \
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,6 @@ override_dh_auto_configure:
--with-readline=yes \
--with-regex=PCRE \
--with-samtools=yes \
- --with-sphinxclient=no \
--with-unixodbc=yes \
--with-uuid=yes \
--with-valgrind=no \
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Mon Feb 20 2017 Sjoerd Mullender <sjo...@acm.org>
+- The sphinx module has been moved to its own repository
+ http://dev.monetdb.hg/hg/MonetDB-sphinx/.
+
* Thu Jan 5 2017 Sjoerd Mullender <sjo...@acm.org>
- Changed the interfaces of the AUTH* functions: pass values, not pointers
to values.
diff --git a/monetdb5/extras/Makefile.ag b/monetdb5/extras/Makefile.ag
--- a/monetdb5/extras/Makefile.ag
+++ b/monetdb5/extras/Makefile.ag
@@ -4,5 +4,5 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V.
-SUBDIRS = HAVE_SPHINXCLIENT?sphinx mal_optimizer_template HAVE_LIBR?rapi
+SUBDIRS = mal_optimizer_template HAVE_LIBR?rapi
diff --git a/monetdb5/extras/sphinx/30_sphinx.mal
b/monetdb5/extras/sphinx/30_sphinx.mal
deleted file mode 100644
--- a/monetdb5/extras/sphinx/30_sphinx.mal
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V.
-
-include sphinx;
diff --git a/monetdb5/extras/sphinx/Makefile.ag
b/monetdb5/extras/sphinx/Makefile.ag
deleted file mode 100644
--- a/monetdb5/extras/sphinx/Makefile.ag
+++ /dev/null
@@ -1,33 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V.
-
-INCLUDES = ../../mal \
- ../../../common/options \
- ../../../common/stream \
- ../../../gdk \
- $(SPHINXCLIENT_CFLAGS)
-
-lib__sphinx = {
- MODULE
- DIR = libdir/monetdb5
- SOURCES = sphinx.c sphinx.h
-
- LIBS = ../../tools/libmonetdb5 $(SPHINXCLIENT_LIBS)
-}
-
-headers_sphinx_mal = {
- HEADERS = mal
- DIR = libdir/monetdb5
- SOURCES = sphinx.mal
-}
-
-headers_autoload = {
- HEADERS = mal
- DIR = libdir/monetdb5/autoload
- SOURCES = 30_sphinx.mal
-}
-
-EXTRA_DIST = sphinx.mal 30_sphinx.mal
diff --git a/monetdb5/extras/sphinx/sphinx.c b/monetdb5/extras/sphinx/sphinx.c
deleted file mode 100644
--- a/monetdb5/extras/sphinx/sphinx.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V.
- */
-
-/*
- * @f sphinx
- * @a S.A.M.M. de Konink
- * @v 0.2
- * @* The Sphinx module
- * The Sphinx module implements an external full text search engine returning a
- * list of identifiers based on a query string and an index to search upon.
- *
- */
-#include "monetdb_config.h"
-#include "sphinx.h"
-#include "mal.h"
-#include "mal_client.h"
-#include "mal_exception.h"
-#include <sphinxclient.h>
-
-/* COMMAND "SPHINXsearchIndexLimit": Search the query on the specified
indices, with limit
- * SIGNATURE: SPHINXsearchIndexLimit(str, str, int) : bat[oid,lng]; */
-static str
-sphinx_searchIndexLimit(BAT **ret, /* put pointer to BAT[oid,int] record here.
*/
- str query, str index, int limit)
-{
- int i;
- BAT *bn;
- sphinx_client *client;
- sphinx_result *res;
-
- client = sphinx_create ( SPH_TRUE );
- if (client == NULL)
- throw(MAL, "sphinx.searchIndexLimit", "Cannot create Sphinx
object");
-
- sphinx_set_limits ( client, 0, limit, limit, 0 );
-
- res = sphinx_query ( client, query, index, NULL );
- if (!res || (res && res->num_matches == 0)) {
- bn = COLnew(0, TYPE_lng, 0, TRANSIENT);
- if (bn == NULL)
- throw(MAL, "sphinx.searchIndex", MAL_MALLOC_FAIL);
- } else {
- bn = COLnew(0, TYPE_lng, res->num_matches, TRANSIENT);
- if (bn == NULL)
- throw(MAL, "sphinx.searchIndex", MAL_MALLOC_FAIL);
- for ( i = 0; i < res->num_matches; i++ ) {
- lng sphinx_id = sphinx_get_id ( res, i );
- bunfastapp(bn, &sphinx_id);
- }
-
- }
- sphinx_destroy (client);
-
- bn->tsorted = 0;
- bn->trevsorted = 0;
- bn->tnonil = 1;
- BATkey(bn, FALSE);
-
- *ret = bn;
- return MAL_SUCCEED;
- bunins_failed:
- BBPunfix(bn->batCacheid);
- sphinx_destroy(client);
- throw(MAL, "sphinx.searchIndex", MAL_MALLOC_FAIL);
-}
-
-str
-SPHINXsearchIndexLimit(bat *ret, const str *query, const str *index, const int
*limit)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
