Changeset: 03096cf1185d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=03096cf1185d
Modified Files:
Branch: Jun2010
Log Message:
merge
diffs (93 lines):
diff -r cdc0a87d38b1 -r 03096cf1185d sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Tue Aug 17 14:21:31 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Tue Aug 17 14:30:11 2010 +0200
@@ -1,10 +1,6 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* Fri Aug 16 2010 Niels Nes <ni...@cwi.nl>
-- Fixed bug 2657, a regression after the fix for bug 2353. A join with a
- single value subquery resulted in an assertion failure.
-
* Fri Aug 13 2010 Niels Nes <ni...@cwi.nl>
- Fixed bug 2643 added more defensive code, when an aggregation function
doesn't exist
diff -r cdc0a87d38b1 -r 03096cf1185d
sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql
--- a/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql Tue Aug
17 14:21:31 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql Tue Aug
17 14:30:11 2010 +0200
@@ -40,7 +40,7 @@
insert into slice_test values ( 3, 5, 89439);
set trace = 'none'; -- non-documented feature to not get any trace output
-create function tracelog()
+create function GetTrace()
returns table (
event integer, -- event counter
clk varchar(20), -- wallclock, no mtime in kernel
@@ -60,19 +60,19 @@
-- When mitosis was activated (i.e., the MAL plan contains mat.*() statements,
-- then there sould also be at least one mat.slice() statement.
SELECT count(*) FROM
-( SELECT count(*) AS mat FROM tracelog() WHERE stmt LIKE '% := mat.%'
) as m,
-( SELECT count(*) AS mat_slice FROM tracelog() WHERE stmt LIKE '% :=
mat.slice(%' ) as ms
+( SELECT count(*) AS mat FROM GetTrace() WHERE stmt LIKE '% := mat.%'
) as m,
+( SELECT count(*) AS mat_slice FROM GetTrace() WHERE stmt LIKE '% :=
mat.slice(%' ) as ms
WHERE ( mat = 0 AND mat_slice = 0 ) OR ( mat > 0 AND mat_slice > 0 );
TRACE select cast(x as string)||'-bla-'||cast(y as string) from slice_test
limit 1;
-- When mitosis was activated (i.e., the MAL plan contains mat.*() statements,
-- then there sould also be at least one mat.slice() statement.
SELECT count(*) FROM
-( SELECT count(*) AS mat FROM tracelog() WHERE stmt LIKE '% := mat.%'
) as m,
-( SELECT count(*) AS mat_slice FROM tracelog() WHERE stmt LIKE '% :=
mat.slice(%' ) as ms
+( SELECT count(*) AS mat FROM GetTrace() WHERE stmt LIKE '% := mat.%'
) as m,
+( SELECT count(*) AS mat_slice FROM GetTrace() WHERE stmt LIKE '% :=
mat.slice(%' ) as ms
WHERE ( mat = 0 AND mat_slice = 0 ) OR ( mat > 0 AND mat_slice > 0 );
-drop function tracelog;
+drop function GetTrace;
drop table slice_test;
diff -r cdc0a87d38b1 -r 03096cf1185d
sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out
--- a/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out
Tue Aug 17 14:21:31 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out
Tue Aug 17 14:30:11 2010 +0200
@@ -86,7 +86,7 @@
[ 1 ]
#insert into slice_test values ( 3, 5, 89439);
[ 1 ]
-#create function tracelog()
+#create function GetTrace()
# returns table (
# event integer, -- event counter
# clk varchar(20), -- wallclock, no mtime in kernel
@@ -105,8 +105,8 @@
% 1, 1 # length
[ 0, 1 ]
#SELECT count(*) FROM
-#( SELECT count(*) AS mat FROM tracelog() WHERE stmt LIKE '% := mat.%'
) as m,
-#( SELECT count(*) AS mat_slice FROM tracelog() WHERE stmt LIKE '% :=
mat.slice(%' ) as ms
+#( SELECT count(*) AS mat FROM GetTrace() WHERE stmt LIKE '% := mat.%'
) as m,
+#( SELECT count(*) AS mat_slice FROM GetTrace() WHERE stmt LIKE '% :=
mat.slice(%' ) as ms
#WHERE ( mat = 0 AND mat_slice = 0 ) OR ( mat > 0 AND mat_slice > 0 );
% .m # table_name
% L6 # name
@@ -120,15 +120,15 @@
% 7 # length
[ "0-bla-1" ]
#SELECT count(*) FROM
-#( SELECT count(*) AS mat FROM tracelog() WHERE stmt LIKE '% := mat.%'
) as m,
-#( SELECT count(*) AS mat_slice FROM tracelog() WHERE stmt LIKE '% :=
mat.slice(%' ) as ms
+#( SELECT count(*) AS mat FROM GetTrace() WHERE stmt LIKE '% := mat.%'
) as m,
+#( SELECT count(*) AS mat_slice FROM GetTrace() WHERE stmt LIKE '% :=
mat.slice(%' ) as ms
#WHERE ( mat = 0 AND mat_slice = 0 ) OR ( mat > 0 AND mat_slice > 0 );
% .m # table_name
% L6 # name
% wrd # type
% 1 # length
[ 1 ]
-#drop function tracelog;
+#drop function GetTrace;
#drop table slice_test;
# 10:54:05 >
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
