Repository: incubator-gobblin Updated Branches: refs/heads/master 68456c620 -> 056888e02
[GOBBLIN-286] gix bug where non hive dataset publishing gives NPE Closes #2148 from arjun4084346/fixBugNonHiveDataset Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/056888e0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/056888e0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/056888e0 Branch: refs/heads/master Commit: 056888e0248ab75f9d3a789c3d14622a9a426bb6 Parents: 68456c6 Author: Arjun <[email protected]> Authored: Tue Oct 24 10:00:59 2017 -0700 Committer: Hung Tran <[email protected]> Committed: Tue Oct 24 10:00:59 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/gobblin/data/management/copy/CopyEntity.java | 2 +- .../gobblin/data/management/copy/CopyableDatasetMetadata.java | 2 +- .../data/management/copy/publisher/CopyDataPublisher.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/056888e0/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopyEntity.java ---------------------------------------------------------------------- diff --git a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopyEntity.java b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopyEntity.java index 93cb3b3..cd4b97e 100644 --- a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopyEntity.java +++ b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopyEntity.java @@ -118,7 +118,7 @@ public class CopyEntity implements HasGuid { */ public static String getSerializedWithNewPackage(String serialized) { serialized = serialized.replace("\"gobblin.data.management.", "\"org.apache.gobblin.data.management."); - log.info("Serialized updated copy entity: " + serialized); + log.debug("Serialized updated copy entity: " + serialized); return serialized; } http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/056888e0/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopyableDatasetMetadata.java ---------------------------------------------------------------------- diff --git a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopyableDatasetMetadata.java b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopyableDatasetMetadata.java index 004156b..45b71ab 100644 --- a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopyableDatasetMetadata.java +++ b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopyableDatasetMetadata.java @@ -69,7 +69,7 @@ public class CopyableDatasetMetadata { */ private static String getSerializedWithNewPackage(String serialized) { serialized = serialized.replace("\"gobblin.data.management.", "\"org.apache.gobblin.data.management."); - log.info("Serialized updated copy entity: " + serialized); + log.debug("Serialized updated copy entity: " + serialized); return serialized; } } http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/056888e0/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/publisher/CopyDataPublisher.java ---------------------------------------------------------------------- diff --git a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/publisher/CopyDataPublisher.java b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/publisher/CopyDataPublisher.java index 8092de6..e443271 100644 --- a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/publisher/CopyDataPublisher.java +++ b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/publisher/CopyDataPublisher.java @@ -209,7 +209,9 @@ public class CopyDataPublisher extends DataPublisher implements UnpublishedHandl // Dataset Output path is injected in each copyableFile. // This can be optimized by having a dataset level equivalent class for copyable entities // and storing dataset related information, e.g. dataset output path, there. - if (!fileSetRoot.isPresent()) { + + // Currently datasetOutputPath is only present for hive datasets. + if (!fileSetRoot.isPresent() && copyableFile.getDatasetOutputPath() != null) { fileSetRoot = Optional.of(copyableFile.getDatasetOutputPath()); } }
