phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sama...@apache.org
Subject phoenix git commit: PHOENIX-4287 Add null check for parent name
Date Fri, 03 Nov 2017 00:57:36 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.12-HBase-1.2 e6a5660f9 -> 5ed99dc76


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/5ed99dc7
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5ed99dc7
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5ed99dc7

Branch: refs/heads/4.12-HBase-1.2
Commit: 5ed99dc760367b8d9c086be7abb0c9efe64ae6d2
Parents: e6a5660
Author: Samarth Jain <samarth@apache.org>
Authored: Thu Nov 2 17:57:32 2017 -0700
Committer: Samarth Jain <samarth@apache.org>
Committed: Thu Nov 2 17:57:32 2017 -0700

----------------------------------------------------------------------
 .../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/5ed99dc7/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 {


Mime
View raw message