Changeset: c5eed564236e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5eed564236e
Added Files:
sql/test/BugTracker-2013/Tests/incorrect_subquery_delete.Bug-3315.sql
sql/test/BugTracker-2013/Tests/incorrect_subquery_delete.Bug-3315.stable.err
sql/test/BugTracker-2013/Tests/incorrect_subquery_delete.Bug-3315.stable.out
Modified Files:
geom/sql/Tests/basic.stable.out
geom/sql/Tests/relation.stable.out
geom/sql/Tests/spatial.stable.out
monetdb5/modules/atoms/Tests/xml00.mal
monetdb5/modules/atoms/Tests/xml00.stable.out
monetdb5/modules/atoms/Tests/xml01.mal
monetdb5/modules/atoms/Tests/xml01.stable.out
monetdb5/modules/atoms/Tests/xml02.mal
monetdb5/modules/atoms/Tests/xml02.stable.out
monetdb5/modules/atoms/Tests/xml03.mal
monetdb5/modules/atoms/Tests/xml03.stable.out
monetdb5/modules/atoms/Tests/xml04.mal
monetdb5/modules/atoms/Tests/xml04.stable.out
monetdb5/modules/atoms/Tests/xml05.mal
monetdb5/modules/atoms/Tests/xml05.stable.out
monetdb5/modules/atoms/Tests/xml10.mal
monetdb5/modules/atoms/Tests/xml10.stable.out
monetdb5/optimizer/opt_pushselect.c
sql/backends/monet5/Tests/optimizers.stable.err
sql/backends/monet5/Tests/optimizers.stable.out
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.mx
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/02.stable.out
sql/benchmarks/tpch/LOCKED/Tests/04.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/02.stable.out
sql/benchmarks/tpch/Tests/04.stable.out
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/include/sql_relation.h
sql/rel.txt
sql/server/rel_distribute.c
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_select.c
sql/server/rel_select.h
sql/server/rel_updates.c
sql/server/sql_semantic.h
sql/storage/sql_catalog.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/var_char_cast_truncate.SF-1150907.stable.out
sql/test/BugDay_2005-12-19_2.9.3/Tests/timestamp_fraction.SF-1357342.stable.out
sql/test/BugTracker-2008/Tests/OOM_query.SF-2457195.stable.out
sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out
sql/test/BugTracker-2009/Tests/correlated-selection-bug.stable.out
sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out
sql/test/BugTracker-2009/Tests/double_count_limit_bug.SF-2862146.stable.out
sql/test/BugTracker-2010/Tests/join_problem.Bug-2694.stable.out
sql/test/BugTracker-2011/Tests/aggregate-in-subquery.Bug-2739.stable.out
sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out
sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
sql/test/BugTracker-2011/Tests/rand-with-seed.Bug-2900.stable.out
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.stable.out
sql/test/BugTracker-2012/Tests/simple_select.Bug-2988.stable.out
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Tests/order_by_complex_exp.stable.out
sql/test/Tests/round.stable.out
sql/test/Tests/string.stable.out
sql/test/VOC/Tests/VOC.stable.out
sql/test/bugs/Tests/case_substring.stable.out
sql/test/bugs/Tests/crash_order_by.stable.err
sql/test/bugs/Tests/create_insert_select_aggr-bug-00001.stable.out
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
sql/test/bugs/Tests/polymorphism.stable.out
sql/test/bugs/Tests/selectlist_subquery-sf-1208599.stable.out
sql/test/bugs/Tests/subselect_single_value-bug-sf-962099.stable.out
sql/test/bugs/Tests/zero_or_one_bug.stable.out
sql/test/sql_xml/Tests/xml.stable.out
Branch: SciQL-2
Log Message:
Merge with Feb2013 branch.
diffs (truncated from 4536 to 300 lines):
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/monetdb5/modules/atoms/Tests/xml00.mal
b/monetdb5/modules/atoms/Tests/xml00.mal
--- a/monetdb5/modules/atoms/Tests/xml00.mal
+++ b/monetdb5/modules/atoms/Tests/xml00.mal
@@ -4,6 +4,6 @@ bat.insert(b,1@0,"Annie Chapman");
io.print(b);
-bc:= xml.comment(b);
-bj:= xml.str(bc);
+bc:= batxml.comment(b);
+bj:= batxml.str(bc);
io.print(bj);
diff --git a/monetdb5/modules/atoms/Tests/xml00.stable.out
b/monetdb5/modules/atoms/Tests/xml00.stable.out
--- a/monetdb5/modules/atoms/Tests/xml00.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml00.stable.out
@@ -19,8 +19,8 @@ function user.main():void;
bat.insert(b,0@0,"Mary Ann Walker");
bat.insert(b,1@0,"Annie Chapman");
io.print(b);
- bc := xml.comment(b);
- bj := xml.str(bc);
+ bc := batxml.comment(b);
+ bj := batxml.str(bc);
io.print(bj);
end main;
#---------------------------------#
diff --git a/monetdb5/modules/atoms/Tests/xml01.mal
b/monetdb5/modules/atoms/Tests/xml01.mal
--- a/monetdb5/modules/atoms/Tests/xml01.mal
+++ b/monetdb5/modules/atoms/Tests/xml01.mal
@@ -4,6 +4,6 @@ bat.insert(b,1@0,"Annie Chapman");
io.print(b);
-bc:= xml.attribute("name",b);
-bj:= xml.str(bc);
+bc:= batxml.attribute("name",b);
+bj:= batxml.str(bc);
io.print(bj);
diff --git a/monetdb5/modules/atoms/Tests/xml01.stable.out
b/monetdb5/modules/atoms/Tests/xml01.stable.out
--- a/monetdb5/modules/atoms/Tests/xml01.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml01.stable.out
@@ -22,8 +22,8 @@ function user.main():void;
bat.insert(b,0@0,"Mary Ann Walker");
bat.insert(b,1@0,"Annie Chapman");
io.print(b);
- bc := xml.attribute("name",b);
- bj := xml.str(bc);
+ bc := batxml.attribute("name",b);
+ bj := batxml.str(bc);
io.print(bj);
end main;
#---------------------------------#
diff --git a/monetdb5/modules/atoms/Tests/xml02.mal
b/monetdb5/modules/atoms/Tests/xml02.mal
--- a/monetdb5/modules/atoms/Tests/xml02.mal
+++ b/monetdb5/modules/atoms/Tests/xml02.mal
@@ -7,13 +7,13 @@ bat.insert(h,1@0,"curly dark brown");
io.print(b);
-bc:= xml.attribute("name",b);
-hc:= xml.attribute("hair",h);
-bj:= xml.str(bc);
-hj:= xml.str(hc);
+bc:= batxml.attribute("name",b);
+hc:= batxml.attribute("hair",h);
+bj:= batxml.str(bc);
+hj:= batxml.str(hc);
io.print(bj);
io.print(hj);
-aa:= xml.concat(bc,hc);
-as:= xml.str(aa);
+aa:= batxml.concat(bc,hc);
+as:= batxml.str(aa);
io.print(as);
diff --git a/monetdb5/modules/atoms/Tests/xml02.stable.out
b/monetdb5/modules/atoms/Tests/xml02.stable.out
--- a/monetdb5/modules/atoms/Tests/xml02.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml02.stable.out
@@ -22,14 +22,14 @@ function user.main():void;
bat.insert(h,0@0,"brown");
bat.insert(h,1@0,"curly dark brown");
io.print(b);
- bc := xml.attribute("name",b);
- hc := xml.attribute("hair",h);
- bj := xml.str(bc);
- hj := xml.str(hc);
+ bc := batxml.attribute("name",b);
+ hc := batxml.attribute("hair",h);
+ bj := batxml.str(bc);
+ hj := batxml.str(hc);
io.print(bj);
io.print(hj);
- aa := xml.concat(bc,hc);
- as := xml.str(aa);
+ aa := batxml.concat(bc,hc);
+ as := batxml.str(aa);
io.print(as);
end main;
#---------------------------------#
diff --git a/monetdb5/modules/atoms/Tests/xml03.mal
b/monetdb5/modules/atoms/Tests/xml03.mal
--- a/monetdb5/modules/atoms/Tests/xml03.mal
+++ b/monetdb5/modules/atoms/Tests/xml03.mal
@@ -7,17 +7,17 @@ bat.insert(h,1@0,"curly dark brown");
io.print(b);
-bs:= xml.xml(b);
-bc:= xml.element("name",bs);
-bj:= xml.str(bc);
+bs:= batxml.xml(b);
+bc:= batxml.element("name",bs);
+bj:= batxml.str(bc);
io.print(bj);
-hs:= xml.xml(h);
-hc:= xml.element("hair",hs);
-hj:= xml.str(hc);
+hs:= batxml.xml(h);
+hc:= batxml.element("hair",hs);
+hj:= batxml.str(hc);
io.print(hj);
-hh:= xml.concat(bc,hc);
+hh:= batxml.concat(bc,hc);
-aa:= xml.element("victim",hh);
-as:= xml.str(aa);
+aa:= batxml.element("victim",hh);
+as:= batxml.str(aa);
io.print(as);
diff --git a/monetdb5/modules/atoms/Tests/xml03.stable.out
b/monetdb5/modules/atoms/Tests/xml03.stable.out
--- a/monetdb5/modules/atoms/Tests/xml03.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml03.stable.out
@@ -22,17 +22,17 @@ function user.main():void;
bat.insert(h,0@0,"brown");
bat.insert(h,1@0,"curly dark brown");
io.print(b);
- bs := xml.xml(b);
- bc := xml.element("name",bs);
- bj := xml.str(bc);
+ bs := batxml.xml(b);
+ bc := batxml.element("name",bs);
+ bj := batxml.str(bc);
io.print(bj);
- hs := xml.xml(h);
- hc := xml.element("hair",hs);
- hj := xml.str(hc);
+ hs := batxml.xml(h);
+ hc := batxml.element("hair",hs);
+ hj := batxml.str(hc);
io.print(hj);
- hh := xml.concat(bc,hc);
- aa := xml.element("victim",hh);
- as := xml.str(aa);
+ hh := batxml.concat(bc,hc);
+ aa := batxml.element("victim",hh);
+ as := batxml.str(aa);
io.print(as);
end main;
#---------------------------------#
diff --git a/monetdb5/modules/atoms/Tests/xml04.mal
b/monetdb5/modules/atoms/Tests/xml04.mal
--- a/monetdb5/modules/atoms/Tests/xml04.mal
+++ b/monetdb5/modules/atoms/Tests/xml04.mal
@@ -7,15 +7,15 @@ bat.insert(h,1@0,"curly dark brown");
io.print(b);
-bs:= xml.xml(b);
-bc:= xml.element("name",bs);
-bj:= xml.str(bc);
+bs:= batxml.xml(b);
+bc:= batxml.element("name",bs);
+bj:= batxml.str(bc);
io.print(bj);
-hs:= xml.xml(h);
-hc:= xml.element("hair",hs);
-hj:= xml.str(hc);
+hs:= batxml.xml(h);
+hc:= batxml.element("hair",hs);
+hj:= batxml.str(hc);
io.print(hj);
-aa:= xml.forest(bc,hc);
-as:= xml.str(aa);
+aa:= batxml.forest(bc,hc);
+as:= batxml.str(aa);
io.print(as);
diff --git a/monetdb5/modules/atoms/Tests/xml04.stable.out
b/monetdb5/modules/atoms/Tests/xml04.stable.out
--- a/monetdb5/modules/atoms/Tests/xml04.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml04.stable.out
@@ -22,16 +22,16 @@ function user.main():void;
bat.insert(h,0@0,"brown");
bat.insert(h,1@0,"curly dark brown");
io.print(b);
- bs := xml.xml(b);
- bc := xml.element("name",bs);
- bj := xml.str(bc);
+ bs := batxml.xml(b);
+ bc := batxml.element("name",bs);
+ bj := batxml.str(bc);
io.print(bj);
- hs := xml.xml(h);
- hc := xml.element("hair",hs);
- hj := xml.str(hc);
+ hs := batxml.xml(h);
+ hc := batxml.element("hair",hs);
+ hj := batxml.str(hc);
io.print(hj);
- aa := xml.forest(bc,hc);
- as := xml.str(aa);
+ aa := batxml.forest(bc,hc);
+ as := batxml.str(aa);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
