yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-11-06 22:04:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(analytics): fix NPE in aggregate api (#4095)

Browse Source
This commit is contained in:
Dexter Lee 2022-02-08 23:23:18 -08:00 committed by GitHub
parent f944a9ba05
commit beab5ac977
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
metadata-io/src/main/java/com/linkedin/metadata/timeseries/elastic/query/ESAggregatedStatsDAO.java
View File

@ -56,6 +56,7 @@ public class ESAggregatedStatsDAO {
private static final String ES_TERMS_AGGREGATION_PREFIX = "terms_"; private static final String ES_TERMS_AGGREGATION_PREFIX = "terms_";
private static final String ES_MAX_AGGREGATION_PREFIX = "max_"; private static final String ES_MAX_AGGREGATION_PREFIX = "max_";
private static final String ES_FIELD_TIMESTAMP = "timestampMillis"; private static final String ES_FIELD_TIMESTAMP = "timestampMillis";
private static final String ES_FIELD_URN = "urn";
private static final String ES_AGG_TIMESTAMP = ES_AGGREGATION_PREFIX + ES_FIELD_TIMESTAMP; private static final String ES_AGG_TIMESTAMP = ES_AGGREGATION_PREFIX + ES_FIELD_TIMESTAMP;
private static final String ES_AGG_MAX_TIMESTAMP = private static final String ES_AGG_MAX_TIMESTAMP =
ES_AGGREGATION_PREFIX + ES_MAX_AGGREGATION_PREFIX + ES_FIELD_TIMESTAMP; ES_AGGREGATION_PREFIX + ES_MAX_AGGREGATION_PREFIX + ES_FIELD_TIMESTAMP;
@ -172,11 +173,13 @@ public class ESAggregatedStatsDAO {
if (fieldPath.equals(ES_FIELD_TIMESTAMP)) { if (fieldPath.equals(ES_FIELD_TIMESTAMP)) {
return DataSchema.Type.LONG; return DataSchema.Type.LONG;
} }
/* TODO: Remove if not needed after merge. if (fieldPath.equals(ES_FIELD_URN)) {
return DataSchema.Type.STRING;
}
if (fieldPath.equals(MappingsBuilder.EVENT_GRANULARITY)) { if (fieldPath.equals(MappingsBuilder.EVENT_GRANULARITY)) {
return DataSchema.Type.RECORD; return DataSchema.Type.RECORD;
} }
*/
String[] memberParts = fieldPath.split("\\."); String[] memberParts = fieldPath.split("\\.");
if (memberParts.length == 1) { if (memberParts.length == 1) {
// Search in the timeseriesFieldSpecs. // Search in the timeseriesFieldSpecs.
@ -439,18 +442,6 @@ public class ESAggregatedStatsDAO {
return lastAggregationBuilder; return lastAggregationBuilder;
} }
private boolean isIntegralType(DataSchema.Type fieldType) {
switch (fieldType) {
case INT:
case FLOAT:
case DOUBLE:
case LONG:
return true;
default:
return false;
}
}
private GenericTable generateResponseFromElastic(SearchResponse searchResponse, GroupingBucket[] groupingBuckets, private GenericTable generateResponseFromElastic(SearchResponse searchResponse, GroupingBucket[] groupingBuckets,
AggregationSpec[] aggregationSpecs, AspectSpec aspectSpec) { AggregationSpec[] aggregationSpecs, AspectSpec aspectSpec) {
GenericTable resultTable = new GenericTable(); GenericTable resultTable = new GenericTable();

8
metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/analytics/Analytics.java
View File

@ -53,8 +53,12 @@ public class Analytics extends SimpleResourceTemplate<GetTimeseriesAggregatedSta
resp.setEntityName(entityName); resp.setEntityName(entityName);
resp.setAspectName(aspectName); resp.setAspectName(aspectName);
resp.setAggregationSpecs(new AggregationSpecArray(Arrays.asList(aggregationSpecs))); resp.setAggregationSpecs(new AggregationSpecArray(Arrays.asList(aggregationSpecs)));
resp.setFilter(filter); if (filter != null) {
resp.setGroupingBuckets(new GroupingBucketArray(Arrays.asList(groupingBuckets))); resp.setFilter(filter);
}
if (groupingBuckets != null) {
resp.setGroupingBuckets(new GroupingBucketArray(Arrays.asList(groupingBuckets)));
}
GenericTable aggregatedStatsTable = GenericTable aggregatedStatsTable =
_timeseriesAspectService.getAggregatedStats(entityName, aspectName, aggregationSpecs, filter, _timeseriesAspectService.getAggregatedStats(entityName, aspectName, aggregationSpecs, filter,