Skip to content

Remove unnecessary collection #7350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leventov merged 9 commits into from
Apr 15, 2019
Merged

Remove unnecessary collection #7350

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2fa90eb
Collect in list instead of Set
Mar 27, 2019
7b696aa
Add comment
Mar 30, 2019
ab7d74f
Merge branch 'master' of github.com:druid-io/druid into use-list-inst…
Mar 30, 2019
dad1676
Get rid of collection and filter in the stream itself
Apr 2, 2019
3958a4e
Merge branch 'master' of github.com:druid-io/druid into use-list-inst…
Apr 2, 2019
5913919
Merge branch 'master' of github.com:druid-io/druid into use-list-inst…
Apr 11, 2019
9ad9016
PR comment
Apr 12, 2019
60c15ef
Merge branch 'master' of github.com:druid-io/druid into use-list-inst…
Apr 12, 2019
72a74f1
fix travis
Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 5 additions & 29 deletions server/src/main/java/org/apache/druid/server/http/MetadataResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

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.google.common.base.Function;
import com.google.common.collect.Collections2;
Expand Down Expand Up @@ -51,14 +49,12 @@
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
Expand All @@ -68,9 +64,7 @@ public class MetadataResource
{
private final MetadataSegmentManager metadataSegmentManager;
private final IndexerMetadataStorageCoordinator metadataStorageCoordinator;
private final AuthConfig authConfig;
private final AuthorizerMapper authorizerMapper;
private final ObjectMapper jsonMapper;

@Inject
public MetadataResource(
Expand All @@ -83,9 +77,7 @@ public MetadataResource(
{
this.metadataSegmentManager = metadataSegmentManager;
this.metadataStorageCoordinator = metadataStorageCoordinator;
this.authConfig = authConfig;
this.authorizerMapper = authorizerMapper;
this.jsonMapper = jsonMapper;
}

@GET
Expand Down Expand Up @@ -161,36 +153,20 @@ public Response getDatabaseSegments(
// If we haven't polled the metadata store yet, use an empty list of datasources.
Collection<ImmutableDruidDataSource> druidDataSources = Optional.ofNullable(metadataSegmentManager.getDataSources())
.orElse(Collections.emptyList());

Stream<ImmutableDruidDataSource> dataSourceStream = druidDataSources.stream();
if (datasources != null && !datasources.isEmpty()) {
druidDataSources = druidDataSources.stream()
.filter(src -> datasources.contains(src.getName()))
.collect(Collectors.toSet());
dataSourceStream = dataSourceStream.filter(src -> datasources.contains(src.getName()));
}
final Stream<DataSegment> metadataSegments = druidDataSources
.stream()
.flatMap(t -> t.getSegments().stream());
final Stream<DataSegment> metadataSegments = dataSourceStream.flatMap(t -> t.getSegments().stream());

final Function<DataSegment, Iterable<ResourceAction>> raGenerator = segment -> Collections.singletonList(
AuthorizationUtils.DATASOURCE_READ_RA_GENERATOR.apply(segment.getDataSource()));

final Iterable<DataSegment> authorizedSegments =
AuthorizationUtils.filterAuthorizedResources(req, metadataSegments::iterator, raGenerator, authorizerMapper);

final StreamingOutput stream = outputStream -> {
final JsonFactory jsonFactory = jsonMapper.getFactory();
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();
final Response.ResponseBuilder builder = Response.status(Response.Status.OK);
return builder.entity(authorizedSegments).build();
}

@GET
Expand Down