You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/10/27 01:43:26 UTC
[1/8] git commit: Merge branch '1.5' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.5
Repository: accumulo
Updated Branches:
refs/heads/1.5 cc97c5123 -> 351c70eb2
refs/heads/1.6 87fbb4b81 -> 8b93f5d18
refs/heads/master 984c6b86c -> b97527181
Merge branch '1.5' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cc97c512
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cc97c512
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cc97c512
Branch: refs/heads/1.6
Commit: cc97c51230956a61abe743555e2e956a3098e73d
Parents: f816e78 891584f
Author: Josh Elser <el...@apache.org>
Authored: Sun Oct 12 12:55:47 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Oct 12 12:55:47 2014 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[4/8] git commit: ACCUMULO-3261 Don't set empty ranges on the
BatchScanner.
Posted by el...@apache.org.
ACCUMULO-3261 Don't set empty ranges on the BatchScanner.
If ScanMeta is called early enough in the module,
it's possible that it will find no hashes in the
Image table and would attempt to set empty
ranges on the BatchScanner which throws an error.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/351c70eb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/351c70eb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/351c70eb
Branch: refs/heads/master
Commit: 351c70eb2dec11baf6606a0063d43a0e29890909
Parents: cc97c51
Author: Josh Elser <el...@apache.org>
Authored: Sun Oct 26 20:19:51 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Oct 26 20:19:51 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/351c70eb/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
index 5728f25..cda0a6d 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
@@ -77,6 +77,10 @@ public class ScanMeta extends Test {
}
log.debug("Found " + hashes.size() + " hashes starting at " + uuid);
+
+ if (hashes.isEmpty()) {
+ return;
+ }
// use batch scanner to verify all of these exist in index
BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Constants.NO_AUTHS, 3);
[3/8] git commit: ACCUMULO-3261 Don't set empty ranges on the
BatchScanner.
Posted by el...@apache.org.
ACCUMULO-3261 Don't set empty ranges on the BatchScanner.
If ScanMeta is called early enough in the module,
it's possible that it will find no hashes in the
Image table and would attempt to set empty
ranges on the BatchScanner which throws an error.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/351c70eb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/351c70eb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/351c70eb
Branch: refs/heads/1.6
Commit: 351c70eb2dec11baf6606a0063d43a0e29890909
Parents: cc97c51
Author: Josh Elser <el...@apache.org>
Authored: Sun Oct 26 20:19:51 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Oct 26 20:19:51 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/351c70eb/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
index 5728f25..cda0a6d 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
@@ -77,6 +77,10 @@ public class ScanMeta extends Test {
}
log.debug("Found " + hashes.size() + " hashes starting at " + uuid);
+
+ if (hashes.isEmpty()) {
+ return;
+ }
// use batch scanner to verify all of these exist in index
BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Constants.NO_AUTHS, 3);
[8/8] git commit: Merge branch '1.6'
Posted by el...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b9752718
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b9752718
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b9752718
Branch: refs/heads/master
Commit: b97527181f611d8cdb576c32a4db5e19158537fa
Parents: 984c6b8 8b93f5d
Author: Josh Elser <el...@apache.org>
Authored: Sun Oct 26 20:29:11 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Oct 26 20:29:11 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b9752718/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
----------------------------------------------------------------------
[7/8] git commit: Merge branch '1.5' into 1.6
Posted by el...@apache.org.
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8b93f5d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8b93f5d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8b93f5d1
Branch: refs/heads/1.6
Commit: 8b93f5d18335e967f2adf73e0279d74bfbceac27
Parents: 87fbb4b 351c70e
Author: Josh Elser <el...@apache.org>
Authored: Sun Oct 26 20:28:54 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Oct 26 20:28:54 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b93f5d1/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
----------------------------------------------------------------------
diff --cc test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
index 77c66ed,cda0a6d..7dfce66
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
@@@ -76,9 -77,13 +76,13 @@@ public class ScanMeta extends Test
}
log.debug("Found " + hashes.size() + " hashes starting at " + uuid);
+
+ if (hashes.isEmpty()) {
+ return;
+ }
// use batch scanner to verify all of these exist in index
- BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Constants.NO_AUTHS, 3);
+ BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Authorizations.EMPTY, 3);
ArrayList<Range> ranges = new ArrayList<Range>();
for (Text row : hashes.keySet()) {
ranges.add(new Range(row));
[6/8] git commit: Merge branch '1.5' into 1.6
Posted by el...@apache.org.
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8b93f5d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8b93f5d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8b93f5d1
Branch: refs/heads/master
Commit: 8b93f5d18335e967f2adf73e0279d74bfbceac27
Parents: 87fbb4b 351c70e
Author: Josh Elser <el...@apache.org>
Authored: Sun Oct 26 20:28:54 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Oct 26 20:28:54 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b93f5d1/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
----------------------------------------------------------------------
diff --cc test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
index 77c66ed,cda0a6d..7dfce66
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
@@@ -76,9 -77,13 +76,13 @@@ public class ScanMeta extends Test
}
log.debug("Found " + hashes.size() + " hashes starting at " + uuid);
+
+ if (hashes.isEmpty()) {
+ return;
+ }
// use batch scanner to verify all of these exist in index
- BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Constants.NO_AUTHS, 3);
+ BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Authorizations.EMPTY, 3);
ArrayList<Range> ranges = new ArrayList<Range>();
for (Text row : hashes.keySet()) {
ranges.add(new Range(row));
[5/8] git commit: ACCUMULO-3261 Don't set empty ranges on the
BatchScanner.
Posted by el...@apache.org.
ACCUMULO-3261 Don't set empty ranges on the BatchScanner.
If ScanMeta is called early enough in the module,
it's possible that it will find no hashes in the
Image table and would attempt to set empty
ranges on the BatchScanner which throws an error.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/351c70eb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/351c70eb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/351c70eb
Branch: refs/heads/1.5
Commit: 351c70eb2dec11baf6606a0063d43a0e29890909
Parents: cc97c51
Author: Josh Elser <el...@apache.org>
Authored: Sun Oct 26 20:19:51 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Oct 26 20:19:51 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/351c70eb/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
index 5728f25..cda0a6d 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
@@ -77,6 +77,10 @@ public class ScanMeta extends Test {
}
log.debug("Found " + hashes.size() + " hashes starting at " + uuid);
+
+ if (hashes.isEmpty()) {
+ return;
+ }
// use batch scanner to verify all of these exist in index
BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Constants.NO_AUTHS, 3);
[2/8] git commit: Merge branch '1.5' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.5
Posted by el...@apache.org.
Merge branch '1.5' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cc97c512
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cc97c512
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cc97c512
Branch: refs/heads/master
Commit: cc97c51230956a61abe743555e2e956a3098e73d
Parents: f816e78 891584f
Author: Josh Elser <el...@apache.org>
Authored: Sun Oct 12 12:55:47 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Oct 12 12:55:47 2014 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------