You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@crunch.apache.org by jw...@apache.org on 2014/06/23 23:36:53 UTC
[1/2] git commit: CRUNCH-426 Make HBaseSourceTarget constructor to
binary-compatible with 0.8.2.
Repository: crunch
Updated Branches:
refs/heads/apache-crunch-0.8 a951068bc -> 31c7b6d8a
CRUNCH-426 Make HBaseSourceTarget constructor to binary-compatible with 0.8.2.
Signed-off-by: Josh Wills <jw...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/crunch/repo
Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/f695ef78
Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/f695ef78
Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/f695ef78
Branch: refs/heads/apache-crunch-0.8
Commit: f695ef78a69c69d10e6e0e32c31d2615225a4da7
Parents: a951068
Author: Allan Shoup <al...@cerner.com>
Authored: Mon Jun 23 15:22:14 2014 -0500
Committer: Josh Wills <jw...@apache.org>
Committed: Mon Jun 23 14:15:36 2014 -0700
----------------------------------------------------------------------
.../org/apache/crunch/io/hbase/HBaseSourceTarget.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/crunch/blob/f695ef78/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HBaseSourceTarget.java
----------------------------------------------------------------------
diff --git a/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HBaseSourceTarget.java b/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HBaseSourceTarget.java
index 6ed3b42..45afb18 100644
--- a/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HBaseSourceTarget.java
+++ b/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HBaseSourceTarget.java
@@ -53,6 +53,8 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.util.StringUtils;
+import com.google.common.collect.ObjectArrays;
+
public class HBaseSourceTarget extends HBaseTarget implements
ReadableSourceTarget<Pair<ImmutableBytesWritable, Result>>,
TableSource<ImmutableBytesWritable, Result> {
@@ -66,7 +68,15 @@ public class HBaseSourceTarget extends HBaseTarget implements
protected String scansAsString;
private FormatBundle<MultiTableInputFormat> inputBundle;
- public HBaseSourceTarget(String table, Scan... scans) {
+ public HBaseSourceTarget(String table, Scan scan) {
+ this(table, new Scan[] { scan });
+ }
+
+ public HBaseSourceTarget(String table, Scan scan, Scan... additionalScans) {
+ this(table, ObjectArrays.concat(scan, additionalScans));
+ }
+
+ private HBaseSourceTarget(String table, Scan[] scans) {
super(table);
this.scans = scans;
[2/2] git commit: CRUNCH-426: Make Scan[] constructor public on
HBaseSourceTarget
Posted by jw...@apache.org.
CRUNCH-426: Make Scan[] constructor public on HBaseSourceTarget
Project: http://git-wip-us.apache.org/repos/asf/crunch/repo
Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/31c7b6d8
Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/31c7b6d8
Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/31c7b6d8
Branch: refs/heads/apache-crunch-0.8
Commit: 31c7b6d8ae1882df57eb074cc6ce31b05a4538d8
Parents: f695ef7
Author: Josh Wills <jw...@apache.org>
Authored: Mon Jun 23 14:22:24 2014 -0700
Committer: Josh Wills <jw...@apache.org>
Committed: Mon Jun 23 14:33:59 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/crunch/io/hbase/HBaseSourceTarget.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/crunch/blob/31c7b6d8/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HBaseSourceTarget.java
----------------------------------------------------------------------
diff --git a/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HBaseSourceTarget.java b/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HBaseSourceTarget.java
index 45afb18..c7eedea 100644
--- a/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HBaseSourceTarget.java
+++ b/crunch-hbase/src/main/java/org/apache/crunch/io/hbase/HBaseSourceTarget.java
@@ -76,7 +76,7 @@ public class HBaseSourceTarget extends HBaseTarget implements
this(table, ObjectArrays.concat(scan, additionalScans));
}
- private HBaseSourceTarget(String table, Scan[] scans) {
+ public HBaseSourceTarget(String table, Scan[] scans) {
super(table);
this.scans = scans;