修复bug

eda/feededa/src/main/scala/com/gmei/find_bug.scala

@@ -79,7 +79,7 @@ object find_bug {
       val clk_count_oldUser_Contrast = sc.sql(
         s"""
            |select '${stat_date}' as stat_date, count(cid_id) as clk_count_oldUser_Contrast
-           |from data_feed_click jd inner join device_id_old
+           |from jerry_prod.data_feed_click jd inner join device_id_old
            |on jd.device_id = device_id_old.device_id
            |where  (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
            |and jd.device_id regexp'1$$'
@@ -93,7 +93,7 @@ object find_bug {
       val imp_count_oldUser_Contrast = sc.sql(
         s"""
            |select '${stat_date}' as stat_date, count(cid_id) as imp_count_oldUser_Contrast
-           |from data_feed_exposure je inner join device_id_old
+           |from jerry_prod.data_feed_exposure je inner join device_id_old
            |on je.device_id = device_id_old.device_id
            |where je.cid_type = 'diary'
            |and je.device_id regexp'1$$'
@@ -107,7 +107,7 @@ object find_bug {
       val clk_count_oldUser_all = sc.sql(
         s"""
            |select '${stat_date}' as stat_date, count(cid_id) as clk_count_oldUser_all
-           |from data_feed_click jd inner join device_id_old
+           |from jerry_prod.data_feed_click jd inner join device_id_old
            |on jd.device_id = device_id_old.device_id
            |where  (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
            |and jd.device_id not in (select device_id from blacklist)
@@ -119,7 +119,7 @@ object find_bug {
       val imp_count_oldUser_all = sc.sql(
         s"""
            |select '${stat_date}' as stat_date, count(cid_id) as imp_count_oldUser_all
-           |from data_feed_exposure je inner join device_id_old
+           |from jerry_prod.data_feed_exposure je inner join device_id_old
            |on je.device_id = device_id_old.device_id
            |where je.cid_type = 'diary'
            |and je.device_id not in (select device_id from blacklist)
@@ -148,7 +148,7 @@ object find_bug {
       val clk_active_1 = sc.sql(
         s"""
            |select '${stat_date}' as stat_date, count(jd.cid_id) as clk_active_1
-           |from data_feed_click jd inner join device_id_old
+           |from jerry_prod.data_feed_click jd inner join device_id_old
            |on jd.device_id = device_id_old.device_id
            |where  (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
            |and jd.device_id regexp'1$$'
@@ -162,7 +162,7 @@ object find_bug {
       val imp_active_1 = sc.sql(
         s"""
            |select '${stat_date}' as stat_date, count(je.cid_id) as imp_active_1
-           |from data_feed_exposure je inner join device_id_old
+           |from jerry_prod.data_feed_exposure je inner join device_id_old
            |on je.device_id = device_id_old.device_id
            |where je.cid_type = 'diary'
            |and je.device_id in (select distinct(device_id) from data_feed_click where device_id regexp '1$$' and stat_date = '${stat_date}')
@@ -176,7 +176,7 @@ object find_bug {
       val clk_diary_device = sc.sql(
         s"""
            |select '${stat_date}' as stat_date, count(distinct(jd.device_id)) as clk_diary_device
-           |from data_feed_click jd inner join device_id_old
+           |from jerry_prod.data_feed_click jd inner join device_id_old
            |on jd.device_id = device_id_old.device_id
            |where  (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
            |and jd.device_id regexp'1$$'
@@ -190,7 +190,7 @@ object find_bug {
       val clk_active_all = sc.sql(
         s"""
            |select '${stat_date}' as stat_date, count(jd.cid_id) as clk_active_all
-           |from data_feed_click jd inner join device_id_old
+           |from jerry_prod.data_feed_click jd inner join device_id_old
            |on jd.device_id = device_id_old.device_id
            |where  (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
            |and jd.device_id not in (select device_id from blacklist)
@@ -203,7 +203,7 @@ object find_bug {
       val imp_active_all = sc.sql(
         s"""
            |select '${stat_date}' as stat_date, count(je.cid_id) as imp_active_all
-           |from data_feed_exposure je inner join device_id_old
+           |from jerry_prod.data_feed_exposure je inner join device_id_old
            |on je.device_id = device_id_old.device_id
            |where je.cid_type = 'diary'
            |and je.device_id in (select distinct(device_id) from data_feed_click where stat_date = '${stat_date}')
@@ -217,7 +217,7 @@ object find_bug {
       val clk_diary_device_cover = sc.sql(
         s"""
            |select '${stat_date}' as stat_date,count(distinct(device_id)) as clk_diary_device_cover
-           |from merge_queue_table
+           |from jerry_prod.merge_queue_table
            |where device_id in (select distinct(device_id) from data_feed_click where stat_date = '${stat_date}')
           """.stripMargin
       )
@@ -227,7 +227,7 @@ object find_bug {
       val device_all_cover = sc.sql(
         s"""
            |select '${stat_date}' as stat_date,count(distinct(device_id)) as device_all_cover
-           |from merge_queue_table
+           |from jerry_prod.merge_queue_table
           """.stripMargin
       )
       device_all_cover.show()
@@ -269,11 +269,11 @@ object find_bug {
       val clk_count_newUser_Contrast = sc.sql(
         s"""
            |select '${stat_date}' as stat_date, count(cid_id) as clk_count_newUser_Contrast
-           |from data_feed_click jd inner join device_id_new
+           |from jerry_prod.data_feed_click jd inner join device_id_new
            |on jd.device_id = device_id_new.device_id
            |where  (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
            |and jd.device_id regexp'1$$'
-           |and jd.device_id not in (select device_id from blacklist)
+           |and jd.device_id not in (select device_id from jerry_prod.blacklist)
            |and jd.stat_date ='${stat_date}'
          """.stripMargin
       )
@@ -282,7 +282,7 @@ object find_bug {
       val imp_count_newUser_Contrast = sc.sql(
         s"""
            |select '${stat_date}' as stat_date, count(cid_id) as imp_count_newUser_Contrast
-           |from data_feed_exposure je inner join device_id_new
+           |from jerry_prod.data_feed_exposure je inner join device_id_new
            |on je.device_id = device_id_new.device_id
            |where je.cid_type = 'diary'
            |and je.device_id regexp'1$$'
@@ -295,10 +295,10 @@ object find_bug {
       val clk_count_newUser_all = sc.sql(
         s"""
            |select '${stat_date}' as stat_date, count(cid_id) as clk_count_newUser_all
-           |from data_feed_click jd inner join device_id_new
+           |from jerry_prod.data_feed_click jd inner join device_id_new
            |on jd.device_id = device_id_new.device_id
            |where  (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
-           |and jd.device_id not in (select device_id from blacklist)
+           |and jd.device_id not in (select device_id from jerry_prod.blacklist)
            |and jd.stat_date ='${stat_date}'
          """.stripMargin
       )
@@ -307,10 +307,10 @@ object find_bug {
       val imp_count_newUser_all = sc.sql(
         s"""
            |select '${stat_date}' as stat_date, count(cid_id) as imp_count_newUser_all
-           |from data_feed_exposure je inner join device_id_new
+           |from jerry_prod.data_feed_exposure je inner join device_id_new
            |on je.device_id = device_id_new.device_id
            |where je.cid_type = 'diary'
-           |and je.device_id not in (select device_id from blacklist)
+           |and je.device_id not in (select device_id from jerry_prod.blacklist)
            |and je.stat_date ='${stat_date}'
          """.stripMargin
       )