From bc7da81bbd99d470fde9d88b677d3485735e2e5d Mon Sep 17 00:00:00 2001 From: Nishant Date: Fri, 30 Mar 2018 20:01:26 +0530 Subject: [PATCH] [HIVE-19049] Addendum patch to fix NPE during stats update --- .../src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java | 2 +- .../src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHook.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java index eca407ee93..0904bd16b0 100644 --- a/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java +++ b/druid-handler/src/java/org/apache/hadoop/hive/druid/DruidStorageHandler.java @@ -688,7 +688,7 @@ public static HttpClient getHttpClient() { @Override public void preAlterTable(Table table, EnvironmentContext context) throws MetaException { - String alterOpType = context.getProperties().get(ALTER_TABLE_OPERATION_TYPE); + String alterOpType = context == null ? null : context.getProperties().get(ALTER_TABLE_OPERATION_TYPE); // alterOpType is null in case of stats update if (alterOpType != null && !allowedAlterTypes.contains(alterOpType)) { throw new MetaException( diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHook.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHook.java index 280075dc87..ad596d11d7 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHook.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaHook.java @@ -110,7 +110,7 @@ public void commitDropTable(Table table, boolean deleteData) * @param table new table definition */ public default void preAlterTable(Table table, EnvironmentContext context) throws MetaException { - String alterOpType = context.getProperties().get(ALTER_TABLE_OPERATION_TYPE); + String alterOpType = context == null ? null : context.getProperties().get(ALTER_TABLE_OPERATION_TYPE); // By default allow only ADDPROPS and DROPPROPS. // alterOpType is null in case of stats update. if (alterOpType != null && !allowedAlterTypes.contains(alterOpType)){ -- 2.11.0 (Apple Git-81)