[04/50] [abbrv] hbase git commit: HBASE-17125 Inconsistent result when use filter to read data

2017-08-17 Thread stack 
HBASE-17125 Inconsistent result when use filter to read data


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

Branch: refs/heads/HBASE-14070.HLC
Commit: 4dd24c52b84c74a477e00ab6177d081c29462dd8
Parents: c37432f
Author: Guanghao Zhang 
Authored: Thu Aug 10 21:03:50 2017 +0800
Committer: Guanghao Zhang 
Committed: Fri Aug 11 10:58:00 2017 +0800

--
 .../org/apache/hadoop/hbase/client/Get.java |  34 +++-
 .../org/apache/hadoop/hbase/client/Query.java   |   6 +-
 .../org/apache/hadoop/hbase/client/Scan.java|  29 ++-
 .../querymatcher/ScanQueryMatcher.java  |   7 +-
 .../querymatcher/ScanWildcardColumnTracker.java |   7 +-
 .../querymatcher/UserScanQueryMatcher.java  | 166 +++-
 .../hadoop/hbase/client/TestFromClientSide.java | 195 +++
 .../hadoop/hbase/regionserver/TestHRegion.java  |  64 ++
 .../hbase/regionserver/TestMinVersions.java |   8 +-
 .../hadoop/hbase/regionserver/TestStore.java|  19 +-
 10 files changed, 463 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/4dd24c52/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
--
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
index b774a9a..086a0b4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
@@ -267,10 +267,12 @@ public class Get extends Query
   /**
* Get all available versions.
* @return this for invocation chaining
+   * @deprecated It is easy to misunderstand with column family's max 
versions, so use
+   * {@link #readAllVersions()} instead.
*/
+  @Deprecated
   public Get setMaxVersions() {
-this.maxVersions = Integer.MAX_VALUE;
-return this;
+return readAllVersions();
   }
 
   /**
@@ -278,12 +280,34 @@ public class Get extends Query
* @param maxVersions maximum versions for each column
* @throws IOException if invalid number of versions
* @return this for invocation chaining
+   * @deprecated It is easy to misunderstand with column family's max 
versions, so use
+   * {@link #readVersions(int)} instead.
*/
+  @Deprecated
   public Get setMaxVersions(int maxVersions) throws IOException {
-if(maxVersions <= 0) {
-  throw new IOException("maxVersions must be positive");
+return readVersions(maxVersions);
+  }
+
+  /**
+   * Get all available versions.
+   * @return this for invocation chaining
+   */
+  public Get readAllVersions() {
+this.maxVersions = Integer.MAX_VALUE;
+return this;
+  }
+
+  /**
+   * Get up to the specified number of versions of each column.
+   * @param versions specified number of versions for each column
+   * @throws IOException if invalid number of versions
+   * @return this for invocation chaining
+   */
+  public Get readVersions(int versions) throws IOException {
+if (versions <= 0) {
+  throw new IOException("versions must be positive");
 }
-this.maxVersions = maxVersions;
+this.maxVersions = versions;
 return this;
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/4dd24c52/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
index 0bf54ae..cc9e9d4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
@@ -53,9 +53,9 @@ public abstract class Query extends OperationWithAttributes {
   }
 
   /**
-   * Apply the specified server-side filter when performing the Query.
-   * Only {@link Filter#filterKeyValue(org.apache.hadoop.hbase.Cell)} is 
called AFTER all tests
-   * for ttl, column match, deletes and max versions have been run.
+   * Apply the specified server-side filter when performing the Query. Only
+   * {@link Filter#filterKeyValue(org.apache.hadoop.hbase.Cell)} is called 
AFTER all tests for ttl,
+   * column match, deletes and column family's max versions have been run.
* @param filter filter to run on the server
* @return this for invocation chaining
*/

http://git-wip-us.apache.org/repos/asf/hbase/blob/4dd24c52/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
--

hbase git commit: HBASE-17125 Inconsistent result when use filter to read data

2017-08-10 Thread zghao 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 b3e7e31de -> 8197a31bb


HBASE-17125 Inconsistent result when use filter to read data


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

Branch: refs/heads/branch-2
Commit: 8197a31bbc4c49b4edfc2a0f01b3ef29b40e268d
Parents: b3e7e31
Author: Guanghao Zhang 
Authored: Thu Aug 10 21:03:50 2017 +0800
Committer: Guanghao Zhang 
Committed: Fri Aug 11 11:04:42 2017 +0800

--
 .../org/apache/hadoop/hbase/client/Get.java |  34 +++-
 .../org/apache/hadoop/hbase/client/Query.java   |   6 +-
 .../org/apache/hadoop/hbase/client/Scan.java|  29 ++-
 .../querymatcher/ScanQueryMatcher.java  |   7 +-
 .../querymatcher/ScanWildcardColumnTracker.java |   7 +-
 .../querymatcher/UserScanQueryMatcher.java  | 166 +++-
 .../hadoop/hbase/client/TestFromClientSide.java | 195 +++
 .../hadoop/hbase/regionserver/TestHRegion.java  |  64 ++
 .../hbase/regionserver/TestMinVersions.java |   8 +-
 .../hadoop/hbase/regionserver/TestStore.java|  19 +-
 10 files changed, 463 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/8197a31b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
--
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
index b774a9a..086a0b4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
@@ -267,10 +267,12 @@ public class Get extends Query
   /**
* Get all available versions.
* @return this for invocation chaining
+   * @deprecated It is easy to misunderstand with column family's max 
versions, so use
+   * {@link #readAllVersions()} instead.
*/
+  @Deprecated
   public Get setMaxVersions() {
-this.maxVersions = Integer.MAX_VALUE;
-return this;
+return readAllVersions();
   }
 
   /**
@@ -278,12 +280,34 @@ public class Get extends Query
* @param maxVersions maximum versions for each column
* @throws IOException if invalid number of versions
* @return this for invocation chaining
+   * @deprecated It is easy to misunderstand with column family's max 
versions, so use
+   * {@link #readVersions(int)} instead.
*/
+  @Deprecated
   public Get setMaxVersions(int maxVersions) throws IOException {
-if(maxVersions <= 0) {
-  throw new IOException("maxVersions must be positive");
+return readVersions(maxVersions);
+  }
+
+  /**
+   * Get all available versions.
+   * @return this for invocation chaining
+   */
+  public Get readAllVersions() {
+this.maxVersions = Integer.MAX_VALUE;
+return this;
+  }
+
+  /**
+   * Get up to the specified number of versions of each column.
+   * @param versions specified number of versions for each column
+   * @throws IOException if invalid number of versions
+   * @return this for invocation chaining
+   */
+  public Get readVersions(int versions) throws IOException {
+if (versions <= 0) {
+  throw new IOException("versions must be positive");
 }
-this.maxVersions = maxVersions;
+this.maxVersions = versions;
 return this;
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/8197a31b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
index 0bf54ae..cc9e9d4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
@@ -53,9 +53,9 @@ public abstract class Query extends OperationWithAttributes {
   }
 
   /**
-   * Apply the specified server-side filter when performing the Query.
-   * Only {@link Filter#filterKeyValue(org.apache.hadoop.hbase.Cell)} is 
called AFTER all tests
-   * for ttl, column match, deletes and max versions have been run.
+   * Apply the specified server-side filter when performing the Query. Only
+   * {@link Filter#filterKeyValue(org.apache.hadoop.hbase.Cell)} is called 
AFTER all tests for ttl,
+   * column match, deletes and column family's max versions have been run.
* @param filter filter to run on the server
* @return this for invocation chaining
*/

http://git-wip-us.apache.org/repos/asf/hbase/blob/8197a31b/hbase-client/src/main/java/org/apache/

hbase git commit: HBASE-17125 Inconsistent result when use filter to read data

2017-08-10 Thread zghao 
Repository: hbase
Updated Branches:
  refs/heads/master c37432fef -> 4dd24c52b


HBASE-17125 Inconsistent result when use filter to read data


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

Branch: refs/heads/master
Commit: 4dd24c52b84c74a477e00ab6177d081c29462dd8
Parents: c37432f
Author: Guanghao Zhang 
Authored: Thu Aug 10 21:03:50 2017 +0800
Committer: Guanghao Zhang 
Committed: Fri Aug 11 10:58:00 2017 +0800

--
 .../org/apache/hadoop/hbase/client/Get.java |  34 +++-
 .../org/apache/hadoop/hbase/client/Query.java   |   6 +-
 .../org/apache/hadoop/hbase/client/Scan.java|  29 ++-
 .../querymatcher/ScanQueryMatcher.java  |   7 +-
 .../querymatcher/ScanWildcardColumnTracker.java |   7 +-
 .../querymatcher/UserScanQueryMatcher.java  | 166 +++-
 .../hadoop/hbase/client/TestFromClientSide.java | 195 +++
 .../hadoop/hbase/regionserver/TestHRegion.java  |  64 ++
 .../hbase/regionserver/TestMinVersions.java |   8 +-
 .../hadoop/hbase/regionserver/TestStore.java|  19 +-
 10 files changed, 463 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/4dd24c52/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
--
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
index b774a9a..086a0b4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
@@ -267,10 +267,12 @@ public class Get extends Query
   /**
* Get all available versions.
* @return this for invocation chaining
+   * @deprecated It is easy to misunderstand with column family's max 
versions, so use
+   * {@link #readAllVersions()} instead.
*/
+  @Deprecated
   public Get setMaxVersions() {
-this.maxVersions = Integer.MAX_VALUE;
-return this;
+return readAllVersions();
   }
 
   /**
@@ -278,12 +280,34 @@ public class Get extends Query
* @param maxVersions maximum versions for each column
* @throws IOException if invalid number of versions
* @return this for invocation chaining
+   * @deprecated It is easy to misunderstand with column family's max 
versions, so use
+   * {@link #readVersions(int)} instead.
*/
+  @Deprecated
   public Get setMaxVersions(int maxVersions) throws IOException {
-if(maxVersions <= 0) {
-  throw new IOException("maxVersions must be positive");
+return readVersions(maxVersions);
+  }
+
+  /**
+   * Get all available versions.
+   * @return this for invocation chaining
+   */
+  public Get readAllVersions() {
+this.maxVersions = Integer.MAX_VALUE;
+return this;
+  }
+
+  /**
+   * Get up to the specified number of versions of each column.
+   * @param versions specified number of versions for each column
+   * @throws IOException if invalid number of versions
+   * @return this for invocation chaining
+   */
+  public Get readVersions(int versions) throws IOException {
+if (versions <= 0) {
+  throw new IOException("versions must be positive");
 }
-this.maxVersions = maxVersions;
+this.maxVersions = versions;
 return this;
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/4dd24c52/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
index 0bf54ae..cc9e9d4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
@@ -53,9 +53,9 @@ public abstract class Query extends OperationWithAttributes {
   }
 
   /**
-   * Apply the specified server-side filter when performing the Query.
-   * Only {@link Filter#filterKeyValue(org.apache.hadoop.hbase.Cell)} is 
called AFTER all tests
-   * for ttl, column match, deletes and max versions have been run.
+   * Apply the specified server-side filter when performing the Query. Only
+   * {@link Filter#filterKeyValue(org.apache.hadoop.hbase.Cell)} is called 
AFTER all tests for ttl,
+   * column match, deletes and column family's max versions have been run.
* @param filter filter to run on the server
* @return this for invocation chaining
*/

http://git-wip-us.apache.org/repos/asf/hbase/blob/4dd24c52/hbase-client/src/main/java/org/apache/hado