Merge branch 'master' of git.wanmeizhensuo.com:ML/ffm-baseline

change date

eda/recommended_indexs/getClickZeroUidRateDetail.py

@@ -41,7 +41,7 @@ def get_rate_detail(platform):
 	where device_id not in \
 	(select distinct(device_id) from data_feed_exposure \
 		where time < {2})) \
-	union \
+	union all \
 	select count(distinct(device_id)) from data_feed_exposure \
 	where device_type{0} \
 	and from_unixtime(time,'%Y-%m-%d')=date_add(curdate(), interval -1 day) \
@@ -58,7 +58,7 @@ def get_rate_detail(platform):
 	and device_id in \
 	(select distinct(device_id) from data_feed_exposure \
 		where time < {2})) \
-	union \
+	union all \
 	select count(distinct(device_id)) from data_feed_exposure \
 	where device_type{0} \
 	and from_unixtime(time,'%Y-%m-%d')=date_add(curdate(), interval -1 day) \
@@ -75,7 +75,7 @@ def get_rate_detail(platform):
 	and device_id in \
 	(select distinct(device_id) from data_feed_exposure \
 		where time < {3})) \
-	union \
+	union all \
 	select count(distinct(device_id)) from data_feed_exposure \
 	where device_type{0} \
 	and from_unixtime(time,'%Y-%m-%d')=date_add(curdate(), interval -1 day) \
@@ -92,7 +92,7 @@ def get_rate_detail(platform):
 	and device_id in \
 	(select distinct(device_id) from data_feed_exposure \
 		where time < {4})) \
-	union \
+	union all \
 	select count(distinct(device_id)) from data_feed_exposure \
 	where device_type{0} \
 	and from_unixtime(time,'%Y-%m-%d')=date_add(curdate(), interval -1 day) \
@@ -109,7 +109,7 @@ def get_rate_detail(platform):
 	and device_id in \
 	(select distinct(device_id) from data_feed_exposure \
 		where time < {5})) \
-	union \
+	union all \
 	select count(distinct(device_id)) from data_feed_exposure \
 	where device_type{0} \
 	and from_unixtime(time,'%Y-%m-%d')=date_add(curdate(), interval -1 day) \