[68/94] [abbrv] hbase git commit: HBASE-18348 The implementation of AsyncTableRegionLocator does not follow the javadoc

2017-07-17 Thread appy 
HBASE-18348 The implementation of AsyncTableRegionLocator does not follow the 
javadoc


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

Branch: refs/heads/HBASE-14070.HLC
Commit: f8e892d7aaa752db7a835f8969a676a9028c8448
Parents: 43492d2
Author: zhangduo 
Authored: Mon Jul 10 15:47:25 2017 +0800
Committer: zhangduo 
Committed: Tue Jul 11 11:43:35 2017 +0800

--
 .../hbase/client/AsyncMetaRegionLocator.java|  10 +-
 .../hbase/client/AsyncNonMetaRegionLocator.java |  24 +++--
 .../hadoop/hbase/client/AsyncRegionLocator.java |  21 ++--
 .../client/AsyncTableRegionLocatorImpl.java |   2 +-
 .../client/TestAsyncMetaRegionLocator.java  | 102 +++
 .../client/TestAsyncNonMetaRegionLocator.java   |  86 
 ...syncNonMetaRegionLocatorConcurrenyLimit.java |   2 +-
 7 files changed, 203 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f8e892d7/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
index 6e7dba7..600af34 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
@@ -45,11 +45,13 @@ class AsyncMetaRegionLocator {
 this.registry = registry;
   }
 
-  CompletableFuture getRegionLocation() {
+  CompletableFuture getRegionLocation(boolean reload) {
 for (;;) {
-  HRegionLocation metaRegionLocation = this.metaRegionLocation.get();
-  if (metaRegionLocation != null) {
-return CompletableFuture.completedFuture(metaRegionLocation);
+  if (!reload) {
+HRegionLocation metaRegionLocation = this.metaRegionLocation.get();
+if (metaRegionLocation != null) {
+  return CompletableFuture.completedFuture(metaRegionLocation);
+}
   }
   if (LOG.isTraceEnabled()) {
 LOG.trace("Meta region location cache is null, try fetching from 
registry.");

http://git-wip-us.apache.org/repos/asf/hbase/blob/f8e892d7/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
index 3dc9537..31f369c 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
@@ -392,22 +392,26 @@ class AsyncNonMetaRegionLocator {
   // placed before it. Used for reverse scan. See the comment of
   // AsyncRegionLocator.getPreviousRegionLocation.
   private CompletableFuture 
getRegionLocationInternal(TableName tableName,
-  byte[] row, RegionLocateType locateType) {
+  byte[] row, RegionLocateType locateType, boolean reload) {
 // AFTER should be convert to CURRENT before calling this method
 assert !locateType.equals(RegionLocateType.AFTER);
 TableCache tableCache = getTableCache(tableName);
-HRegionLocation loc = locateInCache(tableCache, tableName, row, 
locateType);
-if (loc != null) {
-  return CompletableFuture.completedFuture(loc);
+if (!reload) {
+  HRegionLocation loc = locateInCache(tableCache, tableName, row, 
locateType);
+  if (loc != null) {
+return CompletableFuture.completedFuture(loc);
+  }
 }
 CompletableFuture future;
 LocateRequest req;
 boolean sendRequest = false;
 synchronized (tableCache) {
   // check again
-  loc = locateInCache(tableCache, tableName, row, locateType);
-  if (loc != null) {
-return CompletableFuture.completedFuture(loc);
+  if (!reload) {
+HRegionLocation loc = locateInCache(tableCache, tableName, row, 
locateType);
+if (loc != null) {
+  return CompletableFuture.completedFuture(loc);
+}
   }
   req = new LocateRequest(row, locateType);
   future = tableCache.allRequests.get(req);
@@ -427,16 +431,16 @@ class AsyncNonMetaRegionLocator {
   }
 
   CompletableFuture getRegionLocation(TableName tableName, 
byte[] row,
-  RegionLocateType locateType) {
+  RegionLocateType locateType,

[12/22] hbase git commit: HBASE-18348 The implementation of AsyncTableRegionLocator does not follow the javadoc

2017-07-12 Thread busbey 
HBASE-18348 The implementation of AsyncTableRegionLocator does not follow the 
javadoc


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

Branch: refs/heads/HBASE-18147
Commit: f8e892d7aaa752db7a835f8969a676a9028c8448
Parents: 43492d2
Author: zhangduo 
Authored: Mon Jul 10 15:47:25 2017 +0800
Committer: zhangduo 
Committed: Tue Jul 11 11:43:35 2017 +0800

--
 .../hbase/client/AsyncMetaRegionLocator.java|  10 +-
 .../hbase/client/AsyncNonMetaRegionLocator.java |  24 +++--
 .../hadoop/hbase/client/AsyncRegionLocator.java |  21 ++--
 .../client/AsyncTableRegionLocatorImpl.java |   2 +-
 .../client/TestAsyncMetaRegionLocator.java  | 102 +++
 .../client/TestAsyncNonMetaRegionLocator.java   |  86 
 ...syncNonMetaRegionLocatorConcurrenyLimit.java |   2 +-
 7 files changed, 203 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f8e892d7/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
index 6e7dba7..600af34 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
@@ -45,11 +45,13 @@ class AsyncMetaRegionLocator {
 this.registry = registry;
   }
 
-  CompletableFuture getRegionLocation() {
+  CompletableFuture getRegionLocation(boolean reload) {
 for (;;) {
-  HRegionLocation metaRegionLocation = this.metaRegionLocation.get();
-  if (metaRegionLocation != null) {
-return CompletableFuture.completedFuture(metaRegionLocation);
+  if (!reload) {
+HRegionLocation metaRegionLocation = this.metaRegionLocation.get();
+if (metaRegionLocation != null) {
+  return CompletableFuture.completedFuture(metaRegionLocation);
+}
   }
   if (LOG.isTraceEnabled()) {
 LOG.trace("Meta region location cache is null, try fetching from 
registry.");

http://git-wip-us.apache.org/repos/asf/hbase/blob/f8e892d7/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
index 3dc9537..31f369c 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
@@ -392,22 +392,26 @@ class AsyncNonMetaRegionLocator {
   // placed before it. Used for reverse scan. See the comment of
   // AsyncRegionLocator.getPreviousRegionLocation.
   private CompletableFuture 
getRegionLocationInternal(TableName tableName,
-  byte[] row, RegionLocateType locateType) {
+  byte[] row, RegionLocateType locateType, boolean reload) {
 // AFTER should be convert to CURRENT before calling this method
 assert !locateType.equals(RegionLocateType.AFTER);
 TableCache tableCache = getTableCache(tableName);
-HRegionLocation loc = locateInCache(tableCache, tableName, row, 
locateType);
-if (loc != null) {
-  return CompletableFuture.completedFuture(loc);
+if (!reload) {
+  HRegionLocation loc = locateInCache(tableCache, tableName, row, 
locateType);
+  if (loc != null) {
+return CompletableFuture.completedFuture(loc);
+  }
 }
 CompletableFuture future;
 LocateRequest req;
 boolean sendRequest = false;
 synchronized (tableCache) {
   // check again
-  loc = locateInCache(tableCache, tableName, row, locateType);
-  if (loc != null) {
-return CompletableFuture.completedFuture(loc);
+  if (!reload) {
+HRegionLocation loc = locateInCache(tableCache, tableName, row, 
locateType);
+if (loc != null) {
+  return CompletableFuture.completedFuture(loc);
+}
   }
   req = new LocateRequest(row, locateType);
   future = tableCache.allRequests.get(req);
@@ -427,16 +431,16 @@ class AsyncNonMetaRegionLocator {
   }
 
   CompletableFuture getRegionLocation(TableName tableName, 
byte[] row,
-  RegionLocateType locateType) {
+  RegionLocateType locateType, boolean

hbase git commit: HBASE-18348 The implementation of AsyncTableRegionLocator does not follow the javadoc

2017-07-10 Thread zhangduo 
Repository: hbase
Updated Branches:
  refs/heads/master 43492d2d3 -> f8e892d7a


HBASE-18348 The implementation of AsyncTableRegionLocator does not follow the 
javadoc


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

Branch: refs/heads/master
Commit: f8e892d7aaa752db7a835f8969a676a9028c8448
Parents: 43492d2
Author: zhangduo 
Authored: Mon Jul 10 15:47:25 2017 +0800
Committer: zhangduo 
Committed: Tue Jul 11 11:43:35 2017 +0800

--
 .../hbase/client/AsyncMetaRegionLocator.java|  10 +-
 .../hbase/client/AsyncNonMetaRegionLocator.java |  24 +++--
 .../hadoop/hbase/client/AsyncRegionLocator.java |  21 ++--
 .../client/AsyncTableRegionLocatorImpl.java |   2 +-
 .../client/TestAsyncMetaRegionLocator.java  | 102 +++
 .../client/TestAsyncNonMetaRegionLocator.java   |  86 
 ...syncNonMetaRegionLocatorConcurrenyLimit.java |   2 +-
 7 files changed, 203 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f8e892d7/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
index 6e7dba7..600af34 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
@@ -45,11 +45,13 @@ class AsyncMetaRegionLocator {
 this.registry = registry;
   }
 
-  CompletableFuture getRegionLocation() {
+  CompletableFuture getRegionLocation(boolean reload) {
 for (;;) {
-  HRegionLocation metaRegionLocation = this.metaRegionLocation.get();
-  if (metaRegionLocation != null) {
-return CompletableFuture.completedFuture(metaRegionLocation);
+  if (!reload) {
+HRegionLocation metaRegionLocation = this.metaRegionLocation.get();
+if (metaRegionLocation != null) {
+  return CompletableFuture.completedFuture(metaRegionLocation);
+}
   }
   if (LOG.isTraceEnabled()) {
 LOG.trace("Meta region location cache is null, try fetching from 
registry.");

http://git-wip-us.apache.org/repos/asf/hbase/blob/f8e892d7/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
index 3dc9537..31f369c 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
@@ -392,22 +392,26 @@ class AsyncNonMetaRegionLocator {
   // placed before it. Used for reverse scan. See the comment of
   // AsyncRegionLocator.getPreviousRegionLocation.
   private CompletableFuture 
getRegionLocationInternal(TableName tableName,
-  byte[] row, RegionLocateType locateType) {
+  byte[] row, RegionLocateType locateType, boolean reload) {
 // AFTER should be convert to CURRENT before calling this method
 assert !locateType.equals(RegionLocateType.AFTER);
 TableCache tableCache = getTableCache(tableName);
-HRegionLocation loc = locateInCache(tableCache, tableName, row, 
locateType);
-if (loc != null) {
-  return CompletableFuture.completedFuture(loc);
+if (!reload) {
+  HRegionLocation loc = locateInCache(tableCache, tableName, row, 
locateType);
+  if (loc != null) {
+return CompletableFuture.completedFuture(loc);
+  }
 }
 CompletableFuture future;
 LocateRequest req;
 boolean sendRequest = false;
 synchronized (tableCache) {
   // check again
-  loc = locateInCache(tableCache, tableName, row, locateType);
-  if (loc != null) {
-return CompletableFuture.completedFuture(loc);
+  if (!reload) {
+HRegionLocation loc = locateInCache(tableCache, tableName, row, 
locateType);
+if (loc != null) {
+  return CompletableFuture.completedFuture(loc);
+}
   }
   req = new LocateRequest(row, locateType);
   future = tableCache.allRequests.get(req);
@@ -427,16 +431,16 @@ class AsyncNonMetaRegionLocator {
   }
 
   CompletableFuture getRegionLocation(TableName tableName, 
byte[] row,
-

hbase git commit: HBASE-18348 The implementation of AsyncTableRegionLocator does not follow the javadoc

2017-07-10 Thread zhangduo 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 6456c8bf8 -> 7acb226eb


HBASE-18348 The implementation of AsyncTableRegionLocator does not follow the 
javadoc


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

Branch: refs/heads/branch-2
Commit: 7acb226eb9693fdecbcaf0293687137e0386823a
Parents: 6456c8b
Author: zhangduo 
Authored: Mon Jul 10 15:47:25 2017 +0800
Committer: zhangduo 
Committed: Tue Jul 11 11:44:40 2017 +0800

--
 .../hbase/client/AsyncMetaRegionLocator.java|  10 +-
 .../hbase/client/AsyncNonMetaRegionLocator.java |  24 +++--
 .../hadoop/hbase/client/AsyncRegionLocator.java |  21 ++--
 .../client/AsyncTableRegionLocatorImpl.java |   2 +-
 .../client/TestAsyncMetaRegionLocator.java  | 102 +++
 .../client/TestAsyncNonMetaRegionLocator.java   |  86 
 ...syncNonMetaRegionLocatorConcurrenyLimit.java |   2 +-
 7 files changed, 203 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/7acb226e/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
index 6e7dba7..600af34 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncMetaRegionLocator.java
@@ -45,11 +45,13 @@ class AsyncMetaRegionLocator {
 this.registry = registry;
   }
 
-  CompletableFuture getRegionLocation() {
+  CompletableFuture getRegionLocation(boolean reload) {
 for (;;) {
-  HRegionLocation metaRegionLocation = this.metaRegionLocation.get();
-  if (metaRegionLocation != null) {
-return CompletableFuture.completedFuture(metaRegionLocation);
+  if (!reload) {
+HRegionLocation metaRegionLocation = this.metaRegionLocation.get();
+if (metaRegionLocation != null) {
+  return CompletableFuture.completedFuture(metaRegionLocation);
+}
   }
   if (LOG.isTraceEnabled()) {
 LOG.trace("Meta region location cache is null, try fetching from 
registry.");

http://git-wip-us.apache.org/repos/asf/hbase/blob/7acb226e/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
index 3dc9537..31f369c 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
@@ -392,22 +392,26 @@ class AsyncNonMetaRegionLocator {
   // placed before it. Used for reverse scan. See the comment of
   // AsyncRegionLocator.getPreviousRegionLocation.
   private CompletableFuture 
getRegionLocationInternal(TableName tableName,
-  byte[] row, RegionLocateType locateType) {
+  byte[] row, RegionLocateType locateType, boolean reload) {
 // AFTER should be convert to CURRENT before calling this method
 assert !locateType.equals(RegionLocateType.AFTER);
 TableCache tableCache = getTableCache(tableName);
-HRegionLocation loc = locateInCache(tableCache, tableName, row, 
locateType);
-if (loc != null) {
-  return CompletableFuture.completedFuture(loc);
+if (!reload) {
+  HRegionLocation loc = locateInCache(tableCache, tableName, row, 
locateType);
+  if (loc != null) {
+return CompletableFuture.completedFuture(loc);
+  }
 }
 CompletableFuture future;
 LocateRequest req;
 boolean sendRequest = false;
 synchronized (tableCache) {
   // check again
-  loc = locateInCache(tableCache, tableName, row, locateType);
-  if (loc != null) {
-return CompletableFuture.completedFuture(loc);
+  if (!reload) {
+HRegionLocation loc = locateInCache(tableCache, tableName, row, 
locateType);
+if (loc != null) {
+  return CompletableFuture.completedFuture(loc);
+}
   }
   req = new LocateRequest(row, locateType);
   future = tableCache.allRequests.get(req);
@@ -427,16 +431,16 @@ class AsyncNonMetaRegionLocator {
   }
 
   CompletableFuture getRegionLocation(TableName tableName, 
byte[] row,
-