You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/04/30 07:10:47 UTC
svn commit: r1477474 - in /hive/trunk:
common/src/java/org/apache/hadoop/hive/conf/ conf/
ql/src/test/queries/clientpositive/ ql/src/test/results/beelinepositive/
Author: hashutosh
Date: Tue Apr 30 05:10:46 2013
New Revision: 1477474
URL: http://svn.apache.org/r1477474
Log:
HIVE-4439 : Remove unused join configuration parameter: hive.mapjoin.cache.numrows (Gunther Hagleitner via Ashutosh Chauhan)
Modified:
hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/trunk/conf/hive-default.xml.template
hive/trunk/ql/src/test/queries/clientpositive/join39.q
hive/trunk/ql/src/test/queries/clientpositive/join40.q
hive/trunk/ql/src/test/queries/clientpositive/mapjoin1.q
hive/trunk/ql/src/test/results/beelinepositive/join39.q.out
hive/trunk/ql/src/test/results/beelinepositive/join40.q.out
hive/trunk/ql/src/test/results/beelinepositive/mapjoin1.q.out
Modified: hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1477474&r1=1477473&r2=1477474&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Tue Apr 30 05:10:46 2013
@@ -415,7 +415,6 @@ public class HiveConf extends Configurat
HIVEJOINEMITINTERVAL("hive.join.emit.interval", 1000),
HIVEJOINCACHESIZE("hive.join.cache.size", 25000),
HIVEMAPJOINBUCKETCACHESIZE("hive.mapjoin.bucket.cache.size", 100),
- HIVEMAPJOINCACHEROWS("hive.mapjoin.cache.numrows", 25000),
HIVEGROUPBYMAPINTERVAL("hive.groupby.mapaggr.checkinterval", 100000),
HIVEMAPAGGRHASHMEMORY("hive.map.aggr.hash.percentmemory", (float) 0.5),
HIVEMAPJOINFOLLOWEDBYMAPAGGRHASHMEMORY("hive.mapjoin.followby.map.aggr.hash.percentmemory", (float) 0.3),
Modified: hive/trunk/conf/hive-default.xml.template
URL: http://svn.apache.org/viewvc/hive/trunk/conf/hive-default.xml.template?rev=1477474&r1=1477473&r2=1477474&view=diff
==============================================================================
--- hive/trunk/conf/hive-default.xml.template (original)
+++ hive/trunk/conf/hive-default.xml.template Tue Apr 30 05:10:46 2013
@@ -595,12 +595,6 @@
</property>
<property>
- <name>hive.mapjoin.cache.numrows</name>
- <value>25000</value>
- <description>How many rows should be cached by jdbm for map join. </description>
-</property>
-
-<property>
<name>hive.optimize.skewjoin</name>
<value>false</value>
<description>Whether to enable skew join optimization.
Modified: hive/trunk/ql/src/test/queries/clientpositive/join39.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join39.q?rev=1477474&r1=1477473&r2=1477474&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join39.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join39.q Tue Apr 30 05:10:46 2013
@@ -1,7 +1,3 @@
-set hive.mapjoin.cache.numrows = 2;
-
-
-
CREATE TABLE dest_j1(key STRING, value STRING, key1 string, val2 STRING) STORED AS TEXTFILE;
explain
Modified: hive/trunk/ql/src/test/queries/clientpositive/join40.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/join40.q?rev=1477474&r1=1477473&r2=1477474&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/join40.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/join40.q Tue Apr 30 05:10:46 2013
@@ -29,7 +29,6 @@ SORT BY src1.key, src1.value, src2.key,
SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key < 15) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20)
SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value;
-set hive.mapjoin.cache.numrows=2;
EXPLAIN
SELECT /*+ MAPJOIN(y) */ x.key, x.value, y.key, y.value
Modified: hive/trunk/ql/src/test/queries/clientpositive/mapjoin1.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/mapjoin1.q?rev=1477474&r1=1477473&r2=1477474&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/mapjoin1.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/mapjoin1.q Tue Apr 30 05:10:46 2013
@@ -1,5 +1,3 @@
-set hive.mapjoin.cache.numrows=100;
-
SELECT /*+ MAPJOIN(b) */ sum(a.key) as sum_a
FROM srcpart a
JOIN src b ON a.key = b.key where a.ds is not null;
Modified: hive/trunk/ql/src/test/results/beelinepositive/join39.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/join39.q.out?rev=1477474&r1=1477473&r2=1477474&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/join39.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/join39.q.out Tue Apr 30 05:10:46 2013
@@ -1,10 +1,5 @@
Saving all output to "!!{outputDirectory}!!/join39.q.raw". Enter "record" with no arguments to stop it.
>>> !run !!{qFileDirectory}!!/join39.q
->>> set hive.mapjoin.cache.numrows = 2;
-No rows affected
->>>
->>>
->>>
>>> CREATE TABLE dest_j1(key STRING, value STRING, key1 string, val2 STRING) STORED AS TEXTFILE;
No rows affected
>>>
Modified: hive/trunk/ql/src/test/results/beelinepositive/join40.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/join40.q.out?rev=1477474&r1=1477473&r2=1477474&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/join40.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/join40.q.out Tue Apr 30 05:10:46 2013
@@ -3205,8 +3205,6 @@ SORT BY src1.key, src1.value, src2.key,
'9','val_9','9','val_9','9','val_9'
548 rows selected
>>>
->>> set hive.mapjoin.cache.numrows=2;
-No rows affected
>>>
>>> EXPLAIN
SELECT /*+ MAPJOIN(y) */ x.key, x.value, y.key, y.value
Modified: hive/trunk/ql/src/test/results/beelinepositive/mapjoin1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/mapjoin1.q.out?rev=1477474&r1=1477473&r2=1477474&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/mapjoin1.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/mapjoin1.q.out Tue Apr 30 05:10:46 2013
@@ -1,8 +1,5 @@
Saving all output to "!!{outputDirectory}!!/mapjoin1.q.raw". Enter "record" with no arguments to stop it.
>>> !run !!{qFileDirectory}!!/mapjoin1.q
->>> set hive.mapjoin.cache.numrows=100;
-No rows affected
->>>
>>> SELECT /*+ MAPJOIN(b) */ sum(a.key) as sum_a
FROM srcpart a
JOIN src b ON a.key = b.key where a.ds is not null;