You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2017/11/15 18:48:28 UTC
[33/37] phoenix git commit: PHOENIX-4287 Add null check for parent
name
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/a50aab00
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a50aab00
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a50aab00
Branch: refs/heads/4.x-HBase-1.1
Commit: a50aab0063dbbb95d7e21922871aaac18fdc90e1
Parents: f974679
Author: Samarth Jain <sa...@apache.org>
Authored: Thu Nov 2 17:52:32 2017 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Wed Nov 15 10:46:41 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/a50aab00/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 {