From 1a524c463d6beb4ecaa7b5687911942e47b27b0c Mon Sep 17 00:00:00 2001
From: Yiming Liu <liuyiming.vip@gmail.com>
Date: Sun, 4 Sep 2016 17:31:45 +0800
Subject: [PATCH 1/2] KYLIN-1995: Upgrade deprecated properties for Hadoop 2.6

---
 build/conf/kylin_hive_conf.xml      |  2 +-
 build/conf/kylin_job_conf.xml       | 12 ++++++------
 build/conf/kylin_job_conf_inmem.xml | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build/conf/kylin_hive_conf.xml b/build/conf/kylin_hive_conf.xml
index 30c4feb..4a1b3b6 100644
--- a/build/conf/kylin_hive_conf.xml
+++ b/build/conf/kylin_hive_conf.xml
@@ -62,7 +62,7 @@
     </property>
     -->
     <property>
-        <name>mapred.output.compression.type</name>
+        <name>mapreduce.output.fileoutputformat.compress.type</name>
         <value>BLOCK</value>
         <description>The compression type to use for job outputs</description>
     </property>
diff --git a/build/conf/kylin_job_conf.xml b/build/conf/kylin_job_conf.xml
index 96b806c..17a9145 100644
--- a/build/conf/kylin_job_conf.xml
+++ b/build/conf/kylin_job_conf.xml
@@ -26,7 +26,7 @@
     </property>
 
     <property>
-        <name>mapred.compress.map.output</name>
+        <name>mapreduce.map.output.compress</name>
         <value>true</value>
         <description>Compress map outputs</description>
     </property>
@@ -37,14 +37,14 @@
     -->
     <!--
     <property>
-        <name>mapred.map.output.compression.codec</name>
+        <name>mapreduce.map.output.compress.codec</name>
         <value>org.apache.hadoop.io.compress.SnappyCodec</value>
         <description>The compression codec to use for map outputs
         </description>
     </property>
     -->
     <property>
-        <name>mapred.output.compress</name>
+        <name>mapreduce.output.fileoutputformat.compress</name>
         <value>true</value>
         <description>Compress the output of a MapReduce job</description>
     </property>
@@ -54,14 +54,14 @@
     -->
     <!--
     <property>
-        <name>mapred.output.compression.codec</name>
+        <name>mapreduce.output.fileoutputformat.compress.codec</name>
         <value>org.apache.hadoop.io.compress.SnappyCodec</value>
         <description>The compression codec to use for job outputs
         </description>
     </property>
     -->
     <property>
-        <name>mapred.output.compression.type</name>
+        <name>mapreduce.output.fileoutputformat.compress.type</name>
         <value>BLOCK</value>
         <description>The compression type to use for job outputs</description>
     </property>
@@ -80,7 +80,7 @@
     </property>
 
     <property>
-        <name>mapred.task.timeout</name>
+        <name>mapreduce.task.timeout</name>
         <value>3600000</value>
         <description>Set task timeout to 1 hour</description>
     </property>
diff --git a/build/conf/kylin_job_conf_inmem.xml b/build/conf/kylin_job_conf_inmem.xml
index fea2f68..1d349f6 100644
--- a/build/conf/kylin_job_conf_inmem.xml
+++ b/build/conf/kylin_job_conf_inmem.xml
@@ -26,7 +26,7 @@
     </property>
 
     <property>
-        <name>mapred.compress.map.output</name>
+        <name>mapreduce.map.output.compress</name>
         <value>true</value>
         <description>Compress map outputs</description>
     </property>
@@ -37,14 +37,14 @@
     -->
     <!--
     <property>
-        <name>mapred.map.output.compression.codec</name>
+        <name>mapreduce.map.output.compress.codec</name>
         <value>org.apache.hadoop.io.compress.SnappyCodec</value>
         <description>The compression codec to use for map outputs
         </description>
     </property>
     -->
     <property>
-        <name>mapred.output.compress</name>
+        <name>mapreduce.output.fileoutputformat.compress</name>
         <value>true</value>
         <description>Compress the output of a MapReduce job</description>
     </property>
@@ -54,14 +54,14 @@
     -->
     <!--
     <property>
-        <name>mapred.output.compression.codec</name>
+        <name>mapreduce.output.fileoutputformat.compress.codec</name>
         <value>org.apache.hadoop.io.compress.SnappyCodec</value>
         <description>The compression codec to use for job outputs
         </description>
     </property>
     -->
     <property>
-        <name>mapred.output.compression.type</name>
+        <name>mapreduce.output.fileoutputformat.compress.type</name>
         <value>BLOCK</value>
         <description>The compression type to use for job outputs</description>
     </property>
@@ -80,7 +80,7 @@
     </property>
 
     <property>
-        <name>mapred.task.timeout</name>
+        <name>mapreduce.task.timeout</name>
         <value>3600000</value>
         <description>Set task timeout to 1 hour</description>
     </property>
-- 
2.7.4 (Apple Git-66)