Author: hashutosh
Date: Mon Nov 25 17:13:03 2013
New Revision: 1545345
URL: http://svn.apache.org/r1545345
Log:
HIVE-5793 : Update hive-default.xml.template for HIVE4002 (Navis via Ashutosh
Chauhan)
Modified:
hive/trunk/conf/hive-default.xml.template
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
Modified: hive/trunk/conf/hive-default.xml.template
URL:
http://svn.apache.org/viewvc/hive/trunk/conf/hive-default.xml.template?rev=1545345&r1=1545344&r2=1545345&view=diff
==============================================================================
--- hive/trunk/conf/hive-default.xml.template (original)
+++ hive/trunk/conf/hive-default.xml.template Mon Nov 25 17:13:03 2013
@@ -1786,6 +1786,26 @@
</property>
<property>
+ <name>hive.fetch.task.conversion.threshold</name>
+ <value>-1</value>
+ <description>
+ Input threshold for applying hive.fetch.task.conversion. If target table
is native, input length
+ is calculated by summation of file lengths. If it's not native, storage
handler for the table
+ can optionally implement org.apache.hadoop.hive.ql.metadata.InputEstimator
interface.
+ </description>
+</property>
+
+<property>
+ <name>hive.fetch.task.aggr</name>
+ <value>false</value>
+ <description>
+ Aggregation queries with no group-by clause (for example, select count(*)
from src) executes
+ final aggregations in single reduce task. If this is set true, hive
delegates final aggregation
+ stage to fetch task, possibly decreasing the query time.
+ </description>
+</property>
+
+<property>
<name>hive.cache.expr.evaluation</name>
<value>true</value>
<description>
@@ -1797,17 +1817,6 @@
</property>
-
-<property>
- <name>hive.fetch.task.conversion.threshold</name>
- <value>-1</value>
- <description>
- Input threshold for applying hive.fetch.task.conversion. If target table
is native, input length
- is calculated by summation of file lengths. If it's not native, storage
handler for the table
- can optionally implement org.apache.hadoop.hive.ql.metadata.InputEstimator
interface.
- </description>
-</property>
-
<property>
<name>hive.hmshandler.retry.attempts</name>
<value>1</value>
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java?rev=1545345&r1=1545344&r2=1545345&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java Mon
Nov 25 17:13:03 2013
@@ -2107,12 +2107,6 @@ public final class Utilities {
HiveStorageHandler handler =
HiveUtils.getStorageHandler(myConf,
partDesc.getOverlayedProperties().getProperty(
hive_metastoreConstants.META_TABLE_STORAGE));
- if (handler == null) {
- // native table
- FileSystem fs = p.getFileSystem(myConf);
- resultMap.put(pathStr, fs.getContentSummary(p));
- return;
- }
if (handler instanceof InputEstimator) {
long total = 0;
TableDesc tableDesc = partDesc.getTableDesc();
@@ -2128,6 +2122,8 @@ public final class Utilities {
}
resultMap.put(pathStr, new ContentSummary(total, -1, -1));
}
+ FileSystem fs = p.getFileSystem(myConf);
+ resultMap.put(pathStr, fs.getContentSummary(p));
} catch (Exception e) {
// We safely ignore this exception for summary data.
// We don't update the cache to protect it from polluting other
