Changeset: 489e15923a59 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=489e15923a59
Modified Files:
configure.ag
monetdb5/extras/rdf/10_rdf.mal
monetdb5/extras/rdf/Makefile.ag
monetdb5/extras/rdf/rdf.c
monetdb5/modules/mal/remote.c
monetdb5/optimizer/Makefile.ag
monetdb5/scheduler/run_octopus.mx
sql/backends/monet5/Makefile.ag
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_optimizer.mx
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 1208 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -526,7 +526,6 @@
--enable-bits=%{bits} \
--enable-java=no \
--enable-rdf=no \
- --with-gc=no \
--with-valgrind=no \
--with-mseed=no \
%{?oid32:--enable-oid32} \
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err
b/clients/mapiclient/Tests/mclient--help.stable.err
--- a/clients/mapiclient/Tests/mclient--help.stable.err
+++ b/clients/mapiclient/Tests/mclient--help.stable.err
@@ -10,7 +10,7 @@
# 13:46:19 > Mtimeout -timeout 60 mclient --help
# 13:46:19 >
-Usage: mclient --language=(sql|xquery|mal|mil) [ options ]
+Usage: mclient [ options ]
Options are:
-h hostname | --host=hostname host or UNIX domain socket to connect to
@@ -19,10 +19,10 @@
-d database | --database=database database to connect to
-e | --echo echo the query
-E charset | --encoding=charset specify encoding (character set) of the
terminal
- -f kind | --format=kind specify output format {xml,typed,dm} for
XQuery, or {csv,tab,raw,sql,xml}
+ -f kind | --format=kind specify output format {csv,tab,raw,sql,xml}
-H | --history load/save cmdline history (default off)
-i | --interactive read stdin after command line args
- -l language | --language=lang {sql,xquery,mal,mil}
+ -l language | --language=lang {sql,mal}
-L logfile | --log=logfile save client/server interaction
-s stmt | --statement=stmt run single statement
-X | --Xdebug trace mapi network interaction
@@ -36,14 +36,7 @@
-D | --dump create an SQL dump
-N | --inserts use INSERT INTO statements when dumping
-XQuery specific options
- -C colname | --collection=colname collection name
- -I docname | --input=docname document name, XML document on standard input
- -G | --algebra use algebra frontend
- -g | --no-algebra use old frontend
- -t | --time time commands
+# 18:57:57 >
+# 18:57:57 > Done.
+# 18:57:57 >
-# 13:46:19 >
-# 13:46:19 > Done.
-# 13:46:19 >
-
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
--- a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
+++ b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
@@ -10,7 +10,7 @@
# 13:46:19 > Mtimeout -timeout 60 mclient --help
# 13:46:19 >
-Usage: mclient --language=(sql|xquery|mal|mil) [ options ]
+Usage: mclient [ options ]
Options are:
-h hostname | --host=hostname host to connect to
@@ -19,10 +19,10 @@
-d database | --database=database database to connect to
-e | --echo echo the query
-E charset | --encoding=charset specify encoding (character set) of the
terminal
- -f kind | --format=kind specify output format {xml,typed,dm} for
XQuery, or {csv,tab,raw,sql,xml}
+ -f kind | --format=kind specify output format {csv,tab,raw,sql,xml}
-H | --history load/save cmdline history (default off)
-i | --interactive read stdin after command line args
- -l language | --language=lang {sql,xquery,mal,mil}
+ -l language | --language=lang {sql,mal}
-L logfile | --log=logfile save client/server interaction
-s stmt | --statement=stmt run single statement
-X | --Xdebug trace mapi network interaction
@@ -34,14 +34,7 @@
-w nr | --width=nr for pagination
-D | --dump create an SQL dump
-XQuery specific options
- -C colname | --collection=colname collection name
- -I docname | --input=docname document name, XML document on standard input
- -G | --algebra use algebra frontend
- -g | --no-algebra use old frontend
- -t | --time time commands
+# 18:57:57 >
+# 18:57:57 > Done.
+# 18:57:57 >
-# 13:46:19 >
-# 13:46:19 > Done.
-# 13:46:19 >
-
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -45,20 +45,6 @@
#include <strings.h>
#endif
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-void *alloca(size_t);
-#endif
-
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -800,6 +800,20 @@
#include <malloc.h>
#endif
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#elif defined __GNUC__
+# define alloca __builtin_alloca
+#elif defined _AIX
+# define alloca __alloca
+#elif defined _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
+#else
+# include <stddef.h>
+void *alloca(size_t);
+#endif
+
#include <signal.h>
#include <string.h>
#include <memory.h>
@@ -2903,7 +2917,7 @@
Mapi mid;
/* if it doesn't make sense, don't try to crash */
- if (host == NULL || (host[0] != '/' && port <= 0) || pattern == NULL)
+ if (pattern == NULL)
return NULL;
mid = mapi_mapi(host, port, "mero", "mero", "resolve", pattern);
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -92,9 +92,6 @@
#ifdef HAVE_LIBBZ2
#include <bzlib.h>
#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h> /* for alloca on Windows */
-#endif
#ifndef SHUT_RD
#define SHUT_RD 0
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -276,6 +276,19 @@
dnl check for compiler (also set GCC (yes/no)).
AC_PROG_CC()
+dnl What do we need to get the msg_control and msg_controllen fields on
+dnl struct msg (filedescriptor passing)? In the future this could be a
+dnl check to see if we can find it, such that we can disable it compile
+dnl time if absent. It looks however, as if it's available everywhere
+dnl we try where UNIX domain sockets also exist. So we go by the
+dnl following simple implementation for now.
+case $host in
+ *-solaris*)
+ dnl Solaris needs this to get msg_control and msg_controllen
+ AC_DEFINE(_XOPEN_SOURCE, 500, [for msg_control and
msg_controllen])
+ ;;
+esac
+
gcc_ver=""
icc_ver=""
case $GCC-$CC in
@@ -3072,20 +3085,18 @@
#define _SEEN_MONETDB_CONFIG_H 1
/* AC_FUNC_ALLOCA autoconf documented code */
-/* AIX requires this to be the first thing in the file after
- * preprocessor statements */
-#ifndef __GNUC__
-# if HAVE_ALLOCA_H
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-# endif
-# endif
-# endif
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#elif defined __GNUC__
+# define alloca __builtin_alloca
+#elif defined _AIX
+# define alloca __alloca
+#elif defined _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
+#else
+# include <stddef.h>
+void *alloca(size_t);
#endif
#ifdef HAVE_SYS_TYPES_H
@@ -3210,7 +3221,7 @@
echo " LDFLAGS: ${LDFLAGS}"
echo
echo "* Enabled/disabled components:"
-for comp in common monetdb{4,5} sql geom unixodbc java testing; do
+for comp in common monetdb5 sql geom unixodbc java testing; do
echo $ECHO_N " $comp is $ECHO_C"
eval "if test \"x\$enable_$comp\" = xno ; then echo
\"${ECHO_T}disabled\"; else echo \"${ECHO_T}enabled\"; fi"
done
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -2,12 +2,10 @@
debian/tmp/usr/lib/libmonetdb5.so.* usr/lib
debian/tmp/usr/lib/monetdb5/autoload/70_vault.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/72_fits.mal usr/lib/monetdb5/autoload
-debian/tmp/usr/lib/monetdb5/lib_batxml.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_crackers.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_fits.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_mal_compiler.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_vault.so usr/lib/monetdb5
-debian/tmp/usr/lib/monetdb5/lib_xml.so usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/aggr.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/alarm.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/algebra.mal usr/lib/monetdb5
diff --git a/gdk/gdk_bat.mx b/gdk/gdk_bat.mx
--- a/gdk/gdk_bat.mx
+++ b/gdk/gdk_bat.mx
@@ -2833,7 +2833,7 @@
m3 = HEAPcommitpersistence(b->T->vheap, wr || ta, existing);
dirty |= (b->T->vheap->newstorage != m3);
}
- if (m1 < 0 || m1 < 0 || m2 < 0 || m3 < 0)
+ if (m0 < 0 || m1 < 0 || m2 < 0 || m3 < 0)
return -1;
if (dirty) {
diff --git a/geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
b/geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
--- a/geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
+++ b/geom/BugTracker/Tests/X_crash.SF-1971632.stable.err
@@ -12,9 +12,9 @@
# 11:50:18 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=30029
# 11:50:18 >
-MAPI = monetdb@koolmees:35266
+MAPI = monetdb@volund:31171
QUERY = select X(g) from geoms;
-ERROR = !MALException:geom.X:Failed
+ERROR = !MALException:geom.wkbgetcoordX:GEOSGeom_getCoordSeq failed
!ERROR: Geometry must be a Point or LineString
# 11:50:18 >
diff --git a/monetdb5/extras/rdf/10_rdf.mal b/monetdb5/extras/rdf/10_rdf.mal
deleted file mode 100644
--- a/monetdb5/extras/rdf/10_rdf.mal
+++ /dev/null
@@ -1,20 +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://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-#
-# 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-2011 MonetDB B.V.
-# All Rights Reserved.
-
-# This loads the MonetDB/RDF module
-include tokenizer;
-include rdf;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
