You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2018/03/23 02:22:02 UTC
[6/6] phoenix git commit: PHOENIX-4662 Avoid NPE when server-caches
are null (Csaba Skrabak)
PHOENIX-4662 Avoid NPE when server-caches are null (Csaba Skrabak)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2689b0a4
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2689b0a4
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2689b0a4
Branch: refs/heads/5.x-HBase-2.0
Commit: 2689b0a4598b2c8ac3ed1addf221208769c4fab2
Parents: 0bcf122
Author: Josh Elser <el...@apache.org>
Authored: Thu Mar 22 16:03:21 2018 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Mar 22 22:16:24 2018 -0400
----------------------------------------------------------------------
.../java/org/apache/phoenix/iterate/TableResultIterator.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/2689b0a4/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java
index c9e7bfb..92903c7 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java
@@ -198,9 +198,12 @@ public class TableResultIterator implements ResultIterator {
retry--;
try {
Long cacheId = ((HashJoinCacheNotFoundException) e1).getCacheId();
+
+ ServerCache cache = caches == null ? null :
+ caches.get(new ImmutableBytesPtr(Bytes.toBytes(cacheId)));
+
if (!hashCacheClient.addHashCacheToServer(newScan.getStartRow(),
- caches.get(new ImmutableBytesPtr(Bytes.toBytes(cacheId))),
- plan.getTableRef().getTable())) {
+ cache, plan.getTableRef().getTable())) {
throw e1;
}
this.scanIterator = ((BaseQueryPlan) plan).iterator(caches, scanGrouper, newScan);