Repository: hive Updated Branches: refs/heads/master 6875c7655 -> 29f57fc73
HIVE-19424: NPE In MetaDataFormatters (Alice Fan, reviewed by Aihua Xu) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/29f57fc7 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/29f57fc7 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/29f57fc7 Branch: refs/heads/master Commit: 29f57fc73ef46dc4b5b6ea7c74e493e3cb3e2f7f Parents: 6875c76 Author: Aihua Xu <[email protected]> Authored: Wed May 16 11:27:53 2018 -0700 Committer: Aihua Xu <[email protected]> Committed: Wed May 16 14:06:37 2018 -0700 ---------------------------------------------------------------------- .../hive/ql/metadata/formatting/JsonMetaDataFormatter.java | 8 ++++---- .../hive/ql/metadata/formatting/TextMetaDataFormatter.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/29f57fc7/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java ---------------------------------------------------------------------- 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 e7b5af6..df0a237 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 class JsonMetaDataFormatter implements MetaDataFormatter { 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(); http://git-wip-us.apache.org/repos/asf/hive/blob/29f57fc7/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java ---------------------------------------------------------------------- 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 2529923..326cbed 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 @@ class TextMetaDataFormatter implements MetaDataFormatter { 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();
