Changeset: 3b401ba9113c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3b401ba9113c Modified Files: sql/benchmarks/viam/Tests/viam.sql sql/benchmarks/viam/Tests/viam.stable.out Branch: Oct2012 Log Message:
merging diffs (104 lines): diff --git a/sql/benchmarks/viam/Tests/viam.sql b/sql/benchmarks/viam/Tests/viam.sql --- a/sql/benchmarks/viam/Tests/viam.sql +++ b/sql/benchmarks/viam/Tests/viam.sql @@ -5,4 +5,5 @@ select s1.framenumber, avg(c.zanger_c) and s2.video_id = v.video_id and v.media_uri = '20050407_mocky.mpg' and s2.framenumber between s1.framenumber and (s1.framenumber + 124) - group by s1.framenumber; + group by s1.framenumber + order by s1.framenumber; 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 @@ -29,6 +29,15 @@ Ready. % int, double # type % 2, 24 # length [ 0, 0.3069530136 ] +[ 1, 0.3113380553 ] +[ 2, 0.3158491548 ] +[ 3, 0.3202903953 ] +[ 4, 0.3248978475 ] +[ 5, 0.3292224557 ] +[ 6, 0.3330400058 ] +[ 7, 0.3366659278 ] +[ 8, 0.3393862282 ] +[ 9, 0.3415804093 ] [ 10, 0.3421598259 ] [ 11, 0.3414150065 ] [ 12, 0.3382639558 ] @@ -39,21 +48,21 @@ Ready. [ 17, 0.3240110451 ] [ 18, 0.3202647068 ] [ 19, 0.3168082588 ] -[ 1, 0.3113380553 ] [ 20, 0.3158073029 ] [ 21, 0.3154659088 ] [ 22, 0.3139201927 ] [ 23, 0.3134433635 ] [ 24, 0.3130393499 ] -[ 2, 0.3158491548 ] -[ 3, 0.3202903953 ] -[ 4, 0.3248978475 ] -[ 5, 0.3292224557 ] -[ 6, 0.3330400058 ] -[ 7, 0.3366659278 ] -[ 8, 0.3393862282 ] -[ 9, 0.3415804093 ] [ 25, 0.3135247271 ] +[ 26, 0.3128866098 ] +[ 27, 0.3136826694 ] +[ 28, 0.3143216616 ] +[ 29, 0.3153907247 ] +[ 30, 0.3141233276 ] +[ 31, 0.3113860356 ] +[ 32, 0.3090121901 ] +[ 33, 0.3060122738 ] +[ 34, 0.3028020651 ] [ 35, 0.3000286778 ] [ 36, 0.296002269 ] [ 37, 0.290913483 ] @@ -64,21 +73,17 @@ Ready. [ 42, 0.2679928431 ] [ 43, 0.2675193019 ] [ 44, 0.2673059053 ] -[ 26, 0.3128866098 ] [ 45, 0.2655931324 ] [ 46, 0.2607816973 ] [ 47, 0.2583583932 ] [ 48, 0.2567394975 ] [ 49, 0.2519025657 ] -[ 27, 0.3136826694 ] -[ 28, 0.3143216616 ] -[ 29, 0.3153907247 ] -[ 30, 0.3141233276 ] -[ 31, 0.3113860356 ] -[ 32, 0.3090121901 ] -[ 33, 0.3060122738 ] -[ 34, 0.3028020651 ] [ 50, 0.2493345457 ] +[ 51, 0.2496920232 ] +[ 52, 0.2486809716 ] +[ 53, 0.2519123037 ] +[ 54, 0.2604823805 ] +[ 55, 0.271042367 ] [ 60, 0.2834349046 ] [ 61, 0.2985857118 ] [ 62, 0.3154686896 ] @@ -89,16 +94,11 @@ Ready. [ 67, 0.2983151227 ] [ 68, 0.3048942813 ] [ 69, 0.315040494 ] -[ 51, 0.2496920232 ] [ 70, 0.3288443923 ] [ 71, 0.3404737413 ] [ 72, 0.3572909931 ] [ 73, 0.3603464961 ] [ 74, 0.3620469868 ] -[ 52, 0.2486809716 ] -[ 53, 0.2519123037 ] -[ 54, 0.2604823805 ] -[ 55, 0.271042367 ] # 19:17:39 > # 19:17:39 > Done. _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
