Changeset: bafea0874fe9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bafea0874fe9
Modified Files:
configure.ag
geom/monetdb5/geom.mx
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 647 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -439,3 +439,5 @@
e4e992bb9279acc293403527538d9909f46f2325 Mar2011_1
be8ff3e8c6150ec40f4e0d1ba9789bec23621f88 Mar2011_1
568733c4fc9fc0275d4b264fa188df6c70ede9cf Apr2011_1
+568733c4fc9fc0275d4b264fa188df6c70ede9cf Apr2011_1
+ff43c1f6f50cf795cf12b9336f74fd86686a5fd6 Apr2011_1
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -384,6 +384,8 @@
%{_libdir}/monetdb5/*.mal
# %{_libdir}/monetdb5/autoload/*_fits.mal
%{_libdir}/monetdb5/autoload/*_vault.mal
+%{_libdir}/monetdb5/autoload/*_lsst.mal
+%{_libdir}/monetdb5/autoload/*_udf.mal
%exclude %{_libdir}/monetdb5/lib_geom.so
# %exclude %{_libdir}/monetdb5/lib_rdf.so
%exclude %{_libdir}/monetdb5/lib_sql.so
@@ -574,6 +576,12 @@
rm -fr $RPM_BUILD_ROOT
%changelog
+* Thu Apr 21 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110421
+- Rebuilt.
+
+* Mon Apr 18 2011 Fabian Groffen <[email protected]> - 11.3.1-20110421
+- merovingian: Fix monetdb return code upon failure to start/stop a database
+
* Thu Apr 14 2011 Sjoerd Mullender <[email protected]> - 11.3.1-20110414
- Rebuilt.
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 [ options ]
+Usage: mclient [ options ] [ file or database [ file ... ] ]
Options are:
-h hostname | --host=hostname host or UNIX domain socket to connect to
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 [ options ]
+Usage: mclient [ options ] [ file or database [ file ... ] ]
Options are:
-h hostname | --host=hostname host to connect to
diff --git a/clients/python/setup.py b/clients/python/setup.py
--- a/clients/python/setup.py
+++ b/clients/python/setup.py
@@ -26,7 +26,7 @@
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.
+accelerators and SQL frontend.
This package contains the files needed to use MonetDB from a Python
program.
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+monetdb (11.3.1-20110421) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Thu, 21 Apr 2011 09:38:31 +0200
+
+monetdb (11.3.1-20110421) unstable; urgency=low
+
+ * merovingian: Fix monetdb return code upon failure to start/stop a database
+
+ -- Fabian Groffen <[email protected]> Mon, 18 Apr 2011 09:38:31 +0200
+
monetdb (11.3.1-20110414) unstable; urgency=low
* Rebuilt.
diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
+++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
@@ -10,13 +10,14 @@
# 11:37:42 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=30423
# 11:37:42 >
-MAPI = monetdb@rig:30424
+MAPI = monetdb@alf:35630
QUERY = COPY 1 RECORDS INTO nodes from STDIN USING DELIMITERS ',', '\n';
-ERROR = !SQLException:sql:value ''POINT(52.0697 4.3723)'' while parsing
''POINT(52.0697 4.3723)'' from line 0 field 1 not inserted, expecting type wkb
- !SQLException:importTable:failed to import table
- !ERROR: ParseException: Unknown type: ''POINT'
+ 45111956, 'POINT(52.0697 4.3723)'
+
+ERROR = !SQLException:importTable:value ' 'POINT(52.0697 4.3723)'' from line 1
field 2 not inserted, expecting type point
+ !failed to import table
-# 11:37:42 >
-# 11:37:42 > Done.
-# 11:37:42 >
+# 13:33:18 >
+# 13:33:18 > Done.
+# 13:33:18 >
diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.out
b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.out
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.out
+++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.out
@@ -15,6 +15,7 @@
Ready.
+!ERROR: ParseException: Unknown type: ''POINT'
Over..
diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -1197,7 +1197,7 @@
throw(MAL, "geom.@1", "wkb2geos(*a) and wkb2geos(*b) both
failed");
}
- *out = @2(ga, gb, @4);
+ *out = @2(ga, gb, * @4);
GEOSGeom_destroy(ga);
GEOSGeom_destroy(gb);
@@ -1213,7 +1213,7 @@
@:spatial(Within,GEOSWithin)@
@:spatial(Contains,GEOSContains)@
@:spatial(Overlaps,GEOSOverlaps)@
-@:spatial2(Relate,GEOSRelatePattern,char*,pattern)@
+@:spatial2(Relate,GEOSRelatePattern,str*,pattern)@
@= analysis
geom_export str
diff --git a/geom/sql/Tests/relation.sql b/geom/sql/Tests/relation.sql
--- a/geom/sql/Tests/relation.sql
+++ b/geom/sql/Tests/relation.sql
@@ -24,4 +24,6 @@
SELECT a.g, b.g, Relate(a.g,b.g,'Touches') FROM geoms a, geoms b where a.g is
not NULL and b.g is not NULL;
+SELECT a.g, b.g, Relate(a.g,b.g,'*F**T**F*') FROM geoms a, geoms b where a.g
is not NULL and b.g is not NULL;
+
DROP TABLE geoms;
diff --git a/geom/sql/Tests/relation.stable.err
b/geom/sql/Tests/relation.stable.err
--- a/geom/sql/Tests/relation.stable.err
+++ b/geom/sql/Tests/relation.stable.err
@@ -10,34 +10,38 @@
# 22:42:46 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=koala --port=32262
# 22:42:46 >
-MAPI = monetdb@koolmees:30183
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('LINESTRING(10 10)');
ERROR = !MALException:wkb.FromText:IllegalArgumentException: point array must
contain 0 or >1 elements
-MAPI = monetdb@koolmees:30183
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('LINESTRING(10)');
ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@koolmees:30183
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('LINESTRING()');
ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@koolmees:30183
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('LINESTRING');
ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@koolmees:30183
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('');
ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@koolmees:30183
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('POINT(10)');
ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@koolmees:30183
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('POINT()');
ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@koolmees:30183
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('POINT');
ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@koolmees:30183
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('');
ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-# 20:50:35 >
-# 20:50:35 > Done.
-# 20:50:35 >
+MAPI = monetdb@alf:33463
+QUERY = SELECT a.g, b.g, Relate(a.g,b.g,'Touches') FROM geoms a, geoms b where
a.g is not NULL and b.g is not NULL;
+ERROR = !MALException:!ERROR: IllegalArgumentException:
IllegalArgumentException: Should be length 9, is [Touches] instead
+# 14:48:45 >
+# 14:48:45 > Done.
+# 14:48:45 >
+
diff --git a/geom/sql/Tests/relation.stable.out
b/geom/sql/Tests/relation.stable.out
--- a/geom/sql/Tests/relation.stable.out
+++ b/geom/sql/Tests/relation.stable.out
@@ -85,20 +85,20 @@
% g, g, relate_g # name
% geometry, geometry, boolean # type
% 0, 0, 5 # length
-[ "POINT (10 10)", "POINT (10 10)", true ]
-[ "POINT (10 10)", "LINESTRING (10 10, 20 20, 30 40)", true ]
-[ "POINT (10 10)", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))",
true ]
-[ "POINT (10 10)", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15,
15 20, 10 15, 15 15))", true ]
-[ "LINESTRING (10 10, 20 20, 30 40)", "POINT (10 10)", true ]
+[ "POINT (10 10)", "POINT (10 10)", false ]
+[ "POINT (10 10)", "LINESTRING (10 10, 20 20, 30 40)", false ]
+[ "POINT (10 10)", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))",
false ]
+[ "POINT (10 10)", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15,
15 20, 10 15, 15 15))", false ]
+[ "LINESTRING (10 10, 20 20, 30 40)", "POINT (10 10)", false ]
[ "LINESTRING (10 10, 20 20, 30 40)", "LINESTRING (10 10, 20 20, 30 40)",
true ]
-[ "LINESTRING (10 10, 20 20, 30 40)", "POLYGON ((10 10, 10 20, 20 20, 20 15,
10 10))", true ]
-[ "LINESTRING (10 10, 20 20, 30 40)", "POLYGON ((10 10, 10 20, 20 20, 20 15,
10 10), (15 15, 15 20, 10 15, 15 15))", true ]
-[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", "POINT (10 10)",
true ]
-[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", "LINESTRING (10 10, 20
20, 30 40)", true ]
+[ "LINESTRING (10 10, 20 20, 30 40)", "POLYGON ((10 10, 10 20, 20 20, 20 15,
10 10))", false ]
+[ "LINESTRING (10 10, 20 20, 30 40)", "POLYGON ((10 10, 10 20, 20 20, 20 15,
10 10), (15 15, 15 20, 10 15, 15 15))", false ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", "POINT (10 10)",
false ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", "LINESTRING (10 10, 20
20, 30 40)", false ]
[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", "POLYGON ((10 10, 10
20, 20 20, 20 15, 10 10))", true ]
-[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", "POLYGON ((10 10, 10
20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))", true ]
-[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))", "POINT (10 10)", true ]
-[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))", "LINESTRING (10 10, 20 20, 30 40)", true ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", "POLYGON ((10 10, 10
20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))", false ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))", "POINT (10 10)", false ]
+[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))", "LINESTRING (10 10, 20 20, 30 40)", false ]
[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))", true ]
[ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10
15, 15 15))", true ]
diff --git a/geom/sql/Tests/spatial.stable.err
b/geom/sql/Tests/spatial.stable.err
--- a/geom/sql/Tests/spatial.stable.err
+++ b/geom/sql/Tests/spatial.stable.err
@@ -10,31 +10,31 @@
# 22:58:03 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=koala --port=35790
# 22:58:03 >
-MAPI = monetdb@koolmees:38689
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('LINESTRING(10 10)');
ERROR = !MALException:wkb.FromText:IllegalArgumentException: point array must
contain 0 or >1 elements
-MAPI = monetdb@koolmees:38689
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('LINESTRING(10)');
ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@koolmees:38689
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('LINESTRING()');
ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@koolmees:38689
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('LINESTRING');
ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@koolmees:38689
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('');
ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@koolmees:38689
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('POINT(10)');
ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@koolmees:38689
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('POINT()');
ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@koolmees:38689
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('POINT');
ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@koolmees:38689
+MAPI = monetdb@alf:33463
QUERY = INSERT INTO geoms values ('');
ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
diff --git a/geom/sql/Tests/spatial.stable.out
b/geom/sql/Tests/spatial.stable.out
--- a/geom/sql/Tests/spatial.stable.out
+++ b/geom/sql/Tests/spatial.stable.out
@@ -52,10 +52,11 @@
% area_g, length_g, buffer_g, convexhull_g # name
% double, double, geometry, geometry # type
% 22, 22, 0, 0 # length
-[ 0, 0, "POLYGON ((12 10, 10 8, 8 10, 10 12, 12 10))", "POINT (10 10)"
]
-[ 0, 36.502815398728849, "POLYGON ((18.35629117 21.18471829, 28.21114562
40.89442719, 28.21114562 40.89442719, 30.89442719 41.78885438, 31.78885438
39.10557281, 21.78885438 19.10557281, 21.41421356 18.58578644, 11.41421356
8.585786438, 11.41421356 8.585786438, 8.585786438 8.585786438, 8.585786438
11.41421356, 18.35629117 21.18471829))", "POLYGON ((10 10, 30 40, 20 20,
10 10))" ]
-[ 75, 36.180339887498945, "POLYGON ((10.89442719 8.211145618, 10.89442719
8.211145618, 8 10, 8 20, 10 22, 20 22, 22 20, 22 15, 20.89442719 13.21114562,
10.89442719 8.211145618))", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10
10))" ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
