Updated Branches: refs/heads/master 71e678300 -> ae748c8ea
Fix compilation failure on jdk 1.6 of my previous commit (because of using java.util.Objects) Project: http://git-wip-us.apache.org/repos/asf/crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/ae748c8e Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/ae748c8e Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/ae748c8e Branch: refs/heads/master Commit: ae748c8eacf45137575a4974eafeb517349fdf4c Parents: 71e6783 Author: Chao Shi <[email protected]> Authored: Mon Sep 2 14:23:13 2013 +0800 Committer: Chao Shi <[email protected]> Committed: Mon Sep 2 14:23:13 2013 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/crunch/io/hbase/HFileSource.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/crunch/blob/ae748c8e/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HFileSource.java ---------------------------------------------------------------------- diff --git a/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HFileSource.java b/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HFileSource.java index 13137b8..7fa7280 100644 --- a/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HFileSource.java +++ b/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HFileSource.java @@ -17,6 +17,7 @@ */ package org.apache.crunch.io.hbase; +import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import org.apache.commons.codec.binary.Hex; import org.apache.crunch.io.FormatBundle; @@ -31,7 +32,6 @@ import org.apache.hadoop.hbase.client.Scan; import java.io.IOException; import java.util.List; -import java.util.Objects; import static org.apache.crunch.types.writable.Writables.writables; @@ -55,10 +55,10 @@ public class HFileSource extends FileSourceImpl<KeyValue> implements ReadableSou private static FormatBundle<HFileInputFormat> createInputFormatBundle(Scan scan) { FormatBundle<HFileInputFormat> bundle = FormatBundle.forInput(HFileInputFormat.class); - if (!Objects.equals(scan.getStartRow(), HConstants.EMPTY_START_ROW)) { + if (!Objects.equal(scan.getStartRow(), HConstants.EMPTY_START_ROW)) { bundle.set(HFileInputFormat.START_ROW_KEY, Hex.encodeHexString(scan.getStartRow())); } - if (!Objects.equals(scan.getStopRow(), HConstants.EMPTY_END_ROW)) { + if (!Objects.equal(scan.getStopRow(), HConstants.EMPTY_END_ROW)) { bundle.set(HFileInputFormat.STOP_ROW_KEY, Hex.encodeHexString(scan.getStopRow())); } return bundle;
