Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary collection (#7350) 

From the discussion [here](https://github.com/apache/incubator-druid/pull/6901#discussion_r265741002)

Remove the collection and filter datasources from the stream. 
Also remove StreamingOutput and JsonFactory constructs.
This commit is contained in:
Surekha 2019-04-15 10:49:21 -07:00 committed by Roman Leventov
parent 530a378fea
commit 4654e1e851
1 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
server/src/main/java/org/apache/druid/server/http/MetadataResource.java
View File

@ -19,8 +19,6 @@
package org.apache.druid.server.http; package org.apache.druid.server.http;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.Collections2; import com.google.common.collect.Collections2;
@ -51,14 +49,12 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
/** /**
@ -68,9 +64,7 @@ public class MetadataResource
{ {
private final MetadataSegmentManager metadataSegmentManager; private final MetadataSegmentManager metadataSegmentManager;
private final IndexerMetadataStorageCoordinator metadataStorageCoordinator; private final IndexerMetadataStorageCoordinator metadataStorageCoordinator;
private final AuthConfig authConfig;
private final AuthorizerMapper authorizerMapper; private final AuthorizerMapper authorizerMapper;
private final ObjectMapper jsonMapper;
@Inject @Inject
public MetadataResource( public MetadataResource(
@ -83,9 +77,7 @@ public class MetadataResource
{ {
this.metadataSegmentManager = metadataSegmentManager; this.metadataSegmentManager = metadataSegmentManager;
this.metadataStorageCoordinator = metadataStorageCoordinator; this.metadataStorageCoordinator = metadataStorageCoordinator;
this.authConfig = authConfig;
this.authorizerMapper = authorizerMapper; this.authorizerMapper = authorizerMapper;
this.jsonMapper = jsonMapper;
} }
@GET @GET
@ -161,15 +153,11 @@ public class MetadataResource
// If we haven't polled the metadata store yet, use an empty list of datasources. // If we haven't polled the metadata store yet, use an empty list of datasources.
Collection<ImmutableDruidDataSource> druidDataSources = Optional.ofNullable(metadataSegmentManager.getDataSources()) Collection<ImmutableDruidDataSource> druidDataSources = Optional.ofNullable(metadataSegmentManager.getDataSources())
.orElse(Collections.emptyList()); .orElse(Collections.emptyList());
Stream<ImmutableDruidDataSource> dataSourceStream = druidDataSources.stream();
if (datasources != null && !datasources.isEmpty()) { if (datasources != null && !datasources.isEmpty()) {
druidDataSources = druidDataSources.stream() dataSourceStream = dataSourceStream.filter(src -> datasources.contains(src.getName()));
.filter(src -> datasources.contains(src.getName()))
.collect(Collectors.toSet());
} }
final Stream<DataSegment> metadataSegments = druidDataSources final Stream<DataSegment> metadataSegments = dataSourceStream.flatMap(t -> t.getSegments().stream());
.stream()
.flatMap(t -> t.getSegments().stream());
final Function<DataSegment, Iterable<ResourceAction>> raGenerator = segment -> Collections.singletonList( final Function<DataSegment, Iterable<ResourceAction>> raGenerator = segment -> Collections.singletonList(
AuthorizationUtils.DATASOURCE_READ_RA_GENERATOR.apply(segment.getDataSource())); AuthorizationUtils.DATASOURCE_READ_RA_GENERATOR.apply(segment.getDataSource()));
@ -177,20 +165,8 @@ public class MetadataResource
final Iterable<DataSegment> authorizedSegments = final Iterable<DataSegment> authorizedSegments =
AuthorizationUtils.filterAuthorizedResources(req, metadataSegments::iterator, raGenerator, authorizerMapper); AuthorizationUtils.filterAuthorizedResources(req, metadataSegments::iterator, raGenerator, authorizerMapper);
final StreamingOutput stream = outputStream -> { final Response.ResponseBuilder builder = Response.status(Response.Status.OK);
final JsonFactory jsonFactory = jsonMapper.getFactory(); return builder.entity(authorizedSegments).build();
try (final JsonGenerator jsonGenerator = jsonFactory.createGenerator(outputStream)) {
jsonGenerator.writeStartArray();
for (DataSegment ds : authorizedSegments) {
jsonGenerator.writeObject(ds);
jsonGenerator.flush();
}
jsonGenerator.writeEndArray();
}
};
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
return builder.entity(stream).build();
} }
@GET @GET