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 2016/07/18 22:04:51 UTC

[1/3] accumulo git commit: ACCUMULO-4378 Add @since 1.8.0 to new Key constructors

Repository: accumulo
Updated Branches:
  refs/heads/1.8 3ee5af077 -> 3c88febfd
  refs/heads/master 7ad5dd68d -> 621e0f26e


ACCUMULO-4378 Add @since 1.8.0 to new Key constructors

Closes apache/accumulo#127

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/3c88febf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c88febf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c88febf

Branch: refs/heads/1.8
Commit: 3c88febfde4a8602441bcb1d8f1df82a792d68c1
Parents: 3ee5af0
Author: Mario Pastorelli <ma...@teralytics.ch>
Authored: Mon Jul 18 23:12:42 2016 +0200
Committer: Josh Elser <el...@apache.org>
Committed: Mon Jul 18 18:04:07 2016 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/data/Key.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3c88febf/core/src/main/java/org/apache/accumulo/core/data/Key.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Key.java b/core/src/main/java/org/apache/accumulo/core/data/Key.java
index f7737dc..66ad5ca 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Key.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Key.java
@@ -113,6 +113,7 @@ public class Key implements WritableComparable<Key>, Cloneable {
    *
    * @param row
    *          row ID
+   * @since 1.8.0
    */
   public Key(byte[] row) {
     init(row, 0, row.length, EMPTY_BYTES, 0, 0, EMPTY_BYTES, 0, 0, EMPTY_BYTES, 0, 0, Long.MAX_VALUE, false, true);
@@ -141,6 +142,7 @@ public class Key implements WritableComparable<Key>, Cloneable {
    *          row ID
    * @param ts
    *          timestamp
+   * @since 1.8.0
    */
   public Key(byte[] row, long ts) {
     this(row);
@@ -256,6 +258,8 @@ public class Key implements WritableComparable<Key>, Cloneable {
    * Creates a key with the specified row, the specified column family, empty column qualifier, empty column visibility, timestamp {@link Long#MAX_VALUE}, and
    * delete marker false. This constructor creates a copy of each specified array. If you don't want to create a copy of the arrays, you should call
    * {@link Key#Key(byte[] row, byte[] cf, byte[] cq, byte[] cv, long ts, boolean deleted, boolean copy)} instead.
+   *
+   * @since 1.8.0
    */
   public Key(byte[] row, byte[] cf) {
     init(row, 0, row.length, cf, 0, cf.length, EMPTY_BYTES, 0, 0, EMPTY_BYTES, 0, 0, Long.MAX_VALUE, false, true);
@@ -273,6 +277,8 @@ public class Key implements WritableComparable<Key>, Cloneable {
    * Creates a key with the specified row, the specified column family, the specified column qualifier, empty column visibility, timestamp
    * {@link Long#MAX_VALUE}, and delete marker false. This constructor creates a copy of each specified array. If you don't want to create a copy of the arrays,
    * you should call {@link Key#Key(byte[] row, byte[] cf, byte[] cq, byte[] cv, long ts, boolean deleted, boolean copy)} instead.
+   *
+   * @since 1.8.0
    */
   public Key(byte[] row, byte[] cf, byte[] cq) {
     init(row, 0, row.length, cf, 0, cf.length, cq, 0, cq.length, EMPTY_BYTES, 0, 0, Long.MAX_VALUE, false, true);
@@ -291,6 +297,8 @@ public class Key implements WritableComparable<Key>, Cloneable {
    * Creates a key with the specified row, the specified column family, the specified column qualifier, the specified column visibility, timestamp
    * {@link Long#MAX_VALUE}, and delete marker false. This constructor creates a copy of each specified array. If you don't want to create a copy of the arrays,
    * you should call {@link Key#Key(byte[] row, byte[] cf, byte[] cq, byte[] cv, long ts, boolean deleted, boolean copy)} instead.
+   *
+   * @since 1.8.0
    */
   public Key(byte[] row, byte[] cf, byte[] cq, byte[] cv) {
     init(row, 0, row.length, cf, 0, cf.length, cq, 0, cq.length, cv, 0, cv.length, Long.MAX_VALUE, false, true);
@@ -308,6 +316,8 @@ public class Key implements WritableComparable<Key>, Cloneable {
    * Creates a key with the specified row, the specified column family, the specified column qualifier, empty column visibility, the specified timestamp, and
    * delete marker false. This constructor creates a copy of each specified array. If you don't want to create a copy of the arrays, you should call
    * {@link Key#Key(byte[] row, byte[] cf, byte[] cq, byte[] cv, long ts, boolean deleted, boolean copy)} instead.
+   *
+   * @since 1.8.0
    */
   public Key(byte[] row, byte[] cf, byte[] cq, long ts) {
     init(row, 0, row.length, cf, 0, cf.length, cq, 0, cq.length, EMPTY_BYTES, 0, 0, ts, false, true);
@@ -335,6 +345,8 @@ public class Key implements WritableComparable<Key>, Cloneable {
    * Creates a key with the specified row, the specified column family, the specified column qualifier, the specified column visibility, the specified
    * timestamp, and delete marker false. This constructor creates a copy of each specified array. If you don't want to create a copy of the arrays, you should
    * call {@link Key#Key(byte[] row, byte[] cf, byte[] cq, byte[] cv, long ts, boolean deleted, boolean copy)} instead.
+   *
+   * @since 1.8.0
    */
   public Key(byte[] row, byte[] cf, byte[] cq, ColumnVisibility cv, long ts) {
     byte[] expr = cv.getExpression();


[2/3] accumulo git commit: ACCUMULO-4378 Add @since 1.8.0 to new Key constructors

Posted by el...@apache.org.
ACCUMULO-4378 Add @since 1.8.0 to new Key constructors

Closes apache/accumulo#127

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/3c88febf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c88febf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c88febf

Branch: refs/heads/master
Commit: 3c88febfde4a8602441bcb1d8f1df82a792d68c1
Parents: 3ee5af0
Author: Mario Pastorelli <ma...@teralytics.ch>
Authored: Mon Jul 18 23:12:42 2016 +0200
Committer: Josh Elser <el...@apache.org>
Committed: Mon Jul 18 18:04:07 2016 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/data/Key.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3c88febf/core/src/main/java/org/apache/accumulo/core/data/Key.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Key.java b/core/src/main/java/org/apache/accumulo/core/data/Key.java
index f7737dc..66ad5ca 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Key.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Key.java
@@ -113,6 +113,7 @@ public class Key implements WritableComparable<Key>, Cloneable {
    *
    * @param row
    *          row ID
+   * @since 1.8.0
    */
   public Key(byte[] row) {
     init(row, 0, row.length, EMPTY_BYTES, 0, 0, EMPTY_BYTES, 0, 0, EMPTY_BYTES, 0, 0, Long.MAX_VALUE, false, true);
@@ -141,6 +142,7 @@ public class Key implements WritableComparable<Key>, Cloneable {
    *          row ID
    * @param ts
    *          timestamp
+   * @since 1.8.0
    */
   public Key(byte[] row, long ts) {
     this(row);
@@ -256,6 +258,8 @@ public class Key implements WritableComparable<Key>, Cloneable {
    * Creates a key with the specified row, the specified column family, empty column qualifier, empty column visibility, timestamp {@link Long#MAX_VALUE}, and
    * delete marker false. This constructor creates a copy of each specified array. If you don't want to create a copy of the arrays, you should call
    * {@link Key#Key(byte[] row, byte[] cf, byte[] cq, byte[] cv, long ts, boolean deleted, boolean copy)} instead.
+   *
+   * @since 1.8.0
    */
   public Key(byte[] row, byte[] cf) {
     init(row, 0, row.length, cf, 0, cf.length, EMPTY_BYTES, 0, 0, EMPTY_BYTES, 0, 0, Long.MAX_VALUE, false, true);
@@ -273,6 +277,8 @@ public class Key implements WritableComparable<Key>, Cloneable {
    * Creates a key with the specified row, the specified column family, the specified column qualifier, empty column visibility, timestamp
    * {@link Long#MAX_VALUE}, and delete marker false. This constructor creates a copy of each specified array. If you don't want to create a copy of the arrays,
    * you should call {@link Key#Key(byte[] row, byte[] cf, byte[] cq, byte[] cv, long ts, boolean deleted, boolean copy)} instead.
+   *
+   * @since 1.8.0
    */
   public Key(byte[] row, byte[] cf, byte[] cq) {
     init(row, 0, row.length, cf, 0, cf.length, cq, 0, cq.length, EMPTY_BYTES, 0, 0, Long.MAX_VALUE, false, true);
@@ -291,6 +297,8 @@ public class Key implements WritableComparable<Key>, Cloneable {
    * Creates a key with the specified row, the specified column family, the specified column qualifier, the specified column visibility, timestamp
    * {@link Long#MAX_VALUE}, and delete marker false. This constructor creates a copy of each specified array. If you don't want to create a copy of the arrays,
    * you should call {@link Key#Key(byte[] row, byte[] cf, byte[] cq, byte[] cv, long ts, boolean deleted, boolean copy)} instead.
+   *
+   * @since 1.8.0
    */
   public Key(byte[] row, byte[] cf, byte[] cq, byte[] cv) {
     init(row, 0, row.length, cf, 0, cf.length, cq, 0, cq.length, cv, 0, cv.length, Long.MAX_VALUE, false, true);
@@ -308,6 +316,8 @@ public class Key implements WritableComparable<Key>, Cloneable {
    * Creates a key with the specified row, the specified column family, the specified column qualifier, empty column visibility, the specified timestamp, and
    * delete marker false. This constructor creates a copy of each specified array. If you don't want to create a copy of the arrays, you should call
    * {@link Key#Key(byte[] row, byte[] cf, byte[] cq, byte[] cv, long ts, boolean deleted, boolean copy)} instead.
+   *
+   * @since 1.8.0
    */
   public Key(byte[] row, byte[] cf, byte[] cq, long ts) {
     init(row, 0, row.length, cf, 0, cf.length, cq, 0, cq.length, EMPTY_BYTES, 0, 0, ts, false, true);
@@ -335,6 +345,8 @@ public class Key implements WritableComparable<Key>, Cloneable {
    * Creates a key with the specified row, the specified column family, the specified column qualifier, the specified column visibility, the specified
    * timestamp, and delete marker false. This constructor creates a copy of each specified array. If you don't want to create a copy of the arrays, you should
    * call {@link Key#Key(byte[] row, byte[] cf, byte[] cq, byte[] cv, long ts, boolean deleted, boolean copy)} instead.
+   *
+   * @since 1.8.0
    */
   public Key(byte[] row, byte[] cf, byte[] cq, ColumnVisibility cv, long ts) {
     byte[] expr = cv.getExpression();


[3/3] accumulo git commit: Merge branch '1.8'

Posted by el...@apache.org.
Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 621e0f26ed911ae78d4a567ad43bee39fc35afb5
Parents: 7ad5dd6 3c88feb
Author: Josh Elser <el...@apache.org>
Authored: Mon Jul 18 18:04:28 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Jul 18 18:04:28 2016 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/data/Key.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------