You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2014/03/04 18:56:08 UTC

svn commit: r1574160 - in /hive/trunk/ql/src: java/org/apache/hadoop/hive/ql/exec/ java/org/apache/hadoop/hive/ql/exec/persistence/ test/org/apache/hadoop/hive/ql/exec/persistence/

Author: prasadm
Date: Tue Mar  4 17:56:07 2014
New Revision: 1574160

URL: http://svn.apache.org/r1574160
Log:
HIVE-6530: JDK 7 trunk build fails after HIVE-6418 patch (Navis via Prasad Mujumdar)

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/HashTableSinkOperator.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
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/PTFPartition.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/AbstractRowContainer.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/LazyFlatRowContainer.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinEagerRowContainer.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinRowContainer.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/PTFRowContainer.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/RowContainer.java
    hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinEqualityTableContainer.java
    hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinRowContainer.java
    hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinTableContainer.java
    hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestPTFRowContainer.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=1574160&r1=1574159&r2=1574160&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 Tue Mar  4 17:56:07 2014
@@ -272,7 +272,7 @@ public abstract class CommonJoinOperator
           rowContainerStandardObjectInspectors[pos],
           alias, 1, spillTableDesc, conf, !hasFilter(pos), reporter);
 
-      values.add(dummyObj[pos]);
+      values.addRow(dummyObj[pos]);
       dummyObjVectors[pos] = values;
 
       // if serde is null, the input doesn't need to be spilled out
@@ -690,7 +690,7 @@ public abstract class CommonJoinOperator
         }
 
         if (alw.rowCount() == 0) {
-          alw.add(dummyObj[i]);
+          alw.addRow(dummyObj[i]);
           hasNulls = true;
         } else if (condn[i].getPreserved()) {
           preserve = true;
@@ -728,7 +728,7 @@ public abstract class CommonJoinOperator
         } else {
           if (alw.rowCount() == 0) {
             hasEmpty = true;
-            alw.add(dummyObj[i]);
+            alw.addRow(dummyObj[i]);
           } else if (!hasEmpty && alw.rowCount() == 1) {
             if (hasAnyFiltered(alias, alw.rowIter().first())) {
               hasEmpty = true;

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/HashTableSinkOperator.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/HashTableSinkOperator.java?rev=1574160&r1=1574159&r2=1574160&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/HashTableSinkOperator.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/HashTableSinkOperator.java Tue Mar  4 17:56:07 2014
@@ -91,7 +91,6 @@ public class HashTableSinkOperator exten
 
   private transient Byte[] order; // order in which the results should
   private Configuration hconf;
-  private transient Byte alias;
 
   private transient MapJoinTableContainer[] mapJoinTables;
   private transient MapJoinTableContainerSerDe[] mapJoinTableSerdes;  
@@ -99,11 +98,9 @@ public class HashTableSinkOperator exten
   private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
   private static final MapJoinEagerRowContainer EMPTY_ROW_CONTAINER = new MapJoinEagerRowContainer();
   static {
-    EMPTY_ROW_CONTAINER.add(EMPTY_OBJECT_ARRAY);
+    EMPTY_ROW_CONTAINER.addRow(EMPTY_OBJECT_ARRAY);
   }
   
-  private transient boolean noOuterJoin;
-
   private long rowNumber = 0;
   private transient LogHelper console;
   private long hashTableScale;
@@ -132,7 +129,6 @@ public class HashTableSinkOperator exten
     // initialize some variables, which used to be initialized in CommonJoinOperator
     this.hconf = hconf;
 
-    noOuterJoin = conf.isNoOuterJoin();
     filterMaps = conf.getFilterMap();
 
     int tagLen = conf.getTagLength();
@@ -155,7 +151,7 @@ public class HashTableSinkOperator exten
     joinFilterObjectInspectors = JoinUtil.getObjectInspectorsFromEvaluators(joinFilters,
         inputObjInspectors, posBigTableAlias, tagLen);
 
-    if (!noOuterJoin) {
+    if (!conf.isNoOuterJoin()) {
       for (Byte alias : order) {
         if (alias == posBigTableAlias || joinValues[alias] == null) {
           continue;
@@ -228,7 +224,7 @@ public class HashTableSinkOperator exten
    */
   @Override
   public void processOp(Object row, int tag) throws HiveException {
-    alias = (byte)tag;
+    byte alias = (byte)tag;
     // compute keys and values as StandardObjects. Use non-optimized key (MR).
     MapJoinKey key = MapJoinKey.readFromRow(null, new MapJoinKeyObject(),
         row, joinKeys[alias], joinKeysObjectInspectors[alias], true);
@@ -243,7 +239,7 @@ public class HashTableSinkOperator exten
     if (rowContainer == null) {
       if(value.length != 0) {
         rowContainer = new MapJoinEagerRowContainer();
-        rowContainer.add(value);
+        rowContainer.addRow(value);
       } else {
         rowContainer = EMPTY_ROW_CONTAINER;
       }
@@ -254,10 +250,10 @@ public class HashTableSinkOperator exten
       tableContainer.put(key, rowContainer);
     } else if (rowContainer == EMPTY_ROW_CONTAINER) {
       rowContainer = rowContainer.copy();
-      rowContainer.add(value);
+      rowContainer.addRow(value);
       tableContainer.put(key, rowContainer);
     } else {
-      rowContainer.add(value);
+      rowContainer.addRow(value);
     }
   }
   private boolean hasFilter(int alias) {

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=1574160&r1=1574159&r2=1574160&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 Tue Mar  4 17:56:07 2014
@@ -122,7 +122,7 @@ public class JoinOperator extends Common
         endGroup();
         startGroup();
       }
-      storage[alias].add(nr);
+      storage[alias].addRow(nr);
     } catch (Exception e) {
       e.printStackTrace();
       throw new HiveException(e);
@@ -208,7 +208,6 @@ public class JoinOperator extends Common
    * @param hconf
    * @param success
    * @param log
-   * @param dpCtx
    * @throws IOException
    * @throws HiveException
    */

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=1574160&r1=1574159&r2=1574160&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 Tue Mar  4 17:56:07 2014
@@ -210,7 +210,7 @@ public class MapJoinOperator extends Abs
       if (joinNeeded) {
         List<Object> value = getFilteredValue(alias, row);
         // Add the value to the ArrayList
-        storage[alias].add(value);
+        storage[alias].addRow(value);
         // generate the output records
         checkAndGenObject();
       }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/PTFPartition.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/PTFPartition.java?rev=1574160&r1=1574159&r2=1574160&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/PTFPartition.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/PTFPartition.java Tue Mar  4 17:56:07 2014
@@ -90,11 +90,11 @@ public class PTFPartition {
     @SuppressWarnings("unchecked")
     List<Object> l = (List<Object>)
         ObjectInspectorUtils.copyToStandardObject(o, inputOI, ObjectInspectorCopyOption.WRITABLE);
-    elems.add(l);
+    elems.addRow(l);
   }
 
   public int size() {
-    return (int) elems.rowCount();
+    return elems.rowCount();
   }
 
   public PTFPartitionIterator<Object> iterator() throws HiveException {

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java?rev=1574160&r1=1574159&r2=1574160&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java Tue Mar  4 17:56:07 2014
@@ -274,7 +274,7 @@ public class SMBMapJoinOperator extends 
     boolean nextKeyGroup = processKey(alias, key);
     if (nextKeyGroup) {
       //assert this.nextGroupStorage[alias].size() == 0;
-      this.nextGroupStorage[alias].add(value);
+      this.nextGroupStorage[alias].addRow(value);
       foundNextKeyGroup[tag] = true;
       if (tag != posBigTable) {
         return;
@@ -299,7 +299,7 @@ public class SMBMapJoinOperator extends 
     }
 
     assert !nextKeyGroup;
-    candidateStorage[tag].add(value);
+    candidateStorage[tag].addRow(value);
   }
 
   /*

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/AbstractRowContainer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/AbstractRowContainer.java?rev=1574160&r1=1574159&r2=1574160&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/AbstractRowContainer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/AbstractRowContainer.java Tue Mar  4 17:56:07 2014
@@ -29,7 +29,12 @@ public interface AbstractRowContainer<RO
 
   public RowIterator<ROW> rowIter() throws HiveException;
 
-  public void add(ROW t) throws HiveException;
+  /**
+   * add a row into the RowContainer
+   *
+   * @param t row
+   */
+  public void addRow(ROW t) throws HiveException;
 
   /**
    * @return number of elements in the RowContainer

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/LazyFlatRowContainer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/LazyFlatRowContainer.java?rev=1574160&r1=1574159&r2=1574160&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/LazyFlatRowContainer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/LazyFlatRowContainer.java Tue Mar  4 17:56:07 2014
@@ -18,10 +18,8 @@
 
 package org.apache.hadoop.hive.ql.exec.persistence;
 
-
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.util.AbstractCollection;
 import java.util.AbstractList;
@@ -32,8 +30,6 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import javax.naming.OperationNotSupportedException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hive.ql.metadata.HiveException;
@@ -115,7 +111,7 @@ public class LazyFlatRowContainer extend
   // Implementation of AbstractRowContainer and assorted methods
 
   @Override
-  public void add(List<Object> t) throws HiveException {
+  public void addRow(List<Object> t) throws HiveException {
     LOG.debug("Add is called with " + t.size() + " objects");
     // This is not called when building HashTable; we don't expect it to be called ever.
     int offset = prepareForAdd(t.size());
@@ -126,7 +122,7 @@ public class LazyFlatRowContainer extend
   }
 
   @Override
-  public void add(Object[] value) throws HiveException {
+  public void addRow(Object[] value) throws HiveException {
     LOG.debug("Add is called with " + value.length + " objects");
     // This is not called when building HashTable; we don't expect it to be called ever.
     int offset = prepareForAdd(value.length);

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinEagerRowContainer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinEagerRowContainer.java?rev=1574160&r1=1574159&r2=1574160&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinEagerRowContainer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinEagerRowContainer.java Tue Mar  4 17:56:07 2014
@@ -49,13 +49,13 @@ public class MapJoinEagerRowContainer
   } 
 
   @Override
-  public void add(List<Object> t) {
+  public void addRow(List<Object> t) {
     list.add(t);
   }
 
   @Override
-  public void add(Object[] t) {
-    add(toList(t));
+  public void addRow(Object[] t) {
+    addRow(toList(t));
   }
 
   @Override
@@ -108,7 +108,7 @@ public class MapJoinEagerRowContainer
   public MapJoinRowContainer copy() {
     MapJoinEagerRowContainer result = new MapJoinEagerRowContainer();
     for(List<Object> item : list) {
-      result.add(item);
+      result.addRow(item);
     }
     return result;
   }
@@ -129,13 +129,13 @@ public class MapJoinEagerRowContainer
     List<Object> value = (List<Object>)ObjectInspectorUtils.copyToStandardObject(serde.deserialize(currentValue),
         serde.getObjectInspector(), ObjectInspectorCopyOption.WRITABLE);
     if(value == null) {
-      add(toList(EMPTY_OBJECT_ARRAY));
+      addRow(toList(EMPTY_OBJECT_ARRAY));
     } else {
       Object[] valuesArray = value.toArray();
       if (context.hasFilterTag()) {
         aliasFilter &= ((ShortWritable)valuesArray[valuesArray.length - 1]).get();
       }
-      add(toList(valuesArray));
+      addRow(toList(valuesArray));
     }
   }
 

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinRowContainer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinRowContainer.java?rev=1574160&r1=1574159&r2=1574160&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinRowContainer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinRowContainer.java Tue Mar  4 17:56:07 2014
@@ -31,7 +31,7 @@ public interface MapJoinRowContainer ext
 
   public MapJoinRowContainer copy() throws HiveException;
 
-  public void add(Object[] value) throws HiveException;
+  public void addRow(Object[] value) throws HiveException;
 
   public void write(MapJoinObjectSerDeContext valueContext, ObjectOutputStream out)
       throws IOException, SerDeException;

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/PTFRowContainer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/PTFRowContainer.java?rev=1574160&r1=1574159&r2=1574160&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/PTFRowContainer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/PTFRowContainer.java Tue Mar  4 17:56:07 2014
@@ -91,7 +91,7 @@ public class PTFRowContainer<Row extends
   }
 
   @Override
-  public void add(Row t) throws HiveException {
+  public void addRow(Row t) throws HiveException {
     if ( willSpill() ) {
       setupWriter();
       PTFRecordWriter rw = (PTFRecordWriter) getRecordWriter();
@@ -105,7 +105,7 @@ public class PTFRowContainer<Row extends
         throw new HiveException(e);
       }
     }
-    super.add(t);
+    super.addRow(t);
   }
 
   @Override

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/RowContainer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/RowContainer.java?rev=1574160&r1=1574159&r2=1574160&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/RowContainer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/RowContainer.java Tue Mar  4 17:56:07 2014
@@ -159,7 +159,7 @@ public class RowContainer<ROW extends Li
   }
 
   @Override
-  public void add(ROW t) throws HiveException {
+  public void addRow(ROW t) throws HiveException {
     if (this.tblDesc != null) {
       if (willSpill()) { // spill the current block to tmp file
         spillBlock(currentWriteBlock, addCursor);
@@ -279,9 +279,9 @@ public class RowContainer<ROW extends Li
   private void removeKeys(ROW ret) {
     if (this.keyObject != null && this.currentReadBlock != this.currentWriteBlock) {
       int len = this.keyObject.size();
-      int rowSize = ((ArrayList) ret).size();
+      int rowSize = ret.size();
       for (int i = 0; i < len; i++) {
-        ((ArrayList) ret).remove(rowSize - i - 1);
+        ret.remove(rowSize - i - 1);
       }
     }
   }

Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinEqualityTableContainer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinEqualityTableContainer.java?rev=1574160&r1=1574159&r2=1574160&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinEqualityTableContainer.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinEqualityTableContainer.java Tue Mar  4 17:56:07 2014
@@ -39,7 +39,7 @@ public class TestMapJoinEqualityTableCon
   @Before
   public void setup() throws Exception {
     rowContainer = new MapJoinEagerRowContainer();
-    rowContainer.add(VALUE);
+    rowContainer.addRow(VALUE);
     container = new HashMapWrapper();
   }
   @Test

Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinRowContainer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinRowContainer.java?rev=1574160&r1=1574159&r2=1574160&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinRowContainer.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinRowContainer.java Tue Mar  4 17:56:07 2014
@@ -30,10 +30,10 @@ public class TestMapJoinRowContainer {
   @Test
   public void testSerialization() throws Exception {
     MapJoinRowContainer container1 = new MapJoinEagerRowContainer();
-    container1.add(new Object[]{ new Text("f0"), null, new ShortWritable((short)0xf)});
-    container1.add(Arrays.asList(new Object[]{ null, new Text("f1"), new ShortWritable((short)0xf)}));
-    container1.add(new Object[]{ null, null, new ShortWritable((short)0xf)});
-    container1.add(Arrays.asList(new Object[]{ new Text("f0"), new Text("f1"), new ShortWritable((short)0x1)}));
+    container1.addRow(new Object[]{ new Text("f0"), null, new ShortWritable((short)0xf)});
+    container1.addRow(Arrays.asList(new Object[]{ null, new Text("f1"), new ShortWritable((short)0xf)}));
+    container1.addRow(new Object[]{ null, null, new ShortWritable((short)0xf)});
+    container1.addRow(Arrays.asList(new Object[]{ new Text("f0"), new Text("f1"), new ShortWritable((short)0x1)}));
     MapJoinRowContainer container2 = Utilities.serde(container1, "f0,f1,filter", "string,string,smallint");
     Utilities.testEquality(container1, container2);
     Assert.assertEquals(4, container1.rowCount());

Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinTableContainer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinTableContainer.java?rev=1574160&r1=1574159&r2=1574160&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinTableContainer.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinTableContainer.java Tue Mar  4 17:56:07 2014
@@ -46,7 +46,7 @@ public class TestMapJoinTableContainer {
   public void setup() throws Exception {
     key = new MapJoinKeyObject(KEY);
     rowContainer = new MapJoinEagerRowContainer();
-    rowContainer.add(VALUE);
+    rowContainer.addRow(VALUE);
     baos = new ByteArrayOutputStream();
     out = new ObjectOutputStream(baos);
     

Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestPTFRowContainer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestPTFRowContainer.java?rev=1574160&r1=1574159&r2=1574160&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestPTFRowContainer.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestPTFRowContainer.java Tue Mar  4 17:56:07 2014
@@ -81,7 +81,7 @@ public class TestPTFRowContainer {
       row.add(new DoubleWritable(i));
       row.add(new IntWritable(i));
       row.add(new Text("def " + i));
-      rc.add(row);
+      rc.addRow(row);
     }
 
     // test forward scan