Merge branch 'zhaojianwei' into 'master'

update spark to hive

See merge request zhaojianwei/bi-report!8

jobs/daily_recommend_strategy/step1_10.job

-#step1_10.job
-type=command
-command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online ml_device_history_detail
\ No newline at end of file

shells/daily_recommend_strategy/daily_recommend_strategy.sh

 #!/bin/bash
 
 # 定义变量方便修改
-hive="/opt/spark/spark-2.4.5-bin-hadoop2.7/bin/beeline -u jdbc:hive2://bj-gm-prod-cos-datacenter003:10010/online -n data"
+#hive="/opt/spark/spark-2.4.5-bin-hadoop2.7/bin/beeline -u jdbc:hive2://bj-gm-prod-cos-datacenter003:10010 -n data"
+hive="/opt/hive/hive-1.1.0-cdh5.16.1/bin/beeline -u jdbc:hive2://bj-gm-prod-cos-datacenter005:10000 -n data"
 
 # 如果是输入的日期按照取输入日期；如果没输入日期取当前时间的前一天
 if [ -n "$1" ] ;then
@@ -12,11 +13,19 @@ fi
 
 sql="
 
+SET mapreduce.job.queuename=data;
+SET mapreduce.map.memory.mb=8192;
+SET mapreduce.map.java.opts=-Xmx8000m;
+SET mapreduce.reduce.memory.mb=8192;
+SET mapreduce.reduce.java.opts=-Xmx8000m;
+set hive.auto.convert.join=true;
+SET mapred.reduce.tasks=20;
+SET role admin;
+
 ADD JAR hdfs:///user/hive/share/lib/udf/hive-udf-1.0-SNAPSHOT.jar;
 CREATE TEMPORARY FUNCTION convup AS 'com.gmei.hive.common.udf.UDFConvUpgrade';
 
 INSERT OVERWRITE TABLE pm.tl_pm_recommend_strategy_d PARTITION (PARTITION_DAY =$partition_day)
-
 SELECT
       t1.partition_date as day_id,
       t1.device_os_type as device_os_type,
@@ -236,7 +245,7 @@ FROM
             FROM online.bl_hdfs_maidian_updates
             WHERE partition_date>=regexp_replace(DATE_SUB(current_date,1) ,'-','')
             AND partition_date<regexp_replace((current_date),'-','')
-            AND (get_json_object(params['extra_param'], '$.type')='���互栏'
+            AND (get_json_object(params['extra_param'], '$.type')='交互栏'
                    or get_json_object(params['extra_param'], '$.jump_from')='msg_link')
             AND action='on_click_card'
             and params['card_content_type']='service'