yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-10-09 07:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE issue with downstream lineage resource

Browse Source
This commit is contained in:
Kerem Sahin 2019-09-26 20:53:38 -07:00
parent 53b79de9bf
commit 06fae51ca3
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gms/impl/src/main/java/com/linkedin/dataset/rest/resources/DownstreamLineageResource.java
View File

@ -21,6 +21,7 @@ import javax.annotation.Nonnull;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -52,7 +53,7 @@ public final class DownstreamLineageResource extends SimpleResourceTemplate<Down
final Filter filter = SearchUtils.getFilter(Collections.singletonMap("upstreams", datasetUrn.toString())); final Filter filter = SearchUtils.getFilter(Collections.singletonMap("upstreams", datasetUrn.toString()));
return RestliUtils.toTask(() -> { return RestliUtils.toTask(() -> {
final SearchResult<DatasetDocument> searchResult = _searchDAO.search("*", filter, 0, Integer.MAX_VALUE); final SearchResult<DatasetDocument> searchResult = _searchDAO.search("*", filter, 0, 10000);
final Set<DatasetUrn> downstreamDatasets = searchResult.getDocumentList() final Set<DatasetUrn> downstreamDatasets = searchResult.getDocumentList()
.stream() .stream()
.map(d -> (DatasetUrn) ModelUtils.getUrnFromDocument(d)) .map(d -> (DatasetUrn) ModelUtils.getUrnFromDocument(d))
@ -60,11 +61,16 @@ public final class DownstreamLineageResource extends SimpleResourceTemplate<Down
final DownstreamArray downstreamArray = new DownstreamArray(downstreamDatasets.stream() final DownstreamArray downstreamArray = new DownstreamArray(downstreamDatasets.stream()
.map(ds -> { .map(ds -> {
final UpstreamLineage upstreamLineage = (UpstreamLineage) _localDAO.get(UpstreamLineage.class, ds).get(); final UpstreamLineage upstreamLineage = (UpstreamLineage) _localDAO.get(UpstreamLineage.class, ds).get();
final Upstream upstream = upstreamLineage.getUpstreams().stream() final List<Upstream> upstreams = upstreamLineage.getUpstreams().stream()
.filter(us -> us.getDataset().equals(datasetUrn)) .filter(us -> us.getDataset().equals(datasetUrn))
.collect(Collectors.toList()) .collect(Collectors.toList());
.get(0); if (upstreams.size() != 1) {
return new Downstream().setDataset(ds).setType(upstream.getType()).setAuditStamp(upstream.getAuditStamp()); throw new RuntimeException(String.format("There is no relation or more than 1 relation between the datasets!"));
}
return new Downstream()
.setDataset(ds)
.setType(upstreams.get(0).getType())
.setAuditStamp(upstreams.get(0).getAuditStamp());
}) })
.collect(Collectors.toList()) .collect(Collectors.toList())
); );

10
li-utils/src/main/java/com/linkedin/common/urn/Urn.java
View File

@ -1,5 +1,6 @@
package com.linkedin.common.urn; package com.linkedin.common.urn;
import javax.annotation.Nonnull;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -68,4 +69,13 @@ public class Urn {
public String toString() { public String toString() {
return _urn; return _urn;
} }
public static boolean isUrn(@Nonnull String urn) {
try {
final Urn dummy = Urn.createFromString(urn);
return true;
} catch(URISyntaxException e) {
return false;
}
}
} }

6
metadata-dao-impl/elasticsearch-dao/src/main/java/com/linkedin/metadata/dao/utils/ESUtils.java
View File

@ -1,8 +1,11 @@
package com.linkedin.metadata.dao.utils; package com.linkedin.metadata.dao.utils;
import java.net.URISyntaxException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Map; import java.util.Map;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import com.linkedin.common.urn.Urn;
import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryBuilders;
@ -26,7 +29,8 @@ public class ESUtils {
BoolQueryBuilder boolFilter = new BoolQueryBuilder(); BoolQueryBuilder boolFilter = new BoolQueryBuilder();
for (Map.Entry<String, String> entry : requestMap.entrySet()) { for (Map.Entry<String, String> entry : requestMap.entrySet()) {
BoolQueryBuilder filters = new BoolQueryBuilder(); BoolQueryBuilder filters = new BoolQueryBuilder();
Arrays.stream(entry.getValue().split(",")) // TODO: Remove checking for urn after solving META-10102
Arrays.stream(Urn.isUrn(entry.getValue()) ? new String[]{entry.getValue()} : entry.getValue().split(","))
.forEach(elem -> filters.should(QueryBuilders.matchQuery(entry.getKey(), elem))); .forEach(elem -> filters.should(QueryBuilders.matchQuery(entry.getKey(), elem)));
boolFilter.must(filters); boolFilter.must(filters);
} }