Changeset: 9397301e7391 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9397301e7391 Modified Files: sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out Branch: Feb2013 Log Message:
updated test to yield same output in single- & multi-threaded case: we now also count mat.packIncremental() in addition to mat.pack() diffs (48 lines): diff --git a/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql b/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql --- a/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql +++ b/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql @@ -59,12 +59,12 @@ create function GetTrace() TRACE select x,y 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() (or mat.pack()) statement. +-- then there sould also be at least one mat.slice() (or mat.pack*()) statement. WITH TheTrace AS ( SELECT * FROM GetTrace() ) SELECT count(*) FROM ( SELECT count(*) AS mat FROM TheTrace WHERE stmt LIKE '% := mat.%' ) as m, ( SELECT count(*) AS mat_slice FROM TheTrace WHERE stmt LIKE '% := mat.slice(%' ) as ms, -( SELECT count(*) AS mat_pack FROM TheTrace WHERE stmt LIKE '% := mat.pack(%' ) as mp +( SELECT count(*) AS mat_pack FROM TheTrace WHERE stmt LIKE '% := mat.pack%(%' ) as mp WHERE ( mat = 0 AND mat_slice+mat_pack = 0 ) OR ( mat > 0 AND mat_slice+mat_pack > 0 ); TRACE select cast(x as string)||'-bla-'||cast(y as string) from slice_test limit 1; @@ -74,7 +74,7 @@ WITH TheTrace AS ( SELECT * FROM GetTrac SELECT count(*) FROM ( SELECT count(*) AS mat FROM TheTrace WHERE stmt LIKE '% := mat.%' ) as m, ( SELECT count(*) AS mat_slice FROM TheTrace WHERE stmt LIKE '% := mat.slice(%' ) as ms, -( SELECT count(*) AS mat_pack FROM TheTrace WHERE stmt LIKE '% := mat.pack(%' ) as mp +( SELECT count(*) AS mat_pack FROM TheTrace WHERE stmt LIKE '% := mat.pack%(%' ) as mp WHERE ( mat = 0 AND mat_slice+mat_pack = 0 ) OR ( mat > 0 AND mat_slice+mat_pack > 0 ); drop function GetTrace; diff --git a/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out b/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out --- a/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out +++ b/sql/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out @@ -111,7 +111,7 @@ Ready. % L4 # name % wrd # type % 1 # length -[ 0 ] +[ 1 ] #TRACE select cast(x as string)||'-bla-'||cast(y as string) from slice_test limit 1; % sys. # table_name % concat_concat_x # name @@ -126,7 +126,7 @@ Ready. % L4 # name % wrd # type % 1 # length -[ 0 ] +[ 1 ] #drop function GetTrace; #drop table slice_test; _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
