Changeset: cfb251733b74 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cfb251733b74
Modified Files:
configure.ag
gdk/gdk_cbp.c
gdk/gdk_heap.c
gdk/gdk_logger.c
gdk/gdk_rangejoin.c
gdk/gdk_setop.c
gdk/gdk_ssort.c
gdk/gdk_utils.c
monetdb5/extras/crackers/crackers_core_unordered.mx
monetdb5/extras/crackers/crackers_index.mx
monetdb5/extras/crackers/crackers_joins.mx
monetdb5/extras/crackers/crackers_partial_sideways.mx
monetdb5/extras/crackers/crackers_pq.c
monetdb5/extras/crackers/crackers_sideways.mx
monetdb5/extras/crackers/crackers_sortmerge.mx
monetdb5/extras/crackers/crackers_updates.mx
monetdb5/extras/sphinx/sphinx.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_readline.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/streams.c
monetdb5/modules/atoms/url.c
monetdb5/modules/kernel/algebra.c.mx
monetdb5/modules/kernel/array.mx
monetdb5/modules/kernel/colcalc.c.mx
monetdb5/modules/kernel/colcast.c.mx
monetdb5/modules/kernel/colmtime.c.mx
monetdb5/modules/mal/cbp.c
monetdb5/modules/mal/histogram.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/xmlcolumn.c
monetdb5/modules/mal/zorder.c
monetdb5/optimizer/opt_cluster.c
monetdb5/optimizer/opt_coercion.c
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_garbagecollector.c
monetdb5/optimizer/opt_history.c
monetdb5/optimizer/opt_joinpath.c
monetdb5/optimizer/opt_mapreduce.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_support.c
monetdb5/scheduler/run_memo.c
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_gencode.c
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 689 to 300 lines):
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
@@ -644,7 +644,9 @@
#define LOCALSTATEDIR PREFIX "\\var"
#define lstat stat
+#ifndef S_ISREG /* swig-generated source file doesn't include us first
*/
#define S_ISREG(mode) (((mode) & _S_IFMT) == _S_IFREG)
+#endif
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -325,6 +325,8 @@
if dep != t:
fd.write('%s"%s"' % (sep, dep))
sep = " "
+ if dep.endswith('.mx') and tar not in msc['BUILT_SOURCES']:
+ msc['BUILT_SOURCES'].append(tar)
else:
print "!WARNING: dropped absolute dependency " + d
if sep == " ":
@@ -493,6 +495,8 @@
condname = ''
msc['INSTALL'][header] = header, '', sd, '', condname
msc['SCRIPTS'].append(header)
+ if header not in headers['SOURCES']:
+ msc['BUILT_SOURCES'].append(cheader)
## msc_find_ins(msc, headers)
## msc_deps(fd, headers['DEPS'], "\.o", msc)
@@ -1159,7 +1163,7 @@
fd.write("srcdir = $(TOPDIR)\\..%s\n" % string.replace(srcdir, '/', '\\'))
fd.write("!INCLUDE $(TOPDIR)\\..\\NT\\rules.msc\n")
if tree.has_key("SUBDIRS"):
- fd.write("all: all-recursive all-msc\n")
+ fd.write("all: build-all\n")
fd.write("check: check-recursive check-msc\n")
fd.write("install: install-recursive install-msc\n")
else:
@@ -1199,6 +1203,9 @@
fd.write(" %s" % v)
fd.write("\n")
+ if tree.has_key('SUBDIRS'):
+ fd.write('build-all: $(BUILT_SOURCES) all-recursive all-msc\n')
+
## fd.write("EXTRA_DIST = Makefile.ag Makefile.msc")
## for v in msc['EXTRA_DIST']:
## fd.write(" %s" % v)
diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,3 +1,8 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Mon Apr 18 2011 Fabian Groffen <[email protected]>
+- When the first non-option argument of mclient does not refer to an
+ exising file, it now is taken as database name. This allows to simply
+ do `mclient mydb`.
+
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -1,4 +1,4 @@
-.TH MCLIENT 1 MonetDB
+.TH MCLIENT 1 "APRIL 2011" MonetDB "MonetDB Applications"
.SH NAME
mclient \- the MonetDB command-line tool
.SH SYNOPSIS
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2359,7 +2359,7 @@
static void
usage(const char *prog, int xit)
{
- fprintf(stderr, "Usage: %s [ options ]\n", prog);
+ fprintf(stderr, "Usage: %s [ options ] [ file or database [ file ... ]
]\n", prog);
fprintf(stderr, "\nOptions are:\n");
#ifdef HAVE_SYS_UN_H
fprintf(stderr, " -h hostname | --host=hostname host or UNIX domain
socket to connect to\n");
@@ -2725,6 +2725,15 @@
if (passwd == NULL)
passwd = simple_prompt("password", BUFSIZ, 0, NULL);
+ c = 0;
+ has_fileargs = optind != argc;
+
+ if (dbname == NULL && has_fileargs && stat(argv[optind], &statb) != 0) {
+ dbname = argv[optind];
+ optind++;
+ has_fileargs = optind != argc;
+ }
+
mid = mapi_connect(host, port, user, passwd, language, dbname);
if (mid == NULL) {
@@ -2763,9 +2772,6 @@
}
}
- c = 0;
- has_fileargs = optind != argc;
-
/* give the user a welcome message with some general info */
if ((interactive || (!has_fileargs && command == NULL)) &&
interactive_stdin) {
char *lang;
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -800,20 +800,6 @@
#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>
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -44,6 +44,10 @@
# include <limits.h> /* PATH_MAX on Solaris */
#endif
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h> /* KERN_PROC_PATHNAME on BSD */
+#endif
+
#ifdef NATIVE_WIN32
#include <stdio.h>
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -154,7 +154,7 @@
}
if (!e)
e = hc->hc;
- i = e - hc->hc;
+ i = (int) (e - hc->hc);
if (e->maxsz < *maxsz) {
/* resize file ? */
FILE *fp;
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -39,6 +39,8 @@
COL *GDKenvkey = NULL;
COL *GDKenvval = NULL;
+#include <signal.h>
+
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
@@ -51,6 +53,17 @@
# include <sys/sysctl.h>
#endif
+/* getrlimit on FreeBSD */
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+
#ifdef NATIVE_WIN32
#define chdir _chdir
#endif
@@ -234,7 +247,6 @@
* It should be extended to cope with the specifics of the interrupt
* received.
*/
-#include <signal.h>
#if 0 /* these are unused */
static void
COLSIGignore(int nr)
diff --git a/monetdb5/misc/msabaoth.c b/monetdb5/misc/msabaoth.c
--- a/monetdb5/misc/msabaoth.c
+++ b/monetdb5/misc/msabaoth.c
@@ -42,20 +42,6 @@
#include <string.h> /* for getting error messages */
#include <assert.h>
-#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 "msabaoth.h"
#include "mutils.h"
diff --git a/sql/backends/monet5/LSST/80_lsst.mal
b/sql/backends/monet5/LSST/80_lsst.mal
--- a/sql/backends/monet5/LSST/80_lsst.mal
+++ b/sql/backends/monet5/LSST/80_lsst.mal
@@ -16,4 +16,5 @@
# All Rights Reserved.
# This loads the MonetDB/SQL module
+library lsst;
include lsst;
diff --git a/sql/backends/monet5/LSST/Makefile.ag
b/sql/backends/monet5/LSST/Makefile.ag
--- a/sql/backends/monet5/LSST/Makefile.ag
+++ b/sql/backends/monet5/LSST/Makefile.ag
@@ -15,30 +15,28 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-INCLUDES = ../../../include \
- ../../../common \
- ../../../storage \
- ../../../server .. \
- ../../../../monetdb5/modules/atoms \
- ../../../../monetdb5/compiler \
- ../../../../monetdb5/modules/kernel \
- ../../../../monetdb5/mal \
- ../../../../monetdb5/modules/mal \
- ../../../../monetdb5/optimizer \
- ../../../../monetdb5/scheduler \
- ../../../../clients/mapilib \
- ../../../../common/options \
- ../../../../common/stream \
- ../../../../common/utils \
- ../../../../gdk \
- $(READLINE_INCS) $(MSEED_CFLAGS) $(cfitsio_CFLAGS)
$(curl_CFLAGS)
+INCLUDES = .. \
+ ../../../include \
+ ../../../common \
+ ../../../storage \
+ ../../../server \
+ ../../../../monetdb5/modules/atoms \
+ ../../../../monetdb5/modules/kernel \
+ ../../../../monetdb5/mal \
+ ../../../../monetdb5/modules/mal \
+ ../../../../monetdb5/optimizer \
+ ../../../../clients/mapilib \
+ ../../../../common/options \
+ ../../../../common/stream \
+ ../../../../gdk \
+ $(READLINE_INCS) $(MSEED_CFLAGS) $(cfitsio_CFLAGS) $(curl_CFLAGS)
lib__lsst = {
MODULE
DIR = libdir/monetdb5
SOURCES = lsst.c
LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- ../../../../gdk/libbat $(curl_LIBS)
+ ../../../../gdk/libbat $(curl_LIBS)
}
headers_lsstmal = {
@@ -59,5 +57,4 @@
SOURCES = 80_lsst.mal
}
-EXTRA_DIST_DIR = Tests
-EXTRA_DIST = 80_lsst.mal
+EXTRA_DIST = lsst.h
diff --git a/sql/backends/monet5/LSST/lsst.c b/sql/backends/monet5/LSST/lsst.c
--- a/sql/backends/monet5/LSST/lsst.c
+++ b/sql/backends/monet5/LSST/lsst.c
@@ -75,7 +75,7 @@
if (*dec1 < -90.0 || *dec1 > 90.0 || *dec2 < -90.0 || *dec2 > 90.0)
throw(MAL,"lsst.qserv_angSep", "Illegal angulars");
- *sep = _qserv_dist(*ra1, *dec1, *ra2, *dec2);
+ *sep = _qserv_angSep(*ra1, *dec1, *ra2, *dec2);
return MAL_SUCCEED;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
