Changeset: 60f05ef97f0d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60f05ef97f0d Modified Files: sql/src/test/leaks/Tests/bbp.sql.src sql/src/test/leaks/Tests/bbp.stable.err sql/src/test/leaks/Tests/bbp.stable.out Branch: default Log Message:
Merge information upon request of hg diffs (truncated from 4785 to 300 lines): diff -r cee7fc922549 -r 60f05ef97f0d MonetDB5/ChangeLog.Jun2010 --- a/MonetDB5/ChangeLog.Jun2010 Tue May 18 17:28:27 2010 +0200 +++ b/MonetDB5/ChangeLog.Jun2010 Wed May 19 21:41:53 2010 +0200 @@ -1,6 +1,9 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Wed May 19 2010 Sjoerd Mullender <[email protected]> +- Created a new RPM MonetDB5-server-rdf for the optional MonetDB/RDF module. + * Sun May 2 2010 Martin Kersten <[email protected]> - Added the Z-order module to simplify future manipulation of arrays. diff -r cee7fc922549 -r 60f05ef97f0d MonetDB5/MonetDB-server.spec --- a/MonetDB5/MonetDB-server.spec Tue May 18 17:28:27 2010 +0200 +++ b/MonetDB5/MonetDB-server.spec Wed May 19 21:41:53 2010 +0200 @@ -33,9 +33,6 @@ Requires(pre): shadow-utils BuildRequires: pcre-devel -%if %{?_with_raptor:1}%{!?_with_raptor:0} -BuildRequires: raptor-devel >= 1.4.16 -%endif BuildRequires: libxml2-devel # when we want MonetDB to run as system daemon, we need this @@ -63,10 +60,21 @@ # Contact [email protected] for details and/or assistance. %endif +%if %{?_with_raptor:1}%{!?_with_raptor:0} +%package rdf +Summary: MonetDB RDF interface +Group: Applications/Databases +Requires: %{name} = %{version}-%{release} +BuildRequires: raptor-devel >= 1.4.16 +%endif + %package devel Summary: MonetDB development package Group: Applications/Databases Requires: %{name} = %{version}-%{release} +%if %{?_with_raptor:1}%{!?_with_raptor:0} +Requires: %{name}-rdf = %{version}-%{release} +%endif Requires: MonetDB-devel Requires: MonetDB-client-devel Requires: libxml2-devel @@ -82,6 +90,16 @@ use the SQL frontend (in which case you need MonetDB-SQL-server5 as well). +%if %{?_with_raptor:1}%{!?_with_raptor:0} +%description rdf +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, SQL- and XML- frontends. + +This package contains the MonetDB5 RDF module. +%endif + %description devel MonetDB is a database management system that is developed from a main-memory perspective with use of a fully decomposed storage model, @@ -122,6 +140,8 @@ find $RPM_BUILD_ROOT -name .incs.in -print -o -name \*.la -print | xargs rm -f rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB5/Tests/* +find $RPM_BUILD_ROOT%{_libdir}/MonetDB5 \( -name \*.mal -o -name \*.so\* \) ! -name '*rdf*' -print | sed "s|^$RPM_BUILD_ROOT||" > lib-files + %pre getent group monetdb >/dev/null || groupadd -r monetdb getent passwd monetdb >/dev/null || \ @@ -153,7 +173,7 @@ %clean rm -fr $RPM_BUILD_ROOT -%files +%files -f lib-files %defattr(-,root,root) %{_bindir}/mserver5 %{_bindir}/Mbeddedmal @@ -161,8 +181,7 @@ %{_libdir}/*.so.* %dir %{_libdir}/MonetDB5 %dir %{_libdir}/MonetDB5/lib -%{_libdir}/MonetDB5/lib/*.so* -%{_libdir}/MonetDB5/*.mal +%dir %{_libdir}/MonetDB5/autoload %attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB %attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5 @@ -170,6 +189,13 @@ %config(noreplace) %{_sysconfdir}/monetdb5.conf %{_mandir}/man5/monetdb5.conf.5.gz +%if %{?_with_raptor:1}%{!?_with_raptor:0} +%files rdf +%{_libdir}/MonetDB5/rdf.mal +%{_libdir}/MonetDB5/lib/lib_rdf.so* +%{_libdir}/MonetDB5/autoload/*_rdf.mal +%endif + %files devel %defattr(-,root,root) %{_bindir}/monetdb5-config diff -r cee7fc922549 -r 60f05ef97f0d MonetDB5/src/mal/mal_function.mx --- a/MonetDB5/src/mal/mal_function.mx Tue May 18 17:28:27 2010 +0200 +++ b/MonetDB5/src/mal/mal_function.mx Wed May 19 21:41:53 2010 +0200 @@ -72,7 +72,6 @@ /* #define DEBUG_CLONE */ mal_export Symbol newFunction(str mod, str nme,int kind); -mal_export void clearFcn(MalBlkPtr m); mal_export int getPC(MalBlkPtr mb, InstrPtr p); mal_export InstrPtr newCall(Module scope, str fcnname, int kind); diff -r cee7fc922549 -r 60f05ef97f0d clients/src/mapilib/Mapi.mx --- a/clients/src/mapilib/Mapi.mx Tue May 18 17:28:27 2010 +0200 +++ b/clients/src/mapilib/Mapi.mx Wed May 19 21:41:53 2010 +0200 @@ -2170,8 +2170,13 @@ free(mid->hostname); mid->hostname = host ? strdup(host) : NULL; - if (port == 0) + if (port == 0) { port = 50000; /* hardwired default */ + } else { + /* make sure we won't search for a unix socket first */ + if (mid->hostname == NULL) + mid->hostname = strdup("localhost"); + } /* fill some defaults for user/pass, this should actually never happen */ if (username == NULL) diff -r cee7fc922549 -r 60f05ef97f0d geom/MonetDB-geom.spec --- a/geom/MonetDB-geom.spec Tue May 18 17:28:27 2010 +0200 +++ b/geom/MonetDB-geom.spec Wed May 19 21:41:53 2010 +0200 @@ -163,6 +163,7 @@ %files MonetDB5 %{_libdir}/MonetDB5/lib/lib_geom.so* %{_libdir}/MonetDB5/geom.mal +%{_libdir}/MonetDB5/autoload/*_geom.mal %endif %files devel diff -r cee7fc922549 -r 60f05ef97f0d pathfinder/compiler/Makefile.ag --- a/pathfinder/compiler/Makefile.ag Tue May 18 17:28:27 2010 +0200 +++ b/pathfinder/compiler/Makefile.ag Wed May 19 21:41:53 2010 +0200 @@ -21,7 +21,7 @@ # 2008-2010 Eberhard Karls Universitaet Tuebingen, respectively. All # Rights Reserved. -SUBDIRS = utils schema debug mem parser semantics core algebra mil include sql xmlimport +SUBDIRS = utils schema debug mem parser semantics core algebra mil include sql algebra-m5sql xmlimport EXTRA_DIST_DIR = Tests @@ -72,6 +72,7 @@ mil/libmil \ libcompiler2 \ mem/libmem \ + algebra-m5sql/libmsa \ sql/libsql \ # xmlimport/libxmlimport \ diff -r cee7fc922549 -r 60f05ef97f0d pathfinder/compiler/algebra-m5sql/Makefile.ag --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pathfinder/compiler/algebra-m5sql/Makefile.ag Wed May 19 21:41:53 2010 +0200 @@ -0,0 +1,48 @@ +# +# Copyright Notice: +# ----------------- +# +# The contents of this file are subject to the Pathfinder 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/PathfinderLicense-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 Pathfinder system. +# +# The Original Code has initially been developed by the Database & +# Information Systems Group at the University of Konstanz, Germany and +# the Database Group at the Technische Universitaet Muenchen, Germany. +# It is now maintained by the Database Systems Group at the Eberhard +# Karls Universitaet Tuebingen, Germany. Portions created by the +# University of Konstanz, the Technische Universitaet Muenchen, and the +# Universitaet Tuebingen are Copyright (C) 2000-2005 University of +# Konstanz, (C) 2005-2008 Technische Universitaet Muenchen, and (C) +# 2008-2010 Eberhard Karls Universitaet Tuebingen, respectively. All +# Rights Reserved. +# +# Fri Oct 27 10:05:33 CEST 2006, Manuel Mayr + +INCLUDES = ../include $(MONETDB_INCS) + +# locally disable "-Werror" +#X_CFLAGS = "-pedantic" + +# ignore warning "null dimension: sizeof()" +# with Sun Studio 12 compiler +lalg2msa_CFLAGS = $(SUN_NOERR_CFLAGS) + +lib_msa = { + NOINST + DIR = libdir + SOURCES = \ + lalg2msa.c \ + msa.c \ + msaprint.c +} + +#EXTRA_DIST = diff -r cee7fc922549 -r 60f05ef97f0d pathfinder/compiler/algebra-m5sql/lalg2msa.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pathfinder/compiler/algebra-m5sql/lalg2msa.c Wed May 19 21:41:53 2010 +0200 @@ -0,0 +1,1043 @@ +/** + * @file + * + * Transforms the logical algebra tree into a tree that represents + * SQL statements. + * + * Copyright Notice: + * ----------------- + * + * The contents of this file are subject to the Pathfinder 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/PathfinderLicense-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 Pathfinder system. + * + * The Original Code has initially been developed by the Database & + * Information Systems Group at the University of Konstanz, Germany and + * the Database Group at the Technische Universitaet Muenchen, Germany. + * It is now maintained by the Database Systems Group at the Eberhard + * Karls Universitaet Tuebingen, Germany. Portions created by the + * University of Konstanz, the Technische Universitaet Muenchen, and the + * Universitaet Tuebingen are Copyright (C) 2000-2005 University of + * Konstanz, (C) 2005-2008 Technische Universitaet Muenchen, and (C) + * 2008-2010 Eberhard Karls Universitaet Tuebingen, respectively. All + * Rights Reserved. + * + * $Id$ + */ + +/* always include pf_config.h first! */ +#include "pf_config.h" +#include "pathfinder.h" + +/** assert() */ +#include <assert.h> +/** fprintf() */ +#include <stdio.h> +/** strcpy, strlen, ... */ +#include <string.h> + +#include "oops.h" /* PFoops() */ +#include "mem.h" +#include "array.h" +#include "string_utils.h" + +#include "lalg2msa.h" + +/* Easily access subtree-parts */ +#include "child_mnemonic.h" + +#include "msa.h" +#include "algebra.h" +#include "alg_dag.h" +#include "ordering.h" + +#include "msa_mnemonic.h" + +/* Auxiliary function that searches for a certain col + in a expression list and returns an expression + representing the found column. If no column was + found, NULL will be returned */ +static PFmsa_expr_t * +find_expr(PFmsa_exprlist_t *expr_list, PFalg_col_t col) +{ + unsigned int i; + + for (i = 0; i < elsize(expr_list); i++) { + PFmsa_expr_t *curr_expr = elat(expr_list, i); + if ((curr_expr->col) == col) + return curr_expr; + } _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
