commit 204030e8476bec5d60472190837a0ad44353446c Author: Alice Fan Date: Mon Jul 23 19:28:32 2018 -0700 HIVE-19424 : Fixing NPE In MetaDataFormatters at Branch-3 diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java index e7b5af6167..df0a2370a9 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java @@ -204,15 +204,15 @@ public void showTableStatus(DataOutputStream out, Hive db, HiveConf conf, if (par.getLocation() != null) { tblLoc = par.getDataLocation().toString(); } - inputFormattCls = par.getInputFormatClass().getName(); - outputFormattCls = par.getOutputFormatClass().getName(); + inputFormattCls = par.getInputFormatClass() == null ? null : par.getInputFormatClass().getName(); + outputFormattCls = par.getOutputFormatClass() == null ? null : par.getOutputFormatClass().getName(); } } else { if (tbl.getPath() != null) { tblLoc = tbl.getDataLocation().toString(); } - inputFormattCls = tbl.getInputFormatClass().getName(); - outputFormattCls = tbl.getOutputFormatClass().getName(); + inputFormattCls = tbl.getInputFormatClass() == null ? null : tbl.getInputFormatClass().getName(); + outputFormattCls = tbl.getOutputFormatClass() == null ? null : tbl.getOutputFormatClass().getName(); } MapBuilder builder = MapBuilder.create(); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java index 2529923419..326cbedcf0 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java @@ -291,15 +291,15 @@ public void showTableStatus(DataOutputStream outStream, if (par.getLocation() != null) { tblLoc = par.getDataLocation().toString(); } - inputFormattCls = par.getInputFormatClass().getName(); - outputFormattCls = par.getOutputFormatClass().getName(); + inputFormattCls = par.getInputFormatClass() == null ? null : par.getInputFormatClass().getName(); + outputFormattCls = par.getOutputFormatClass() == null ? null : par.getOutputFormatClass().getName(); } } else { if (tbl.getPath() != null) { tblLoc = tbl.getDataLocation().toString(); } - inputFormattCls = tbl.getInputFormatClass().getName(); - outputFormattCls = tbl.getOutputFormatClass().getName(); + inputFormattCls = tbl.getInputFormatClass() == null ? null : tbl.getInputFormatClass().getName(); + outputFormattCls = tbl.getOutputFormatClass() == null ? null : tbl.getOutputFormatClass().getName(); } String owner = tbl.getOwner();