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/05/25 00:32:12 UTC

[1/8] git commit: Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT

Repository: accumulo
Updated Branches:
  refs/heads/1.5.2-SNAPSHOT cff4c2d1a -> 9fbc24abe
  refs/heads/1.6.1-SNAPSHOT c9c3fdd4f -> 7c17eb169
  refs/heads/master d6b1e9a95 -> 0712ec972


Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT


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

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: cff4c2d1aa9a7f6e36c6e29cb1ffa22183cf4ea9
Parents: 5d4cf3b 0d4f4b1
Author: Josh Elser <el...@apache.org>
Authored: Fri May 23 20:31:03 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri May 23 20:31:03 2014 -0400

----------------------------------------------------------------------
 .../random/RandomByteArrayMakerFunction.java    | 60 --------------------
 .../test/stress/random/RandomByteArrays.java    | 14 ++---
 .../test/stress/random/RandomMutations.java     | 11 +++-
 .../test/stress/random/RandomWithinRange.java   | 59 +++++++++++++++++++
 .../accumulo/test/stress/random/Write.java      | 33 +++++++----
 .../test/stress/random/WriteOptions.java        | 19 ++++++-
 test/system/stress/writer.sh                    |  4 +-
 7 files changed, 114 insertions(+), 86 deletions(-)
----------------------------------------------------------------------



[2/8] git commit: Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT

Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT


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

Branch: refs/heads/master
Commit: cff4c2d1aa9a7f6e36c6e29cb1ffa22183cf4ea9
Parents: 5d4cf3b 0d4f4b1
Author: Josh Elser <el...@apache.org>
Authored: Fri May 23 20:31:03 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri May 23 20:31:03 2014 -0400

----------------------------------------------------------------------
 .../random/RandomByteArrayMakerFunction.java    | 60 --------------------
 .../test/stress/random/RandomByteArrays.java    | 14 ++---
 .../test/stress/random/RandomMutations.java     | 11 +++-
 .../test/stress/random/RandomWithinRange.java   | 59 +++++++++++++++++++
 .../accumulo/test/stress/random/Write.java      | 33 +++++++----
 .../test/stress/random/WriteOptions.java        | 19 ++++++-
 test/system/stress/writer.sh                    |  4 +-
 7 files changed, 114 insertions(+), 86 deletions(-)
----------------------------------------------------------------------



[6/8] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT


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

Branch: refs/heads/master
Commit: 7c17eb169c2ea367a3ce6bd67787600ff8fb3ffd
Parents: c9c3fdd 9fbc24a
Author: Josh Elser <el...@apache.org>
Authored: Sat May 24 18:22:04 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat May 24 18:22:04 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/util/LocalityGroupUtil.java     | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7c17eb16/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
----------------------------------------------------------------------


[3/8] git commit: ACCUMULO-2578: Throw exception when offset is non-zero.

Posted by el...@apache.org.
ACCUMULO-2578: Throw exception when offset is non-zero.

Signed-off-by: Josh Elser <el...@apache.org>


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

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 9fbc24abea69aa1da162d48a93ddc09970bdb6e1
Parents: cff4c2d
Author: Gary Singh <ga...@sabre-eng.com>
Authored: Fri May 16 13:13:02 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat May 24 18:15:54 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/util/LocalityGroupUtil.java     | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9fbc24ab/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
index 6efd098..da3593d 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
@@ -155,6 +155,9 @@ public class LocalityGroupUtil {
   }
   
   public static String encodeColumnFamily(ByteSequence bs) {
+    if (bs.offset() != 0) {
+      throw new IllegalArgumentException("The offset cannot be non-zero.");
+    }
     return encodeColumnFamily(new StringBuilder(), bs.getBackingArray(), bs.length());
   }
   


[7/8] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT


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

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 7c17eb169c2ea367a3ce6bd67787600ff8fb3ffd
Parents: c9c3fdd 9fbc24a
Author: Josh Elser <el...@apache.org>
Authored: Sat May 24 18:22:04 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat May 24 18:22:04 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/util/LocalityGroupUtil.java     | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7c17eb16/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
----------------------------------------------------------------------


[8/8] git commit: Merge branch '1.6.1-SNAPSHOT'

Posted by el...@apache.org.
Merge branch '1.6.1-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 0712ec97243d4524d3ca8553a64a0fa1c2e5d02d
Parents: d6b1e9a 7c17eb1
Author: Josh Elser <el...@apache.org>
Authored: Sat May 24 18:22:23 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat May 24 18:22:23 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/util/LocalityGroupUtil.java     | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0712ec97/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
----------------------------------------------------------------------


[5/8] git commit: ACCUMULO-2578: Throw exception when offset is non-zero.

Posted by el...@apache.org.
ACCUMULO-2578: Throw exception when offset is non-zero.

Signed-off-by: Josh Elser <el...@apache.org>


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

Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 9fbc24abea69aa1da162d48a93ddc09970bdb6e1
Parents: cff4c2d
Author: Gary Singh <ga...@sabre-eng.com>
Authored: Fri May 16 13:13:02 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat May 24 18:15:54 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/util/LocalityGroupUtil.java     | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9fbc24ab/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
index 6efd098..da3593d 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
@@ -155,6 +155,9 @@ public class LocalityGroupUtil {
   }
   
   public static String encodeColumnFamily(ByteSequence bs) {
+    if (bs.offset() != 0) {
+      throw new IllegalArgumentException("The offset cannot be non-zero.");
+    }
     return encodeColumnFamily(new StringBuilder(), bs.getBackingArray(), bs.length());
   }
   


[4/8] git commit: ACCUMULO-2578: Throw exception when offset is non-zero.

Posted by el...@apache.org.
ACCUMULO-2578: Throw exception when offset is non-zero.

Signed-off-by: Josh Elser <el...@apache.org>


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

Branch: refs/heads/master
Commit: 9fbc24abea69aa1da162d48a93ddc09970bdb6e1
Parents: cff4c2d
Author: Gary Singh <ga...@sabre-eng.com>
Authored: Fri May 16 13:13:02 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat May 24 18:15:54 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/util/LocalityGroupUtil.java     | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9fbc24ab/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
index 6efd098..da3593d 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
@@ -155,6 +155,9 @@ public class LocalityGroupUtil {
   }
   
   public static String encodeColumnFamily(ByteSequence bs) {
+    if (bs.offset() != 0) {
+      throw new IllegalArgumentException("The offset cannot be non-zero.");
+    }
     return encodeColumnFamily(new StringBuilder(), bs.getBackingArray(), bs.length());
   }