Repository: hbase Updated Branches: refs/heads/master 6e3ffd03e -> 476973654
Revert "HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append" Wrong author information This reverts commit 6e3ffd03e7a27274315b859a3b624736ef0ed20b. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0a3a9a54 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0a3a9a54 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0a3a9a54 Branch: refs/heads/master Commit: 0a3a9a5417932da30d12dda2baa1464d4294ace4 Parents: 6e3ffd0 Author: Chia-Ping Tsai <chia7...@gmail.com> Authored: Mon Sep 4 16:19:44 2017 +0800 Committer: Chia-Ping Tsai <chia7...@gmail.com> Committed: Mon Sep 4 16:19:44 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/client/Append.java | 7 ++++--- .../org/apache/hadoop/hbase/client/Increment.java | 7 ++++--- .../java/org/apache/hadoop/hbase/client/Table.java | 14 ++++++++------ 3 files changed, 16 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0a3a9a54/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java index 56b5c42..6947313 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java @@ -34,9 +34,10 @@ import org.apache.hadoop.hbase.util.Bytes; /** * Performs Append operations on a single row. * <p> - * This operation ensures atomicty to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, and - * readers are guaranteed to see this operation fully completed. + * Note that this operation does not appear atomic to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, but + * readers do not take row locks so get and scan operations can see this + * operation partially completed. * <p> * To append to a set of columns of a row, instantiate an Append object with the * row to append to. At least one column to append must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/0a3a9a54/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java index a5765c3..c144c87 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java @@ -38,9 +38,10 @@ import org.apache.hadoop.hbase.util.ClassSize; /** * Used to perform Increment operations on a single row. * <p> - * This operation ensures atomicity to readers. Increments are done - * under a single row lock, so write operations to a row are synchronized, and - * readers are guaranteed to see this operation fully completed. + * This operation does not appear atomic to readers. Increments are done + * under a single row lock, so write operations to a row are synchronized, but + * readers do not take row locks so get and scan operations can see this + * operation partially completed. * <p> * To increment columns of a row, instantiate an Increment object with the row * to increment. At least one column to increment must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/0a3a9a54/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java index 0aaf6dd..a215903 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java @@ -326,9 +326,10 @@ public interface Table extends Closeable { /** * Appends values to one or more columns within a single row. * <p> - * This operation guaranteed atomicity to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, and - * readers are guaranteed to see this operation fully completed. + * This operation does not appear atomic to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, but + * readers do not take row locks so get and scan operations can see this + * operation partially completed. * * @param append object that specifies the columns and amounts to be used * for the increment operations @@ -340,9 +341,10 @@ public interface Table extends Closeable { /** * Increments one or more columns within a single row. * <p> - * This operation ensures atomicity to readers. Increments are done - * under a single row lock, so write operations to a row are synchronized, and - * readers are guaranteed to see this operation fully completed. + * This operation does not appear atomic to readers. Increments are done + * under a single row lock, so write operations to a row are synchronized, but + * readers do not take row locks so get and scan operations can see this + * operation partially completed. * * @param increment object that specifies the columns and amounts to be used * for the increment operations
