You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by dv...@apache.org on 2011/03/13 04:37:49 UTC

svn commit: r1081039 - in /pig/trunk: CHANGES.txt lib/zookeeper-hbase-1329.jar src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java

Author: dvryaboy
Date: Sun Mar 13 03:37:48 2011
New Revision: 1081039

URL: http://svn.apache.org/viewvc?rev=1081039&view=rev
Log:
PIG-1886: Add zookeeper jar to list of jars shipped when HBaseStorage used

Removed:
    pig/trunk/lib/zookeeper-hbase-1329.jar
Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1081039&r1=1081038&r2=1081039&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sun Mar 13 03:37:48 2011
@@ -26,6 +26,8 @@ PIG-1680: HBaseStorage should work with 
 
 IMPROVEMENTS
 
+PIG-1886: Add zookeeper jar to list of jars shipped when HBaseStorage used (dvryaboy)
+
 PIG-1874: Make PigServer work in a multithreading environment (rding)
 
 PIG-1188: Padding nulls to the input tuple according to input schema (daijy)

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java?rev=1081039&r1=1081038&r2=1081039&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java Sun Mar 13 03:37:48 2011
@@ -33,8 +33,8 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Put;
@@ -150,6 +150,7 @@ public class HBaseStorage extends LoadFu
      * <li>-lt=maxKeyVal 
      * <li>-gte=minKeyVal
      * <li>-lte=maxKeyVal
+     * <li>-limit=numRowsPerRegion max number of rows to retrieve per region
      * <li>-caching=numRows  number of rows to cache (faster scans, more memory).
      * </ul>
      * @throws ParseException 
@@ -289,10 +290,11 @@ public class HBaseStorage extends LoadFu
     @Override
     public void setLocation(String location, Job job) throws IOException {
         job.getConfiguration().setBoolean("pig.noSplitCombination", true);
-        // Make sure the HBase and Guava jars get shipped.
+        // Make sure the HBase, ZooKeeper, and Guava jars get shipped.
         TableMapReduceUtil.addDependencyJars(job.getConfiguration(), 
             org.apache.hadoop.hbase.client.HTable.class,
-            com.google.common.collect.Lists.class);
+            com.google.common.collect.Lists.class,
+            org.apache.zookeeper.ZooKeeper.class);
 
         String tablename = location;
         if (location.startsWith("hbase://")){