Changeset: 9e0c52b2519a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e0c52b2519a
Modified Files:
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (truncated from 1882 to 300 lines):
diff --git a/geom/sql/Tests/geom-null-tests.stable.out
b/geom/sql/Tests/geom-null-tests.stable.out
--- a/geom/sql/Tests/geom-null-tests.stable.out
+++ b/geom/sql/Tests/geom-null-tests.stable.out
@@ -37,39 +37,39 @@ Over..
% sys.geom, sys. # table_name
% id, area_g # name
% int, double # type
-% 1, 22 # length
+% 1, 24 # length
[ 1, 0 ]
[ 2, 0 ]
#SELECT id, Area(g) FROM geom WHERE id = 3; -- null argument, throws exception
% sys.geom, sys. # table_name
% id, area_g # name
% int, double # type
-% 1, 22 # length
+% 1, 24 # length
[ 3, NULL ]
#SELECT id, Length(g) FROM geom WHERE id < 3;
% sys.geom, sys. # table_name
% id, length_g # name
% int, double # type
-% 1, 22 # length
+% 1, 24 # length
[ 1, 0 ]
[ 2, 0 ]
#SELECT id, Length(g) FROM geom WHERE id = 3; -- null argument, throws
exception
% sys.geom, sys. # table_name
% id, length_g # name
% int, double # type
-% 1, 22 # length
+% 1, 24 # length
[ 3, NULL ]
#SELECT Distance(g1.g, g2.g) FROM geom g1, geom g2 WHERE g1.id = 1 AND g2.id =
2;
% sys. # table_name
% distance_g # name
% double # type
-% 22 # length
+% 24 # length
[ 1.414213562 ]
#SELECT Distance(g1.g, g2.g) FROM geom g1, geom g2 WHERE g1.id = 2 AND g2.id =
3; -- null argument, throws exception
% sys. # table_name
% distance_g # name
% double # type
-% 22 # length
+% 24 # length
[ NULL ]
#SELECT id, Buffer(g, 10) FROM geom WHERE id < 3;
% sys.geom, sys. # table_name
@@ -336,27 +336,27 @@ Over..
% sys.geom, sys. # table_name
% id, x_g # name
% int, double # type
-% 1, 22 # length
+% 1, 24 # length
[ 1, 1 ]
[ 2, 2 ]
#SELECT id, X(g) FROM geom WHERE id = 3; -- null argument, throws exception
% sys.geom, sys. # table_name
% id, x_g # name
% int, double # type
-% 1, 22 # length
+% 1, 24 # length
[ 3, NULL ]
#SELECT id, Y(g) FROM geom WHERE id < 3;
% sys.geom, sys. # table_name
% id, y_g # name
% int, double # type
-% 1, 22 # length
+% 1, 24 # length
[ 1, 1 ]
[ 2, 2 ]
#SELECT id, Y(g) FROM geom WHERE id = 3; -- null argument, throws exception
% sys.geom, sys. # table_name
% id, y_g # name
% int, double # type
-% 1, 22 # length
+% 1, 24 # length
[ 3, NULL ]
#DROP TABLE geom;
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
@@ -51,7 +51,7 @@ Over..
% sys., sys., sys., sys. # table_name
% area_g, length_g, buffer_g, convexhull_g # name
% double, double, geometry, geometry # type
-% 22, 22, 0, 0 # length
+% 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)" ]
[ 0, 36.5028154, "POLYGON ((18.35629117 21.18471829, 28.21114562
40.89442719, 28.42001204 41.2262292, 28.68959652 41.51090791, 29.00953906
41.73752328, 29.36754447 41.8973666, 29.74985478 41.98429518, 30.14177804
41.99496842, 30.52825285 41.92897614, 30.89442719 41.78885438, 31.2262292
41.57998796, 31.51090791 41.31040348, 31.73752328 40.99046094, 31.8973666
40.63245553, 31.98429518 40.25014522, 31.99496842 39.85822196, 31.92897614
39.47174715, 31.78885438 39.10557281, 21.63758456 18.85152983, 21.60738418
18.80962903, 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, 18.35629117 21.18471829))", "POLYGON ((10 10, 30
40, 20 20, 10 10))" ]
[ 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))" ]
@@ -60,7 +60,7 @@ Over..
% sys.a, sys.b, sys., sys., sys., sys., sys. # table_name
% g, g, distance_g, intersection_g, Union_g, difference_g,
symdifference_g # name
% geometry, geometry, double, geometry, geometry,
geometry, geometry # type
-% 0, 0, 22, 0, 0, 0, 0 # length
+% 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" ]
[ "POINT (10 10)", "LINESTRING (10 10, 20 20, 30 40)", 0, "POINT
(10 10)", "LINESTRING (10 10, 20 20, 30 40)", "GEOMETRYCOLLECTION
EMPTY", "LINESTRING (10 10, 20 20, 30 40)" ]
[ "POINT (10 10)", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))",
0, "POINT (10 10)", "POLYGON ((10 10, 10 20, 20 20, 20 15, 10
10))", "GEOMETRYCOLLECTION EMPTY", "POLYGON ((10 10, 10 20, 20 20,
20 15, 10 10))" ]
diff --git a/sql/benchmarks/ATIS/Tests/select_distinct.stable.out
b/sql/benchmarks/ATIS/Tests/select_distinct.stable.out
--- a/sql/benchmarks/ATIS/Tests/select_distinct.stable.out
+++ b/sql/benchmarks/ATIS/Tests/select_distinct.stable.out
@@ -71,7 +71,7 @@ Over..
% sys.fare, sys.fare, sys.fare, sys.fare, sys.fare,
sys.fare, sys.fare, sys.fare # table_name
% fare_code, from_airport, to_airport, fare_class, fare_airline,
restrict_code, one_way_cost, rnd_trip_cost # name
% char, char, char, char, char, char, real, real # type
-% 8, 3, 3, 3, 2, 5, 13, 13 # length
+% 8, 3, 3, 3, 2, 5, 15, 15 # length
[ "7100001", "ATL", "BOS", "F", "", "", 497, 994 ]
[ "7100002", "ATL", "BOS", "FN", "", "", 348, 696 ]
[ "7100003", "ATL", "BOS", "Y", "", "", 331, 662 ]
diff --git a/sql/benchmarks/ATIS/Tests/select_group.stable.out
b/sql/benchmarks/ATIS/Tests/select_group.stable.out
--- a/sql/benchmarks/ATIS/Tests/select_group.stable.out
+++ b/sql/benchmarks/ATIS/Tests/select_group.stable.out
@@ -75,12 +75,12 @@ Over..
% sys. # table_name
% L6 # name
% double # type
-% 22 # length
+% 24 # length
[ 2.059259259 ]
% sys. # table_name
% L11 # name
% double # type
-% 22 # length
+% 24 # length
[ 2.376068376 ]
% sys.aircraft, sys.aircraft, sys.aircraft # table_name
% L14, L15, L16 # name
@@ -115,12 +115,12 @@ Over..
% sys.flight, sys.flight, sys. # table_name
% from_airport, to_airport, L26 # name
% char, char, double # type
-% 3, 3, 22 # length
+% 3, 3, 24 # length
[ "ATL", "BOS", 154.3684211 ]
% sys.ground_service, sys. # table_name
% city_code, L31 # name
% char, double # type
-% 4, 22 # length
+% 4, 24 # length
[ "MATL", 9 ]
[ "BBOS", 5 ]
[ "DDFW", 6 ]
@@ -762,7 +762,7 @@ Over..
% sys.fare, sys.fare, sys.fare, sys.compound_class,
sys.fare, sys.fare, sys.compound_class # table_name
% from_airport, to_airport, fare_class, night, one_way_cost,
rnd_trip_cost, class_days # name
% char, char, char, char, real, real, char # type
-% 3, 3, 3, 3, 13, 13, 7 # length
+% 3, 3, 3, 3, 15, 15, 7 # length
[ "SFO", "DFW", "B", "NO", 328, 0, "1234567" ]
[ "SFO", "DFW", "Y", "NO", 328, 0, "1234567" ]
[ "SFO", "DFW", "YN", "YES", 381, 762, "1234567" ]
diff --git a/sql/benchmarks/arno_flt/Tests/init.stable.out
b/sql/benchmarks/arno_flt/Tests/init.stable.out
--- a/sql/benchmarks/arno_flt/Tests/init.stable.out
+++ b/sql/benchmarks/arno_flt/Tests/init.stable.out
@@ -49,11 +49,13 @@ Over..
% sys.model, sys.model, sys.model, sys.model # table_name
% model_id, is_mutagen, lumo, logp # name
% int, char, double, double # type
-% 1, 3, 22, 22 # length
+% 1, 3, 24, 24 # length
+#select * from atom;
% sys.atom, sys.atom, sys.atom, sys.atom, sys.atom #
table_name
% atom_id, model_id, element, type, charge # name
% varchar, int, char, char, double # type
-% 0, 1, 2, 3, 22 # length
+% 0, 1, 2, 3, 24 # length
+#select * from bond;
% sys.bond, sys.bond, sys.bond, sys.bond, sys.bond #
table_name
% bond_id, model_id, atom1, atom2, type # name
% int, int, varchar, varchar, char # type
@@ -10405,7 +10407,7 @@ Over..
% sys.model, sys.model, sys.model, sys.model # table_name
% model_id, is_mutagen, lumo, logp # name
% int, char, double, double # type
-% 3, 3, 22, 22 # length
+% 3, 3, 24, 24 # length
[ 1, "T", -1.246, 4.23 ]
[ 2, "F", -1.429, 1.44 ]
[ 3, "F", -1.456, 1.86 ]
@@ -10597,7 +10599,7 @@ Over..
% sys.atom, sys.atom, sys.atom, sys.atom, sys.atom #
table_name
% atom_id, model_id, element, type, charge # name
% varchar, int, char, char, double # type
-% 7, 3, 2, 3, 22 # length
+% 7, 3, 2, 3, 24 # length
[ "d1_1", 1, "c", "22", 2.534771726e-09 ]
[ "d1_2", 1, "c", "22", 2.534771726e-09 ]
[ "d1_3", 1, "c", "22", 2.534771726e-09 ]
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
+++ b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
@@ -32,7 +32,7 @@ Over..
% sys.lineitem, sys.lineitem, sys.lineitem, sys.lineitem, sys.,
sys., sys., sys., sys., sys.lineitem # table_name
% l_returnflag, l_linestatus, sum_qty, sum_base_price,
sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc,
count_order # name
% varchar, varchar, bigint, decimal, decimal,
decimal, double, double, double, wrd # type
-% 1, 1, 6, 17, 21, 21, 22, 22, 22, 5 #
length
+% 1, 1, 6, 17, 21, 21, 24, 24, 24, 5 #
length
[ "A", "F", 380456, 532348211.65, 505822441.4861, 526165934.000839,
25.57515461, 35785.70931, 0.05008133907, 14876 ]
[ "N", "F", 8971, 12384801.37, 11798257.2080, 12282485.056933,
25.77873563, 35588.50968, 0.04775862069, 348 ]
[ "N", "O", 742802, 1041502841.45, 989737518.6346, 1029418531.523350,
25.45498783, 35691.12921, 0.04993111956, 29181 ]
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01.stable.out
b/sql/benchmarks/tpch/LOCKED/Tests/01.stable.out
--- a/sql/benchmarks/tpch/LOCKED/Tests/01.stable.out
+++ b/sql/benchmarks/tpch/LOCKED/Tests/01.stable.out
@@ -27,7 +27,7 @@ Over..
% sys.lineitem, sys.lineitem, sys.lineitem, sys.lineitem, sys.,
sys., sys., sys., sys., sys.lineitem # table_name
% l_returnflag, l_linestatus, sum_qty, sum_base_price,
sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc,
count_order # name
% varchar, varchar, bigint, decimal, decimal,
decimal, double, double, double, wrd # type
-% 1, 1, 6, 17, 21, 21, 22, 22, 22, 5 #
length
+% 1, 1, 6, 17, 21, 21, 24, 24, 24, 5 #
length
[ "A", "F", 380456, 532348211.65, 505822441.4861, 526165934.000839,
25.57515461, 35785.70931, 0.05008133907, 14876 ]
[ "N", "F", 8971, 12384801.37, 11798257.2080, 12282485.056933,
25.77873563, 35588.50968, 0.04775862069, 348 ]
[ "N", "O", 742802, 1041502841.45, 989737518.6346, 1029418531.523350,
25.45498783, 35691.12921, 0.04993111956, 29181 ]
diff --git a/sql/benchmarks/tpch/Tests/01-22.stable.out
b/sql/benchmarks/tpch/Tests/01-22.stable.out
--- a/sql/benchmarks/tpch/Tests/01-22.stable.out
+++ b/sql/benchmarks/tpch/Tests/01-22.stable.out
@@ -32,7 +32,7 @@ Over..
% sys.lineitem, sys.lineitem, sys.lineitem, sys.lineitem, sys.,
sys., sys., sys., sys., sys.lineitem # table_name
% l_returnflag, l_linestatus, sum_qty, sum_base_price,
sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc,
count_order # name
% varchar, varchar, bigint, decimal, decimal,
decimal, double, double, double, wrd # type
-% 1, 1, 6, 17, 21, 21, 22, 22, 22, 5 #
length
+% 1, 1, 6, 17, 21, 21, 24, 24, 24, 5 #
length
[ "A", "F", 380456, 532348211.65, 505822441.4861, 526165934.000839,
25.57515461, 35785.70931, 0.05008133907, 14876 ]
[ "N", "F", 8971, 12384801.37, 11798257.2080, 12282485.056933,
25.77873563, 35588.50968, 0.04775862069, 348 ]
[ "N", "O", 742802, 1041502841.45, 989737518.6346, 1029418531.523350,
25.45498783, 35691.12921, 0.04993111956, 29181 ]
diff --git a/sql/benchmarks/tpch/Tests/01.stable.out
b/sql/benchmarks/tpch/Tests/01.stable.out
--- a/sql/benchmarks/tpch/Tests/01.stable.out
+++ b/sql/benchmarks/tpch/Tests/01.stable.out
@@ -27,7 +27,7 @@ Over..
% sys.lineitem, sys.lineitem, sys.lineitem, sys.lineitem, sys.,
sys., sys., sys., sys., sys.lineitem # table_name
% l_returnflag, l_linestatus, sum_qty, sum_base_price,
sum_disc_price, sum_charge, avg_qty, avg_price, avg_disc,
count_order # name
% varchar, varchar, bigint, decimal, decimal,
decimal, double, double, double, wrd # type
-% 1, 1, 6, 17, 21, 21, 22, 22, 22, 5 #
length
+% 1, 1, 6, 17, 21, 21, 24, 24, 24, 5 #
length
[ "A", "F", 380456, 532348211.65, 505822441.4861, 526165934.000839,
25.57515461, 35785.70931, 0.05008133907, 14876 ]
[ "N", "F", 8971, 12384801.37, 11798257.2080, 12282485.056933,
25.77873563, 35588.50968, 0.04775862069, 348 ]
[ "N", "O", 742802, 1041502841.45, 989737518.6346, 1029418531.523350,
25.45498783, 35691.12921, 0.04993111956, 29181 ]
diff --git a/sql/benchmarks/viam/Tests/viam.stable.out
b/sql/benchmarks/viam/Tests/viam.stable.out
--- a/sql/benchmarks/viam/Tests/viam.stable.out
+++ b/sql/benchmarks/viam/Tests/viam.stable.out
@@ -28,7 +28,7 @@ Over..
% sys.s1, sys. # table_name
% framenumber, L1 # name
% int, double # type
-% 2, 22 # length
+% 2, 24 # length
[ 0, 0.3069530136 ]
[ 10, 0.3421598259 ]
[ 1, 0.3113380553 ]
diff --git a/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
b/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
--- a/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
@@ -48,7 +48,7 @@ 1. mTests_jdbc_tests
writable false
2. mTests_jdbc_tests
classname java.lang.Double
- displaysize 22
+ displaysize 24
label mydouble
name mydouble
type 8
diff --git a/sql/test/ADT2006/Tests/woud.stable.out
b/sql/test/ADT2006/Tests/woud.stable.out
--- a/sql/test/ADT2006/Tests/woud.stable.out
+++ b/sql/test/ADT2006/Tests/woud.stable.out
@@ -68,7 +68,7 @@ Over..
% . # table_name
% L5 # name
% double # type
-% 22 # length
+% 24 # length
[ NULL ]
% sys.victim, sys.victim # table_name
% name, features # name
diff --git
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/parsing_doubles.SF-922332.stable.out
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/parsing_doubles.SF-922332.stable.out
---
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/parsing_doubles.SF-922332.stable.out
+++
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/parsing_doubles.SF-922332.stable.out
@@ -23,7 +23,7 @@ Over..
% sys.test_dbl # table_name
% val # name
% double # type
-% 22 # length
+% 24 # length
[ 1e+308 ]
# 12:38:01 >
diff --git
a/sql/test/BugDay_2005-11-09_2.9.3/Tests/empty_avg.SF-1207887.stable.out
b/sql/test/BugDay_2005-11-09_2.9.3/Tests/empty_avg.SF-1207887.stable.out
--- a/sql/test/BugDay_2005-11-09_2.9.3/Tests/empty_avg.SF-1207887.stable.out
+++ b/sql/test/BugDay_2005-11-09_2.9.3/Tests/empty_avg.SF-1207887.stable.out
@@ -29,7 +29,7 @@ Over..
% sys. # table_name
% L1 # name
% double # type
-% 22 # length
+% 24 # length
[ NULL ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
