Changeset: ae296c0fcf91 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ae296c0fcf91
Modified Files:
NT/monetdb_config.h.in
geom/sql/Tests/basic.stable.out
geom/sql/Tests/relation.stable.out
geom/sql/Tests/spatial.stable.out
sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (152 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
@@ -980,43 +980,6 @@ typedef unsigned __int64 uint64_t;
#endif
#endif
-/* if nothing defined, ALGEBRA is default.
- if ALGEBRA_IS_DEFAULT is defined to 0, SQL is default.
- if both ALGEBRA_IS_DEFAULT and SQL_IS_DEFAULT are defined to 0, we
- fallback to MPS */
-/* Use algebra back-end by default? */
-#ifndef ALGEBRA_IS_DEFAULT
-#if defined(MILPRINT_SUMMER_IS_DEFAULT) && MILPRINT_SUMMER_IS_DEFAULT
-#define ALGEBRA_IS_DEFAULT 0
-#elif defined(SQL_IS_DEFAULT) && SQL_IS_DEFAULT
-#define ALGEBRA_IS_DEFAULT 0
-#else
-#define ALGEBRA_IS_DEFAULT 1
-#endif
-#endif
-
-/* Use milprint_summer back-end by default? */
-#ifndef MILPRINT_SUMMER_IS_DEFAULT
-#if defined(SQL_IS_DEFAULT) && !SQL_IS_DEFAULT && !ALGEBRA_IS_DEFAULT
-#define MILPRINT_SUMMER_IS_DEFAULT 1
-#else
-#define MILPRINT_SUMMER_IS_DEFAULT 0
-#endif
-#endif
-
-/* Use sql back-end by default? */
-#ifndef SQL_IS_DEFAULT
-#if ALGEBRA_IS_DEFAULT || MILPRINT_SUMMER_IS_DEFAULT
-#define SQL_IS_DEFAULT 0
-#else
-#define SQL_IS_DEFAULT 1
-#endif
-#endif
-
-#if (ALGEBRA_IS_DEFAULT + MILPRINT_SUMMER_IS_DEFAULT + SQL_IS_DEFAULT) != 1
-#error "Only one of ALGEBRA_IS_DEFAULT, MILPRINT_SUMMER_IS_DEFAULT,
SQL_IS_DEFAULT can be set to 1"
-#endif
-
#ifndef _SEEN_MONETDB_CONFIG_H
#define _SEEN_MONETDB_CONFIG_H 1
diff --git a/geom/sql/Tests/basic.stable.out b/geom/sql/Tests/basic.stable.out
--- a/geom/sql/Tests/basic.stable.out
+++ b/geom/sql/Tests/basic.stable.out
@@ -47,8 +47,9 @@ Ready.
[ "LINESTRING (10 10, 20 20, 30 40)" ]
[ "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))" ]
-% sys., sys., sys., sys. # table_name
-% or_or_=_dimension_g, geometrytypeid_g, srid_g, envelope_g # name
+#SELECT CASE WHEN Dimension(g) IN (0,1,2) THEN 3 ELSE Dimension(g) END,
GeometryTypeId(g), SRID(g), Envelope(g) FROM geoms where g is not NULL;
+% sys.L3, sys.L4, sys.L5, sys.L5 # table_name
+% L3, L4, L5, envelope_g # name
% int, int, int, geometry # type
% 1, 1, 1, 0 # length
[ 3, 0, 0, "POINT (10 10)" ]
@@ -56,8 +57,8 @@ Ready.
[ 3, 3, 0, "POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))" ]
[ 3, 3, 0, "POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))" ]
#SELECT IsEmpty(g), IsSimple(g), Boundary(g) FROM geoms where g is not NULL;
-% sys., sys., sys. # table_name
-% isempty_g, issimple_g, boundary_g # name
+% sys.L1, sys.L2, sys.L2 # table_name
+% L1, L2, boundary_g # name
% boolean, boolean, geometry # type
% 5, 5, 0 # length
[ false, true, "GEOMETRYCOLLECTION EMPTY" ]
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
@@ -40,8 +40,9 @@ Ready.
[ "LINESTRING (10 10, 20 20, 30 40)" ]
[ "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))" ]
-% sys.a, sys.b, sys., sys., sys., sys. # table_name
-% g, g, equals_g, disjoint_g, Intersect_g, touches_g # name
+#SELECT a.g, b.g, Equals(a.g,b.g), Disjoint(a.g,b.g), "Intersect"(a.g,b.g),
Touches(a.g,b.g) FROM geoms a, geoms b where a.g is not NULL and b.g is not
NULL;
+% sys.a, sys.b, sys.L1, sys.L2, sys.L3, sys.L3 # table_name
+% g, g, L1, L2, L3, touches_g # name
% geometry, geometry, boolean, boolean, boolean,
boolean # type
% 0, 0, 5, 5, 5, 5 # length
[ "POINT (10 10)", "POINT (10 10)", true, false, true, false
]
@@ -60,8 +61,9 @@ Ready.
[ "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, false, true,
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))", false,
false, true, 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), (15 15, 15 20, 10
15, 15 15))", true, false, true, false ]
-% sys.a, sys.b, sys., sys., sys., sys. # table_name
-% g, g, crosses_g, within_g, contains_g, overlaps_g #
name
+#SELECT a.g, b.g, Crosses(a.g,b.g), Within(a.g,b.g), Contains(a.g,b.g),
Overlaps(a.g,b.g) FROM geoms a, geoms b where a.g is not NULL and b.g is not
NULL;
+% sys.a, sys.b, sys.L1, sys.L2, sys.L3, sys.L3 # table_name
+% g, g, L1, L2, L3, overlaps_g # name
% geometry, geometry, boolean, boolean, boolean,
boolean # type
% 0, 0, 5, 5, 5, 5 # length
[ "POINT (10 10)", "POINT (10 10)", false, true, true, false
]
@@ -80,7 +82,8 @@ Ready.
[ "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, false, false,
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))", false,
true, false, 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), (15 15, 15 20, 10
15, 15 15))", false, true, true, false ]
-% sys.a, sys.b, sys. # table_name
+#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;
+% sys.a, sys.b, sys.L # table_name
% g, g, relate_g # name
% geometry, geometry, boolean # type
% 0, 0, 5 # length
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
@@ -47,8 +47,9 @@ Ready.
[ "LINESTRING (10 10, 20 20, 30 40)" ]
[ "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))" ]
-% sys., sys., sys., sys. # table_name
-% area_g, length_g, buffer_g, convexhull_g # name
+#SELECT Area(g), Length(g), Buffer(g, 2.0), ConvexHull(g) FROM geoms where g
is not NULL;
+% sys.L1, sys.L2, sys.L3, sys.L3 # table_name
+% L1, L2, L3, convexhull_g # name
% double, double, geometry, geometry # type
% 24, 24, 0, 0 # length
[ 0, 0, "POLYGON ((12 10, 11.96157056 9.609819356, 11.84775907
9.234633135, 11.66293922 8.888859534, 11.41421356 8.585786438, 11.11114047
8.337060775, 10.76536686 8.152240935, 10.39018064 8.038429439, 10 8,
9.609819356 8.038429439, 9.234633135 8.152240935, 8.888859534 8.337060775,
8.585786438 8.585786438, 8.337060775 8.888859534, 8.152240935 9.234633135,
8.038429439 9.609819356, 8 10, 8.038429439 10.39018064, 8.152240935
10.76536686, 8.337060775 11.11114047, 8.585786438 11.41421356, 8.888859534
11.66293922, 9.234633135 11.84775907, 9.609819356 11.96157056, 10 12,
10.39018064 11.96157056, 10.76536686 11.84775907, 11.11114047 11.66293922,
11.41421356 11.41421356, 11.66293922 11.11114047, 11.84775907 10.76536686,
11.96157056 10.39018064, 12 10))", "POINT (10 10)" ]
@@ -56,8 +57,8 @@ Ready.
[ 75, 36.18033989, "POLYGON ((9.755412201 7.800022564, 8.14166335
8.797374203, 8.171572875 21, 9 21.82842712, 21 21.82842712, 21.82842712 21,
21.85833665 14.2026258, 21.54426658 13.69444975, 9.755412201 7.800022564))",
"POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ]
[ 62.5, 53.2514077, "POLYGON ((9.755412201 7.800022564, 8.14166335
8.797374203, 8.171572875 21, 9 21.82842712, 21 21.82842712, 21.82842712 21,
21.85833665 14.2026258, 21.54426658 13.69444975, 9.755412201 7.800022564))",
"POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ]
#SELECT a.g, b.g, Distance(a.g,b.g), Intersection(a.g,b.g), "Union"(a.g,b.g),
Difference(a.g,b.g), SymDifference(a.g,b.g) FROM geoms a, geoms b where a.g is
not NULL and b.g is not NULL;
-% sys.a, sys.b, sys., sys., sys., sys., sys. # table_name
-% g, g, distance_g, intersection_g, Union_g, difference_g,
symdifference_g # name
+% sys.a, sys.b, sys.L1, sys.L2, sys.L3, sys.L4, sys.L4 # table_name
+% g, g, L1, L2, L3, L4, symdifference_g # name
% geometry, geometry, double, geometry, geometry,
geometry, geometry # type
% 0, 0, 24, 0, 0, 0, 0 # length
[ "POINT (10 10)", "POINT (10 10)", 0, "POINT (10 10)",
"POINT (10 10)", "GEOMETRYCOLLECTION EMPTY", "GEOMETRYCOLLECTION
EMPTY" ]
diff --git
a/sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err
b/sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err
---
a/sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err
+++
b/sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err
@@ -27,10 +27,9 @@ stderr of test 'table_function_with_colu
# 13:48:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=32735"
# 13:48:49 >
-MAPI = (monetdb) /var/tmp/mtest-14412/.s.monetdb.30345
+MAPI = (monetdb) /var/tmp/mtest-22265/.s.monetdb.33041
QUERY = select * from x((select id from _tables), (select schema_id from
_tables));
-ERROR = !TypeException:user.s2_1[115]:'sql.x' undefined in: _215:any :=
sql.x(_211:int, _213:int)
- !TypeException:user.s2_1[117]:'bat.insert' undefined in: _218:any :=
bat.insert(_206:bat[:oid,:int], _216:oid, _215:any)
+ERROR = !TypeException:user.s0_1[41]:'mal.multiplex' undefined in:
(_55:bat[:oid,:int], _58:bat[:oid,:int]) := mal.multiplex(_56:str, _57:str,
_49:bat[:oid,:int], _52:bat[:oid,:int])
!program contains errors
# 13:48:49 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
