PHOENIX-4287 Add null check for parent name
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cc604b7e Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cc604b7e Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cc604b7e Branch: refs/heads/4.x-HBase-1.2 Commit: cc604b7edf7deda8e916aecab0a09d9a25e7455b Parents: 6ee2241 Author: Samarth Jain <[email protected]> Authored: Thu Nov 2 17:52:32 2017 -0700 Committer: James Taylor <[email protected]> Committed: Wed Nov 15 10:02:14 2017 -0800 ---------------------------------------------------------------------- .../java/org/apache/phoenix/iterate/BaseResultIterators.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/cc604b7e/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java index 18f28e2..eb09813 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java @@ -1246,9 +1246,10 @@ public abstract class BaseResultIterators extends ExplainTable implements Result } /* * For a view index, we use the property set on view. For indexes on base table, whether - * global or local, we use the property set on the base table. + * global or local, we use the property set on the base table. Null check needed when + * dropping local indexes. */ - if (table.getType() == PTableType.INDEX) { + if (table.getType() == PTableType.INDEX && table.getParentName() != null) { PhoenixConnection conn = context.getConnection(); String parentTableName = table.getParentName().getString(); try {
