Changeset: 9806c3d9efc9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9806c3d9efc9
Added Files:
sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.sql
sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.stable.err
sql/test/BugTracker-2014/Tests/outer_join_using_diff_types_using.Bug-3536.stable.out
Modified Files:
MonetDB.spec
clients/Tests/SQL-dump.sql
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.32bit
clients/Tests/SQL-dump.stable.out.64bit.oid32
clients/Tests/SQL-dump.stable.out.64bit.oid32.int128
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/SQL-dump_all.stable.out
clients/Tests/SQL-dump_all.stable.out.int128
clients/Tests/SQL-dump_all.stable.out.oid32
clients/Tests/SQL-dump_all.stable.out.oid32.int128
clients/Tests/SQL-dump_none.stable.out
clients/Tests/SQL-dump_none.stable.out.int128
configure.ag
monetdb5/extras/rapi/Makefile.ag
sql/backends/monet5/bam/Makefile.ag
sql/server/rel_select.c
sql/test/BugTracker-2014/Tests/All
sql/test/Update_Delete_action/Tests/delete_cascade.stable.out
Branch: geo
Log Message:
Merge with default branch.
diffs (truncated from 4622 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -40,6 +40,10 @@
%define with_samtools 1
%endif
+%if %{?_with_rintegration:1}%{!?_with_rintegration:0}
+%define with_rintegration 1
+%endif
+
Name: %{name}
Version: %{version}
Release: %{release}
@@ -85,6 +89,9 @@ BuildRequires: zlib-devel
%if %{?with_samtools:1}%{!?with_samtools:0}
BuildRequires: samtools-devel
%endif
+%if %{?with_rintegration:1}%{!?with_rintegration:0}
+BuildRequires: R-core-devel
+%endif
# need to define python_sitelib on RHEL 5 and older
# no need to define python3_sitelib: it's defined by python3-devel
@@ -479,6 +486,34 @@ version of Sequence Alignment/Map) data.
%{_libdir}/monetdb5/lib_bam.so
%endif
+%if %{?_with_rintegration:1}%{!?_with_rintegration:0}
+%package R
+Summary: MonetDB5 SQL interface to the bam library
+Group: Applications/Databases
+Requires: MonetDB5-server = %{version}-%{release}
+Requires: MonetDB-SQL-server5 = %{version}-%{release}
+
+%description R
+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. It also has an SQL frontend.
+
+This package contains the interface to use the R language from within
+SQL queries.
+
+NOTE: INSTALLING THIS PACKAGE OPENS UP SECURITY ISSUES. If you don't
+know how this package affects the security of your system, do not
+install it.
+
+%files R
+%defattr(-,root,root)
+%{_includedir}/monetdb/rapi*.h
+%{_libdir}/monetdb5/rapi.*
+%{_libdir}/monetdb5/autoload/*_rapi.mal
+%{_libdir}/monetdb5/lib_rapi.so
+%endif
+
%package -n MonetDB5-server
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
@@ -528,6 +563,9 @@ fi
%exclude %{_libdir}/monetdb5/geom.mal
%endif
%exclude %{_libdir}/monetdb5/gsl.mal
+%if %{?_with_rintegration:1}%{!?_with_rintegration:0}
+%exclude %{_libdir}/monetdb5/rapi.mal
+%endif
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
%{_libdir}/monetdb5/*.mal
@@ -535,6 +573,9 @@ fi
%exclude %{_libdir}/monetdb5/autoload/*_geom.mal
%endif
%exclude %{_libdir}/monetdb5/autoload/*_gsl.mal
+%if %{?_with_rintegration:1}%{!?_with_rintegration:0}
+%exclude %{_libdir}/monetdb5/autoload/*_rapi.mal
+%endif
# %exclude %{_libdir}/monetdb5/autoload/*_rdf.mal
%exclude %{_libdir}/monetdb5/autoload/*_sql.mal
%{_libdir}/monetdb5/autoload/*.mal
@@ -542,6 +583,9 @@ fi
%exclude %{_libdir}/monetdb5/lib_geom.so
%endif
%exclude %{_libdir}/monetdb5/lib_gsl.so
+%if %{?_with_rintegration:1}%{!?_with_rintegration:0}
+%exclude %{_libdir}/monetdb5/lib_rapi.so
+%endif
%if %{?_with_samtools:1}%{!?_with_samtools:0}
%exclude %{_libdir}/monetdb5/bam.mal
%exclude %{_libdir}/monetdb5/autoload/*_bam.mal
@@ -783,6 +827,7 @@ developer, but if you do want to test, t
--enable-optimize=yes \
--enable-profile=no \
--enable-rdf=no \
+
--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
--enable-sql=yes \
--enable-strict=no \
--enable-testing=yes \
diff --git a/clients/Tests/SQL-dump.sql b/clients/Tests/SQL-dump.sql
--- a/clients/Tests/SQL-dump.sql
+++ b/clients/Tests/SQL-dump.sql
@@ -10,6 +10,8 @@
\dSs
\dSf
+\dn bam
+\dn json
\dn tmp
\dSn sys
@@ -62,6 +64,7 @@
\dSf sys.boundary
\dSf sys.broadcast
\dSf sys.buffer
+\dSf sys.chi2prob
\dSf sys.cluster1
\dSf sys.cluster2
\dSf sys.columnsize
@@ -93,13 +96,13 @@
\dSf sys.dimension
\dSf sys.disjoint
\dSf sys.distance
-\dSf sys.dropdictionary
\dSf sys.env
\dSf sys.envelope
\dSf sys.environment
\dSf sys.equals
\dSf sys.evalalgebra
\dSf sys.fuse
+\dSf sys.generate_series
\dSf sys.geomcollectionfromtext
\dSf sys.geometrytypeid
\dSf sys.geomfromtext
@@ -116,29 +119,17 @@
\dSf sys.getquery
\dSf sys.getroboturl
\dSf sys.getuser
-\dSf sys.gzcompress
-\dSf sys.gzdecompress
-\dSf sys.gzexpand
-\dSf sys.gztruncate
+\dSf sys.hashsize
\dSf sys.heapsize
\dSf sys.host
\dSf sys.hostmask
\dSf sys.ilike
-\dSf sys.indexsize
-\dSf sys.initializedictionary
+\dSf sys.imprintsize
\dSf sys.intersection
\dSf sys.isaurl
\dSf sys.isauuid
\dSf sys.isempty
\dSf sys.issimple
-\dSf sys.json_filter
-\dSf sys.json_filter_all
-\dSf sys.json_isvalid
-\dSf sys.json_isvalidarray
-\dSf sys.json_isvalidobject
-\dSf sys.json_length
-\dSf sys.json_path
-\dSf sys.json_text
\dSf sys.length
\dSf sys.like
\dSf sys.linefromtext
@@ -156,7 +147,6 @@
\dSf sys.ms_trunc
\dSf sys.netmask
\dSf sys.network
-\dSf sys.newdictionary
\dSf sys.newurl
\dSf sys.optimizer_stats
\dSf sys.optimizers
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -240,6 +240,7 @@ SYSTEM FUNCTION sys.y
SYSTEM FUNCTION sys.zorder_decode_x
SYSTEM FUNCTION sys.zorder_decode_y
SYSTEM FUNCTION sys.zorder_encode
+CREATE SCHEMA "json" AUTHORIZATION "monetdb";
CREATE SCHEMA "tmp";
CREATE SCHEMA "sys";
CREATE TABLE "sys"."_columns" (
@@ -685,6 +686,55 @@ returns integer external name udf.fuse;
-- fuse two (4-byte) integer values into one (8-byte) bigint value
create function fuse(one integer, two integer)
returns bigint external name udf.fuse;
+-- 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-2014 MonetDB B.V.
+-- All Rights Reserved.
+
+-- (c) Author M.Kersten
+
+create function sys.generate_series(first tinyint, last tinyint)
+returns table (value tinyint)
+external name generator.series;
+create function sys.generate_series(first tinyint, last tinyint, stepsize
tinyint)
+returns table (value tinyint)
+external name generator.series;
+create function sys.generate_series(first int, last int)
+returns table (value int)
+external name generator.series;
+create function sys.generate_series(first int, last int, stepsize int)
+returns table (value int)
+external name generator.series;
+create function sys.generate_series(first bigint, last bigint)
+returns table (value bigint)
+external name generator.series;
+create function sys.generate_series(first bigint, last bigint, stepsize bigint)
+returns table (value bigint)
+external name generator.series;
+create function sys.generate_series(first real, last real, stepsize real)
+returns table (value real)
+external name generator.series;
+create function sys.generate_series(first double, last double, stepsize double)
+returns table (value double)
+external name generator.series;
+create function sys.generate_series(first decimal(10,2), last decimal(10,2),
stepsize decimal(10,2))
+returns table (value decimal(10,2))
+external name generator.series;
+create function sys.generate_series(first timestamp, last timestamp, stepsize
interval second)
+returns table (value timestamp)
+external name generator.series;
create function geomcollectionfromtext(wkt string, srid smallint) returns
multipolygon external name geom."GeomCollectionFromText";
create function geometrytypeid(g geometry) returns integer external name
geom."GeometryTypeId";
-- The srid in the *FromText Functions is currently not used
@@ -715,6 +765,16 @@ create function getroboturl(theurl url)
external name url."getRobotURL";
create function getuser(theurl url) returns string
external name url."getUser";
+create function sys.hashsize(b boolean, i bigint)
+returns bigint
+begin
+ -- assume non-compound keys
+ if b = true
+ then
+ return 8 * i;
+ end if;
+ return 0;
+end;
create function sys.heapsize(tpe string, i bigint, w int)
returns bigint
begin
@@ -729,6 +789,25 @@ create function "host" (p inet) returns
create function "hostmask" (p inet) returns inet
external name inet."hostmask";
create filter function "ilike"(val string, pat string, esc string) external
name algebra.ilikesubselect;
+create function sys.imprintsize(i bigint, nme string)
+returns bigint
+begin
+ if nme = 'boolean'
+ or nme = 'tinyint'
+ or nme = 'smallint'
+ or nme = 'int'
+ or nme = 'bigint'
+ or nme = 'hugeint'
+ or nme = 'decimal'
+ or nme = 'date'
+ or nme = 'timestamp'
+ or nme = 'real'
+ or nme = 'double'
+ then
+ return cast( i * 0.12 as bigint);
+ end if ;
+ return 0;
+end;
create function intersection(a geometry, b geometry) returns geometry external
name geom."Intersection";
create function isaurl(theurl url) returns bool
external name url."isaURL";
diff --git a/clients/Tests/SQL-dump.stable.out.32bit
b/clients/Tests/SQL-dump.stable.out.32bit
--- a/clients/Tests/SQL-dump.stable.out.32bit
+++ b/clients/Tests/SQL-dump.stable.out.32bit
@@ -1,22 +1,20 @@
stdout of test 'SQL-dump` in directory 'clients` itself:
-# 15:01:36 >
-# 15:01:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34237" "--set"
"mapi_usock=/var/tmp/mtest-13451/.s.monetdb.34237" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_clients" "--set"
"mal_listing=0"
-# 15:01:36 >
+# 03:59:59 >
+# 03:59:59 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35201" "--set"
"mapi_usock=/var/tmp/mtest-38510/.s.monetdb.35201" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Volumes/scratch/monet/GNU-Darwin-i386-propcheck-bbd8d343a80b-default/tests/clients/dbfarm/mTests_clients"
"--set" "mal_listing=0"
+# 03:59:59 >
-# MonetDB 5 server v11.17.0 (hg id: 51cced809df4)
-# This is an unreleased version
+# MonetDB 5 server v11.20.0 "default-bbd8d343a80b"
# Serving database 'mTests_clients', using 8 threads
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
