Various performance improvements and bugfixes.

Imporves performance for Archiving and Range dates. Makes all kind of
reports faster as well. Fixed bugs in labelFilter, reports total calculation
and more.

1 files changed, 43 insertions, 43 deletions

diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml
index e3745e71ba..20d04cc26b 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml
@@ -43,8 +43,8 @@
 	<reportData>
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
-				<label>Spirited Away (千と千尋の神隠し) - clickBuyNow</label>
-				<nb_events>2</nb_events>
+				<label>Event Name not defined - Search</label>
+				<nb_events>4</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
@@ -52,7 +52,16 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>Spirited Away (千と千尋の神隠し) - play25%</label>
+				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;--- - event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>2</nb_events_with_value>
+				<sum_event_value>19.32</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>Event Name not defined - Purchase</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -61,7 +70,7 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>Spirited Away (千と千尋の神隠し) - play50%</label>
+				<label>La fiancée de l&amp;#039;eau - play</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -70,7 +79,7 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>Spirited Away (千と千尋の神隠し) - play75%</label>
+				<label>La fiancée de l&amp;#039;eau - play25%</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -79,7 +88,7 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>Spirited Away (千と千尋の神隠し) - playEnd</label>
+				<label>La fiancée de l&amp;#039;eau - play50%</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -88,7 +97,7 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>Spirited Away (千と千尋の神隠し) - playStart</label>
+				<label>La fiancée de l&amp;#039;eau - play75%</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -97,7 +106,7 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>Spirited Away (千と千尋の神隠し) - playTrailer</label>
+				<label>La fiancée de l&amp;#039;eau - playEnd</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -106,16 +115,16 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>Spirited Away (千と千尋の神隠し) - rating</label>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<label>La fiancée de l&amp;#039;eau - rating</label>
+				<nb_events>4</nb_events>
+				<nb_events_with_value>4</nb_events_with_value>
+				<sum_event_value>38</sum_event_value>
 				<min_event_value>0</min_event_value>
-				<max_event_value>9.66</max_event_value>
-				<avg_event_value>9.66</avg_event_value>
+				<max_event_value>10</max_event_value>
+				<avg_event_value>9.5</avg_event_value>
 			</row>
 			<row>
-				<label>La fiancée de l&amp;#039;eau - play</label>
+				<label>Ponyo (崖の上のポニョ) - playTrailer</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -124,7 +133,7 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>La fiancée de l&amp;#039;eau - play25%</label>
+				<label>Princess Mononoke (もののけ姫) - playTrailer</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -133,7 +142,7 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>La fiancée de l&amp;#039;eau - play50%</label>
+				<label>Search query here - Search</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -142,7 +151,7 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>La fiancée de l&amp;#039;eau - play75%</label>
+				<label>Spirited Away (千と千尋の神隠し) - clickBuyNow</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -151,7 +160,7 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>La fiancée de l&amp;#039;eau - playEnd</label>
+				<label>Spirited Away (千と千尋の神隠し) - play25%</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -160,17 +169,8 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>La fiancée de l&amp;#039;eau - rating</label>
-				<nb_events>4</nb_events>
-				<nb_events_with_value>4</nb_events_with_value>
-				<sum_event_value>38</sum_event_value>
-				<min_event_value>0</min_event_value>
-				<max_event_value>10</max_event_value>
-				<avg_event_value>9.5</avg_event_value>
-			</row>
-			<row>
-				<label>Event Name not defined - Search</label>
-				<nb_events>4</nb_events>
+				<label>Spirited Away (千と千尋の神隠し) - play50%</label>
+				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
@@ -178,7 +178,7 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>Event Name not defined - Purchase</label>
+				<label>Spirited Away (千と千尋の神隠し) - play75%</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -187,16 +187,7 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;--- - event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
-				<min_event_value>0</min_event_value>
-				<max_event_value>9.66</max_event_value>
-				<avg_event_value>9.66</avg_event_value>
-			</row>
-			<row>
-				<label>Ponyo (崖の上のポニョ) - playTrailer</label>
+				<label>Spirited Away (千と千尋の神隠し) - playEnd</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -205,7 +196,7 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>Princess Mononoke (もののけ姫) - playTrailer</label>
+				<label>Spirited Away (千と千尋の神隠し) - playStart</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -214,7 +205,7 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
-				<label>Search query here - Search</label>
+				<label>Spirited Away (千と千尋の神隠し) - playTrailer</label>
 				<nb_events>2</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
@@ -222,6 +213,15 @@
 				<max_event_value>0</max_event_value>
 				<avg_event_value>0</avg_event_value>
 			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - rating</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>2</nb_events_with_value>
+				<sum_event_value>19.32</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
 		</result>
 		<result prettyDate="Monday 4 January 2010" />
 		<result prettyDate="Tuesday 5 January 2010" />