Update tkdm_base_active_payment_info.sql

tkdm_base_active_payment_info.sql

@@ -7,25 +7,27 @@ set hive.merge.mapredfiles=true;
 set hive.auto.convert.sortmerge.join=true;
 
 insert overwrite table tkdm.tkdm_base_active_payment_info partition(ds='2017-02-25')
-select x.deviceid,
+select /*+mapjoin(y)*/x.deviceid,
        x.appid,
        x.cid,
-       x.ins_date,
+       x.first_ins_date,
+       x.last_ins_date,
        x.category_id,
        x.isgame,
        x.platform,
        nvl(x.first_payment_ds,y.first_payment_ds) as first_payment_ds,
-       nvl(y.last_payment_ds,x.amt_payment_last) as last_payment_ds,
+       nvl(y.last_payment_ds,x.last_amt_payment) as last_payment_ds,
        x.num_payment_cnt + y.num_payment_cnt as num_payment_cnt,
        x.num_payment_day + y.num_payment_day as num_payment_day,
        x.amt_payment +y.amt_payment as amt_payment,
-       nvl(y.amt_payment,x.amt_payment_last) as amt_payment_last
+       nvl(y.amt_payment,x.last_amt_payment) as last_amt_payment
 
 from 
 (select nvl(a.deviceid,b.deviceid) as deviceid,
         nvl(a.appid,b.appid) as appid,
         nvl(b.cid,a.cid) as cid,
-        nvl(b.ins_date,a.ins_date) as ins_date,
+        nvl(a.first_ins_date,b.ins_date) as first_ins_date,
+        nvl(b.ins_date,a.last_ins_date) as last_ins_date,
         nvl(b.category_id,a.category_id) as category_id,
         nvl(b.isgame,a.isgame) as isgame,
         nvl(b.platform,a.platform) as platform,
@@ -34,12 +36,13 @@ from
         nvl(a.num_payment_cnt,0) as num_payment_cnt,
         nvl(a.num_payment_day,0) as num_payment_day,
         nvl(a.amt_payment,0) amt_payment,
-        nvl(a.amt_payment_last,0) as amt_payment_last
+        nvl(a.last_amt_payment,0) as last_amt_payment
     from 
        (select deviceid,
                appid,
                cid,
-               ins_date,
+               first_ins_date,
+               last_ins_date,
                category_id,
                isgame,
                platform,
@@ -48,7 +51,7 @@ from
                num_payment_cnt,
                num_payment_day,
                amt_payment,
-               amt_payment_last
+               last_amt_payment
            from tkdm.tkdm_base_active_payment_info
            where ds=date_sub('2017-02-25',1)
        ) a
@@ -87,7 +90,8 @@ create EXTERNAL table tkdm_base_active_payment_info(
 appid string,
 deviceid string,
 cid int,
-ins_date string,
+first_ins_date string,
+last_ins_date string,
 category_id int,
 isgame int,
 platform string,
@@ -96,7 +100,7 @@ last_payment_ds string,
 num_payment_cnt int,
 num_payment_day int,
 amt_payment double,
-amt_payment_last double
+last_amt_payment double
 )
 PARTITIONED BY (ds string)
 clustered by (deviceid) sorted by(deviceid,appid)  into 32 buckets