You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2010/11/23 20:47:10 UTC
svn commit: r1038299 - in /hbase/trunk: pom.xml
src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java
src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java
src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
Author: stack
Date: Tue Nov 23 19:47:09 2010
New Revision: 1038299
URL: http://svn.apache.org/viewvc?rev=1038299&view=rev
Log:
HBASE-3264 Remove unnecessary Guava Dependency
Modified:
hbase/trunk/pom.xml
hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1038299&r1=1038298&r2=1038299&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Tue Nov 23 19:47:09 2010
@@ -15,8 +15,8 @@
pom not being found. To fix, I've downloaded apache's pom
from here https://repository.apache.org/content/repositories/releases/org/apache/apache/7/apache-7.pom
saving it as 'pom.xml' into a directory named 'apache-7.pom'. I then uncommented the below.
- <relativePath>../apache-7.pom/</relativePath>
-->
+ <relativePath>../apache-7.pom/</relativePath>
</parent>
<groupId>org.apache.hbase</groupId>
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java?rev=1038299&r1=1038298&r2=1038299&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java Tue Nov 23 19:47:09 2010
@@ -53,8 +53,6 @@ import org.apache.hadoop.mapreduce.lib.o
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.google.common.base.Preconditions;
-
/**
* Writes HFiles. Passed KeyValues must arrive in order.
* Currently, can only write files to a single column family at a
@@ -183,7 +181,9 @@ public class HFileOutputFormat extends F
*/
private static void writePartitions(Configuration conf, Path partitionsPath,
List<ImmutableBytesWritable> startKeys) throws IOException {
- Preconditions.checkArgument(!startKeys.isEmpty(), "No regions passed");
+ if (startKeys.isEmpty()) {
+ throw new IllegalArgumentException("No regions passed");
+ }
// We're generating a list of split points, and we don't ever
// have keys < the first region (which has an empty start key)
@@ -193,10 +193,11 @@ public class HFileOutputFormat extends F
new TreeSet<ImmutableBytesWritable>(startKeys);
ImmutableBytesWritable first = sorted.first();
- Preconditions.checkArgument(
- first.equals(HConstants.EMPTY_BYTE_ARRAY),
- "First region of table should have empty start key. Instead has: %s",
- Bytes.toStringBinary(first.get()));
+ if (!first.equals(HConstants.EMPTY_BYTE_ARRAY)) {
+ throw new IllegalArgumentException(
+ "First region of table should have empty start key. Instead has: "
+ + Bytes.toStringBinary(first.get()));
+ }
sorted.remove(first);
// Write the actual file
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java?rev=1038299&r1=1038298&r2=1038299&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java Tue Nov 23 19:47:09 2010
@@ -296,6 +296,8 @@ public class ImportTsv {
}
TableMapReduceUtil.addDependencyJars(job);
+ TableMapReduceUtil.addDependencyJars(job.getConfiguration(),
+ com.google.common.base.Function.class /* Guava used by TsvParser */);
return job;
}
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java?rev=1038299&r1=1038298&r2=1038299&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java Tue Nov 23 19:47:09 2010
@@ -315,7 +315,6 @@ public class TableMapReduceUtil {
try {
addDependencyJars(job.getConfiguration(),
org.apache.zookeeper.ZooKeeper.class,
- com.google.common.base.Function.class,
job.getMapOutputKeyClass(),
job.getMapOutputValueClass(),
job.getInputFormatClass(),