diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index c868d2f..1672453 100644
--- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -415,7 +415,6 @@
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),
diff --git conf/hive-default.xml.template conf/hive-default.xml.template
index 3996d70..3a7d1dc 100644
--- conf/hive-default.xml.template
+++ conf/hive-default.xml.template
@@ -595,12 +595,6 @@
- hive.mapjoin.cache.numrows
- 25000
- How many rows should be cached by jdbm for map join.
-
-
-
hive.optimize.skewjoin
false
Whether to enable skew join optimization.
diff --git ql/src/test/queries/clientpositive/join39.q ql/src/test/queries/clientpositive/join39.q
index a7cd35a..d0edac5 100644
--- ql/src/test/queries/clientpositive/join39.q
+++ ql/src/test/queries/clientpositive/join39.q
@@ -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
diff --git ql/src/test/queries/clientpositive/join40.q ql/src/test/queries/clientpositive/join40.q
index 0ec08f2..e93f082 100644
--- ql/src/test/queries/clientpositive/join40.q
+++ ql/src/test/queries/clientpositive/join40.q
@@ -29,7 +29,6 @@ SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value;
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
diff --git ql/src/test/queries/clientpositive/mapjoin1.q ql/src/test/queries/clientpositive/mapjoin1.q
index 9c6a8b1..49de907 100644
--- ql/src/test/queries/clientpositive/mapjoin1.q
+++ ql/src/test/queries/clientpositive/mapjoin1.q
@@ -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;
diff --git ql/src/test/results/beelinepositive/join39.q.out ql/src/test/results/beelinepositive/join39.q.out
index 5800f26..1cc90f4 100644
--- ql/src/test/results/beelinepositive/join39.q.out
+++ ql/src/test/results/beelinepositive/join39.q.out
@@ -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
>>>
diff --git ql/src/test/results/beelinepositive/join40.q.out ql/src/test/results/beelinepositive/join40.q.out
index f3e82e7..8225333 100644
--- ql/src/test/results/beelinepositive/join40.q.out
+++ ql/src/test/results/beelinepositive/join40.q.out
@@ -3205,8 +3205,6 @@ SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value;
'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
diff --git ql/src/test/results/beelinepositive/mapjoin1.q.out ql/src/test/results/beelinepositive/mapjoin1.q.out
index 370635b..9289042 100644
--- ql/src/test/results/beelinepositive/mapjoin1.q.out
+++ ql/src/test/results/beelinepositive/mapjoin1.q.out
@@ -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;