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:21:57 UTC
[1/6] phoenix git commit: PHOENIX-4662 Avoid NPE when server-caches
are null (Csaba Skrabak)
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 421620138 -> 70e1be931
refs/heads/4.x-HBase-1.1 c1f7bbe32 -> 94ae688d1
refs/heads/4.x-HBase-1.2 0fef552f6 -> 64b9f6ffc
refs/heads/4.x-HBase-1.3 45e75de76 -> d1c48b6d7
refs/heads/5.x-HBase-2.0 0bcf1227b -> 2689b0a45
refs/heads/master 383d1a5ac -> e3889e2c1
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/e3889e2c
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e3889e2c
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e3889e2c
Branch: refs/heads/master
Commit: e3889e2c1c9f935f1d304b4592e751b10035acc9
Parents: 383d1a5
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 16:04:25 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/e3889e2c/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 e812854..f6902cc 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);
[6/6] phoenix git commit: PHOENIX-4662 Avoid NPE when server-caches
are null (Csaba Skrabak)
Posted by el...@apache.org.
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);
[5/6] phoenix git commit: PHOENIX-4662 Avoid NPE when server-caches
are null (Csaba Skrabak)
Posted by el...@apache.org.
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/70e1be93
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/70e1be93
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/70e1be93
Branch: refs/heads/4.x-HBase-0.98
Commit: 70e1be931881222705a47f8738ec423dc41a28fe
Parents: 4216201
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:12:38 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/70e1be93/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 5a3b77b..9c2df64 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
@@ -199,9 +199,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);
[2/6] phoenix git commit: PHOENIX-4662 Avoid NPE when server-caches
are null (Csaba Skrabak)
Posted by el...@apache.org.
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/d1c48b6d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d1c48b6d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d1c48b6d
Branch: refs/heads/4.x-HBase-1.3
Commit: d1c48b6d7a903f3a7a87222bcf1cf514b062f83c
Parents: 45e75de
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 16:31:19 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/d1c48b6d/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 e812854..f6902cc 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);
[3/6] phoenix git commit: PHOENIX-4662 Avoid NPE when server-caches
are null (Csaba Skrabak)
Posted by el...@apache.org.
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/64b9f6ff
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/64b9f6ff
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/64b9f6ff
Branch: refs/heads/4.x-HBase-1.2
Commit: 64b9f6ffc3228fd5b4c9140de1d4a3621c0b472a
Parents: 0fef552
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 21:45:06 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/64b9f6ff/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 e812854..f6902cc 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);
[4/6] phoenix git commit: PHOENIX-4662 Avoid NPE when server-caches
are null (Csaba Skrabak)
Posted by el...@apache.org.
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/94ae688d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/94ae688d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/94ae688d
Branch: refs/heads/4.x-HBase-1.1
Commit: 94ae688d138d086843a8dca0408b8861feaf5e70
Parents: c1f7bbe
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 21:57:54 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/94ae688d/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 e812854..f6902cc 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);