You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/05/15 05:06:46 UTC

[34/50] [abbrv] incubator-kylin git commit: KYLIN-702 Move hive related properties to kylin_hive_conf.xml

KYLIN-702 Move hive related properties to kylin_hive_conf.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/33f8fee6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/33f8fee6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/33f8fee6

Branch: refs/heads/streaming-localdict
Commit: 33f8fee6e081f25b010eb47bf74f968696c66581
Parents: d1e4b9b
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Tue May 12 14:10:18 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Tue May 12 14:10:35 2015 +0800

----------------------------------------------------------------------
 .../test_case_data/sandbox/kylin_hive_conf.xml  | 36 ++++++++++++++++++++
 .../test_case_data/sandbox/kylin_job_conf.xml   | 18 ----------
 2 files changed, 36 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/33f8fee6/examples/test_case_data/sandbox/kylin_hive_conf.xml
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/kylin_hive_conf.xml b/examples/test_case_data/sandbox/kylin_hive_conf.xml
index 053525e..d990175 100644
--- a/examples/test_case_data/sandbox/kylin_hive_conf.xml
+++ b/examples/test_case_data/sandbox/kylin_hive_conf.xml
@@ -1,6 +1,42 @@
 <?xml version="1.0"?>
 <configuration>
     <property>
+        <name>dfs.replication</name>
+        <value>2</value>
+        <description>Block replication</description>
+    </property>
+
+    <property>
+        <name>hive.exec.compress.output</name>
+        <value>true</value>
+        <description>enable compress</description>
+    </property>
+
+    <property>
+        <name>hive.auto.convert.join.noconditionaltask</name>
+        <value>true</value>
+        <description>enable map-side join</description>
+    </property>
+
+    <property>
+        <name>hive.auto.convert.join.noconditionaltask.size</name>
+        <value>300000000</value>
+        <description>enable map-side join</description>
+    </property>
+
+    <!--
+    <property>
+        <name>mapreduce.map.output.compress.codec</name>
+        <value>com.hadoop.compression.lzo.LzoCodec</value>
+        <description></description>
+    </property>
+    <property>
+        <name>mapreduce.output.fileoutputformat.compress.codec</name>
+        <value>com.hadoop.compression.lzo.LzoCodec</value>
+        <description></description>
+    </property>
+    -->
+    <property>
         <name>hive.merge.mapfiles</name>
         <value>true</value>
         <description>Enable hive file merge on mapper only job</description>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/33f8fee6/examples/test_case_data/sandbox/kylin_job_conf.xml
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/kylin_job_conf.xml b/examples/test_case_data/sandbox/kylin_job_conf.xml
index 92cf745..f811ed4 100644
--- a/examples/test_case_data/sandbox/kylin_job_conf.xml
+++ b/examples/test_case_data/sandbox/kylin_job_conf.xml
@@ -58,22 +58,4 @@
         <description>Block replication</description>
     </property>
 
-
-	<property>
-		<name>hive.merge.mapfiles</name>
-		<value>true</value>
-		<description>Enable hive file merge on mapper only job</description>
-	</property>
-
-	<property>
-		<name>hive.merge.mapredfiles</name>
-		<value>true</value>
-		<description>Enable hive file merge on map-reduce job</description>
-	</property>
-
-	<property>
-		<name>hive.merge.size.per.task</name>
-		<value>16000000</value>
-		<description>Size for the merged file: 16M</description>
-	</property>
 </configuration>
\ No newline at end of file