You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bu...@apache.org on 2014/01/21 19:25:16 UTC

[1/6] git commit: ACCUMULO-2230 Make sure offline scan uses the cloned table.

Updated Branches:
  refs/heads/1.5.1-SNAPSHOT 78c5f460b -> a43848849
  refs/heads/1.6.0-SNAPSHOT 8cfdc1ffc -> 3931cceb1
  refs/heads/master 7ecb50a97 -> 66cccbe48


ACCUMULO-2230 Make sure offline scan uses the cloned table.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a4384884
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a4384884
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a4384884

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: a43848849e78aa9bc6edb5d6d87e2a285d8fccf2
Parents: 78c5f46
Author: Sean Busbey <bu...@cloudera.com>
Authored: Mon Jan 20 23:30:01 2014 -0600
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Tue Jan 21 11:52:14 2014 -0600

----------------------------------------------------------------------
 .../apache/accumulo/test/continuous/ContinuousVerify.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4384884/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
index 1ace774..08d8ff1 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
@@ -183,6 +183,9 @@ public class ContinuousVerify extends Configured implements Tool {
     Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
     job.setJarByClass(this.getClass());
     
+    job.setInputFormatClass(AccumuloInputFormat.class);
+    opts.setAccumuloConfigs(job);
+
     String clone = opts.getTableName();
     Connector conn = null;
     if (opts.scanOffline) {
@@ -191,13 +194,10 @@ public class ContinuousVerify extends Configured implements Tool {
       conn = opts.getConnector();
       conn.tableOperations().clone(opts.getTableName(), clone, true, new HashMap<String,String>(), new HashSet<String>());
       conn.tableOperations().offline(clone);
+      AccumuloInputFormat.setInputTableName(job, clone);
+      AccumuloInputFormat.setOfflineTableScan(job, true);
     }
     
-    job.setInputFormatClass(AccumuloInputFormat.class);
-    
-    opts.setAccumuloConfigs(job);
-    AccumuloInputFormat.setOfflineTableScan(job, opts.scanOffline);
-    
     // set up ranges
     try {
       Set<Range> ranges = opts.getConnector().tableOperations().splitRangeByTablets(opts.getTableName(), new Range(), opts.maxMaps);


[3/6] git commit: ACCUMULO-2230 Make sure offline scan uses the cloned table.

Posted by bu...@apache.org.
ACCUMULO-2230 Make sure offline scan uses the cloned table.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a4384884
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a4384884
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a4384884

Branch: refs/heads/master
Commit: a43848849e78aa9bc6edb5d6d87e2a285d8fccf2
Parents: 78c5f46
Author: Sean Busbey <bu...@cloudera.com>
Authored: Mon Jan 20 23:30:01 2014 -0600
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Tue Jan 21 11:52:14 2014 -0600

----------------------------------------------------------------------
 .../apache/accumulo/test/continuous/ContinuousVerify.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4384884/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
index 1ace774..08d8ff1 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
@@ -183,6 +183,9 @@ public class ContinuousVerify extends Configured implements Tool {
     Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
     job.setJarByClass(this.getClass());
     
+    job.setInputFormatClass(AccumuloInputFormat.class);
+    opts.setAccumuloConfigs(job);
+
     String clone = opts.getTableName();
     Connector conn = null;
     if (opts.scanOffline) {
@@ -191,13 +194,10 @@ public class ContinuousVerify extends Configured implements Tool {
       conn = opts.getConnector();
       conn.tableOperations().clone(opts.getTableName(), clone, true, new HashMap<String,String>(), new HashSet<String>());
       conn.tableOperations().offline(clone);
+      AccumuloInputFormat.setInputTableName(job, clone);
+      AccumuloInputFormat.setOfflineTableScan(job, true);
     }
     
-    job.setInputFormatClass(AccumuloInputFormat.class);
-    
-    opts.setAccumuloConfigs(job);
-    AccumuloInputFormat.setOfflineTableScan(job, opts.scanOffline);
-    
     // set up ranges
     try {
       Set<Range> ranges = opts.getConnector().tableOperations().splitRangeByTablets(opts.getTableName(), new Range(), opts.maxMaps);


[2/6] git commit: ACCUMULO-2230 Make sure offline scan uses the cloned table.

Posted by bu...@apache.org.
ACCUMULO-2230 Make sure offline scan uses the cloned table.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a4384884
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a4384884
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a4384884

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: a43848849e78aa9bc6edb5d6d87e2a285d8fccf2
Parents: 78c5f46
Author: Sean Busbey <bu...@cloudera.com>
Authored: Mon Jan 20 23:30:01 2014 -0600
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Tue Jan 21 11:52:14 2014 -0600

----------------------------------------------------------------------
 .../apache/accumulo/test/continuous/ContinuousVerify.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4384884/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
index 1ace774..08d8ff1 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
@@ -183,6 +183,9 @@ public class ContinuousVerify extends Configured implements Tool {
     Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis());
     job.setJarByClass(this.getClass());
     
+    job.setInputFormatClass(AccumuloInputFormat.class);
+    opts.setAccumuloConfigs(job);
+
     String clone = opts.getTableName();
     Connector conn = null;
     if (opts.scanOffline) {
@@ -191,13 +194,10 @@ public class ContinuousVerify extends Configured implements Tool {
       conn = opts.getConnector();
       conn.tableOperations().clone(opts.getTableName(), clone, true, new HashMap<String,String>(), new HashSet<String>());
       conn.tableOperations().offline(clone);
+      AccumuloInputFormat.setInputTableName(job, clone);
+      AccumuloInputFormat.setOfflineTableScan(job, true);
     }
     
-    job.setInputFormatClass(AccumuloInputFormat.class);
-    
-    opts.setAccumuloConfigs(job);
-    AccumuloInputFormat.setOfflineTableScan(job, opts.scanOffline);
-    
     // set up ranges
     try {
       Set<Range> ranges = opts.getConnector().tableOperations().splitRangeByTablets(opts.getTableName(), new Range(), opts.maxMaps);


[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by bu...@apache.org.
Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/66cccbe4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/66cccbe4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/66cccbe4

Branch: refs/heads/master
Commit: 66cccbe48febd25b94cf0e9d6aa73be030139e9f
Parents: 7ecb50a 3931cce
Author: Sean Busbey <bu...@cloudera.com>
Authored: Tue Jan 21 12:17:15 2014 -0600
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Tue Jan 21 12:17:15 2014 -0600

----------------------------------------------------------------------
 .../apache/accumulo/test/continuous/ContinuousVerify.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by bu...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3931cceb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3931cceb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3931cceb

Branch: refs/heads/master
Commit: 3931cceb1731c835d16674a5c8fa72374bf16dcd
Parents: 8cfdc1f a438488
Author: Sean Busbey <bu...@cloudera.com>
Authored: Tue Jan 21 12:16:15 2014 -0600
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Tue Jan 21 12:16:15 2014 -0600

----------------------------------------------------------------------
 .../apache/accumulo/test/continuous/ContinuousVerify.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3931cceb/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
----------------------------------------------------------------------


[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by bu...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3931cceb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3931cceb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3931cceb

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 3931cceb1731c835d16674a5c8fa72374bf16dcd
Parents: 8cfdc1f a438488
Author: Sean Busbey <bu...@cloudera.com>
Authored: Tue Jan 21 12:16:15 2014 -0600
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Tue Jan 21 12:16:15 2014 -0600

----------------------------------------------------------------------
 .../apache/accumulo/test/continuous/ContinuousVerify.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3931cceb/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
----------------------------------------------------------------------