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/08/01 18:10:32 UTC
svn commit: r1509314 - in
/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec:
CommonJoinOperator.java JoinOperator.java MapJoinOperator.java
Author: hashutosh
Date: Thu Aug 1 16:10:31 2013
New Revision: 1509314
URL: http://svn.apache.org/r1509314
Log:
HIVE-4960 : lastAlias in CommonJoinOperator is not used (Yin Huai via Ashutosh Chauhan)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonJoinOperator.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonJoinOperator.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonJoinOperator.java?rev=1509314&r1=1509313&r2=1509314&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonJoinOperator.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonJoinOperator.java Thu Aug 1 16:10:31 2013
@@ -112,8 +112,7 @@ public abstract class CommonJoinOperator
// to RowContainer
int joinEmitInterval = -1;
int joinCacheSize = 0;
- int nextSz = 0;
- transient Byte lastAlias = null;
+ long nextSz = 0;
transient boolean handleSkewJoin = false;
@@ -251,6 +250,7 @@ public abstract class CommonJoinOperator
joinEmitInterval = HiveConf.getIntVar(hconf,
HiveConf.ConfVars.HIVEJOINEMITINTERVAL);
+ nextSz = joinEmitInterval;
joinCacheSize = HiveConf.getIntVar(hconf,
HiveConf.ConfVars.HIVEJOINCACHESIZE);
@@ -334,7 +334,7 @@ public abstract class CommonJoinOperator
super.startGroup();
}
- protected int getNextSize(int sz) {
+ protected long getNextSize(long sz) {
// A very simple counter to keep track of join entries for a key
if (sz >= 100000) {
return sz + 100000;
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java?rev=1509314&r1=1509313&r2=1509314&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java Thu Aug 1 16:10:31 2013
@@ -76,10 +76,6 @@ public class JoinOperator extends Common
// get alias
alias = (byte) tag;
- if ((lastAlias == null) || (!lastAlias.equals(alias))) {
- nextSz = joinEmitInterval;
- }
-
ArrayList<Object> nr = getFilteredValue(alias, row);
if (handleSkewJoin) {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java?rev=1509314&r1=1509313&r2=1509314&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java Thu Aug 1 16:10:31 2013
@@ -228,10 +228,6 @@ public class MapJoinOperator extends Abs
alias = (byte)tag;
- if ((lastAlias == null) || (!lastAlias.equals(alias))) {
- nextSz = joinEmitInterval;
- }
-
// compute keys and values as StandardObjects
AbstractMapJoinKey key = JoinUtil.computeMapJoinKeys(row, joinKeys[alias],
joinKeysObjectInspectors[alias]);