github-advanced-security[bot] commented on code in PR #17545:
URL: https://github.com/apache/druid/pull/17545#discussion_r1873653695
##########
server/src/main/java/org/apache/druid/server/http/DataSourcesResource.java:
##########
@@ -705,21 +637,52 @@
)
{
final SegmentId segmentId = SegmentId.tryParse(dataSourceName,
segmentIdString);
- final boolean segmentStateChanged = segmentId != null &&
segmentsMetadataManager.markSegmentAsUnused(segmentId);
- return Response.ok(ImmutableMap.of("segmentStateChanged",
segmentStateChanged)).build();
+ if (segmentId == null) {
+ return Response.status(Response.Status.BAD_REQUEST).entity(
+ org.apache.druid.java.util.common.StringUtils.format("Could not
parse Segment ID[%s]", segmentIdString)
+ ).build();
+ }
+
+ SegmentUpdateOperation operation = () ->
overlordClient.markSegmentAsUnused(segmentId);
+
+ final Response response = performSegmentUpdate(dataSourceName, operation);
+ final int responseCode = response.getStatus();
+ if (responseCode >= 200 && responseCode < 300) {
+ return Response.ok().entity(ImmutableMap.of("segmentStateChanged",
true)).build();
+ } else {
+ return response;
+ }
}
+ /**
+ * @deprecated Use {@code OverlordDataSourcesResource#markSegmentAsUsed}
instead.
+ */
+ @Deprecated
@POST
@Path("/{dataSourceName}/segments/{segmentId}")
@Consumes(MediaType.APPLICATION_JSON)
@ResourceFilters(DatasourceResourceFilter.class)
public Response markSegmentAsUsed(
@PathParam("dataSourceName") String dataSourceName,
- @PathParam("segmentId") String segmentId
+ @PathParam("segmentId") String segmentIdString
)
{
- boolean segmentStateChanged =
segmentsMetadataManager.markSegmentAsUsed(segmentId);
- return Response.ok().entity(ImmutableMap.of("segmentStateChanged",
segmentStateChanged)).build();
+ final SegmentId segmentId = SegmentId.tryParse(dataSourceName,
segmentIdString);
+ if (segmentId == null) {
+ return Response.status(Response.Status.BAD_REQUEST).entity(
+ org.apache.druid.java.util.common.StringUtils.format("Could not
parse Segment ID[%s]", segmentIdString)
+ ).build();
Review Comment:
## Cross-site scripting
Cross-site scripting vulnerability due to a [user-provided value](1).
[Show more
details](https://github.com/apache/druid/security/code-scanning/8516)
##########
indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordDataSourcesResource.java:
##########
@@ -0,0 +1,283 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.indexing.overlord.http;
+
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
+import com.sun.jersey.spi.container.ResourceFilters;
+import org.apache.druid.audit.AuditEntry;
+import org.apache.druid.audit.AuditManager;
+import org.apache.druid.error.DruidException;
+import org.apache.druid.error.InvalidInput;
+import org.apache.druid.indexing.overlord.TaskMaster;
+import org.apache.druid.java.util.common.logger.Logger;
+import org.apache.druid.metadata.SegmentsMetadataManager;
+import org.apache.druid.server.http.SegmentsToUpdateFilter;
+import org.apache.druid.server.http.ServletResourceUtils;
+import org.apache.druid.server.http.security.DatasourceResourceFilter;
+import org.apache.druid.server.security.AuthorizationUtils;
+import org.apache.druid.timeline.SegmentId;
+import org.joda.time.Interval;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Datasource APIs exposed by the Overlord to update segments.
+ * Some of these APIs are also exposed by the Coordinator, but they have been
+ * deprecated and the Overlord APIs must be used for all update operations.
+ */
+@Path("/druid/indexer/v1/datasources")
+public class OverlordDataSourcesResource
+{
+ private static final Logger log = new
Logger(OverlordDataSourcesResource.class);
+
+ private final SegmentsMetadataManager segmentsMetadataManager;
+ private final TaskMaster taskMaster;
+ private final AuditManager auditManager;
+
+ @Inject
+ public OverlordDataSourcesResource(
+ TaskMaster taskMaster,
+ SegmentsMetadataManager segmentsMetadataManager,
+ AuditManager auditManager
+ )
+ {
+ this.taskMaster = taskMaster;
+ this.auditManager = auditManager;
+ this.segmentsMetadataManager = segmentsMetadataManager;
+ }
+
+ private interface SegmentUpdateOperation
+ {
+ int perform();
+ }
+
+ @POST
+ @Path("/{dataSourceName}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @ResourceFilters(DatasourceResourceFilter.class)
+ public Response markAllNonOvershadowedSegmentsAsUsed(
+ @PathParam("dataSourceName") final String dataSourceName,
+ @Context HttpServletRequest req
Review Comment:
## Useless parameter
The parameter 'req' is never used.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8517)
##########
server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java:
##########
@@ -1146,208 +1175,208 @@
@Test
public void testMarkSegmentsAsUnused()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter payload =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
payload))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, payload, request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedNoChanges()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedException()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
- EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds))
- .andThrow(new RuntimeException("Exception occurred"))
- .once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andThrow(new RuntimeException("Exception occurred"))
+ .once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(500, response.getStatus());
Assert.assertNotNull(response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInInterval()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Review Comment:
## Deprecated method or constructor invocation
Invoking [DataSourcesResource.markSegmentsAsUnused](1) should be avoided
because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8506)
##########
server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java:
##########
@@ -1146,208 +1175,208 @@
@Test
public void testMarkSegmentsAsUnused()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter payload =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
payload))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, payload, request);
Review Comment:
## Deprecated method or constructor invocation
Invoking [DataSourcesResource.markSegmentsAsUnused](1) should be avoided
because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8503)
##########
server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java:
##########
@@ -1146,208 +1175,208 @@
@Test
public void testMarkSegmentsAsUnused()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter payload =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
payload))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, payload, request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedNoChanges()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Review Comment:
## Deprecated method or constructor invocation
Invoking [DataSourcesResource.markSegmentsAsUnused](1) should be avoided
because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8504)
##########
server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java:
##########
@@ -1146,208 +1175,208 @@
@Test
public void testMarkSegmentsAsUnused()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter payload =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
payload))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, payload, request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedNoChanges()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedException()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
- EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds))
- .andThrow(new RuntimeException("Exception occurred"))
- .once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andThrow(new RuntimeException("Exception occurred"))
+ .once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Review Comment:
## Deprecated method or constructor invocation
Invoking [DataSourcesResource.markSegmentsAsUnused](1) should be avoided
because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8505)
##########
server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java:
##########
@@ -1146,208 +1175,208 @@
@Test
public void testMarkSegmentsAsUnused()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter payload =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
payload))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, payload, request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedNoChanges()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedException()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
- EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds))
- .andThrow(new RuntimeException("Exception occurred"))
- .once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andThrow(new RuntimeException("Exception occurred"))
+ .once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(500, response.getStatus());
Assert.assertNotNull(response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInInterval()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalNoChanges()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null)).andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalException()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null))
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
.andThrow(new RuntimeException("Exception occurred"))
.once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Review Comment:
## Deprecated method or constructor invocation
Invoking [DataSourcesResource.markSegmentsAsUnused](1) should be avoided
because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8508)
##########
server/src/main/java/org/apache/druid/server/http/DataSourcesResource.java:
##########
@@ -705,21 +637,52 @@
)
{
final SegmentId segmentId = SegmentId.tryParse(dataSourceName,
segmentIdString);
- final boolean segmentStateChanged = segmentId != null &&
segmentsMetadataManager.markSegmentAsUnused(segmentId);
- return Response.ok(ImmutableMap.of("segmentStateChanged",
segmentStateChanged)).build();
+ if (segmentId == null) {
+ return Response.status(Response.Status.BAD_REQUEST).entity(
+ org.apache.druid.java.util.common.StringUtils.format("Could not
parse Segment ID[%s]", segmentIdString)
+ ).build();
Review Comment:
## Cross-site scripting
Cross-site scripting vulnerability due to a [user-provided value](1).
[Show more
details](https://github.com/apache/druid/security/code-scanning/8515)
##########
server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java:
##########
@@ -1146,208 +1175,208 @@
@Test
public void testMarkSegmentsAsUnused()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter payload =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
payload))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, payload, request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedNoChanges()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedException()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
- EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds))
- .andThrow(new RuntimeException("Exception occurred"))
- .once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andThrow(new RuntimeException("Exception occurred"))
+ .once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(500, response.getStatus());
Assert.assertNotNull(response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInInterval()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalNoChanges()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null)).andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Review Comment:
## Deprecated method or constructor invocation
Invoking [DataSourcesResource.markSegmentsAsUnused](1) should be avoided
because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8507)
##########
server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java:
##########
@@ -1370,7 +1399,7 @@
{
DataSourcesResource dataSourcesResource = createResource();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", null, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, null, request);
Review Comment:
## Deprecated method or constructor invocation
Invoking [DataSourcesResource.markSegmentsAsUnused](1) should be avoided
because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8512)
##########
server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java:
##########
@@ -1146,208 +1175,208 @@
@Test
public void testMarkSegmentsAsUnused()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter payload =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
payload))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, payload, request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedNoChanges()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedException()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
- EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds))
- .andThrow(new RuntimeException("Exception occurred"))
- .once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andThrow(new RuntimeException("Exception occurred"))
+ .once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(500, response.getStatus());
Assert.assertNotNull(response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInInterval()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalNoChanges()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null)).andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalException()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null))
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
.andThrow(new RuntimeException("Exception occurred"))
.once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(500, response.getStatus());
Assert.assertNotNull(response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalNoDataSource()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null))
- .andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Review Comment:
## Deprecated method or constructor invocation
Invoking [DataSourcesResource.markSegmentsAsUnused](1) should be avoided
because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8509)
##########
server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java:
##########
@@ -1385,32 +1414,39 @@
{
DataSourcesResource dataSourcesResource = createResource();
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(null, null, null);
+ final SegmentsToUpdateFilter payload =
+ new SegmentsToUpdateFilter(null, null, null);
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, payload, request);
Review Comment:
## Deprecated method or constructor invocation
Invoking [DataSourcesResource.markSegmentsAsUnused](1) should be avoided
because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8513)
##########
server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java:
##########
@@ -1385,32 +1414,39 @@
{
DataSourcesResource dataSourcesResource = createResource();
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(null, null, null);
+ final SegmentsToUpdateFilter payload =
+ new SegmentsToUpdateFilter(null, null, null);
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, payload, request);
Assert.assertEquals(400, response.getStatus());
Assert.assertNotNull(response.getEntity());
}
@Test
public void testMarkSegmentsAsUnusedWithNonNullIntervalAndEmptySegmentIds()
{
- DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new
DataSourcesResource.SegmentsToUpdateFilter(Intervals.of("2010-01-01/P1D"),
ImmutableSet.of(), null);
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(Intervals.of("2010-01-01/P1D"),
ImmutableSet.of(), null);
+
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient);
+
+ DataSourcesResource dataSourcesResource = createResource();
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Review Comment:
## Deprecated method or constructor invocation
Invoking [DataSourcesResource.markSegmentsAsUnused](1) should be avoided
because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8514)
##########
server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java:
##########
@@ -1146,208 +1175,208 @@
@Test
public void testMarkSegmentsAsUnused()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter payload =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
payload))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, payload, request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedNoChanges()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedException()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
- EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds))
- .andThrow(new RuntimeException("Exception occurred"))
- .once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andThrow(new RuntimeException("Exception occurred"))
+ .once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(500, response.getStatus());
Assert.assertNotNull(response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInInterval()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalNoChanges()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null)).andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalException()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null))
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
.andThrow(new RuntimeException("Exception occurred"))
.once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(500, response.getStatus());
Assert.assertNotNull(response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalNoDataSource()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null))
- .andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager);
+ EasyMock.verify(overlordClient);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalWithVersions()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, ImmutableList.of("v1")))
- .andReturn(2).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, ImmutableList.of("v1"));
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(2))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
ImmutableList.of("v1"));
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Review Comment:
## Deprecated method or constructor invocation
Invoking [DataSourcesResource.markSegmentsAsUnused](1) should be avoided
because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8510)
##########
server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java:
##########
@@ -1146,208 +1175,208 @@
@Test
public void testMarkSegmentsAsUnused()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter payload =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
payload))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, payload, request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedNoChanges()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
-
EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkSegmentsAsUnusedException()
{
- final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new
HashMap<>());
+ final DruidDataSource dataSource1 = new
DruidDataSource(TestDataSource.WIKI, new HashMap<>());
final Set<SegmentId> segmentIds =
dataSegmentList.stream()
.filter(segment ->
segment.getDataSource().equals(dataSource1.getName()))
.map(DataSegment::getId)
.collect(Collectors.toSet());
- EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds))
- .andThrow(new RuntimeException("Exception occurred"))
- .once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(
null,
segmentIds.stream()
.map(SegmentId::toString)
.collect(Collectors.toSet()),
null
);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andThrow(new RuntimeException("Exception occurred"))
+ .once();
+ EasyMock.replay(overlordClient, inventoryView, server);
+
DataSourcesResource dataSourcesResource = createResource();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(500, response.getStatus());
Assert.assertNotNull(response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInInterval()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null)).andReturn(1).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(1))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalNoChanges()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null)).andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalException()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null))
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
.andThrow(new RuntimeException("Exception occurred"))
.once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
+ EasyMock.replay(overlordClient, inventoryView, server);
DataSourcesResource dataSourcesResource = createResource();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(500, response.getStatus());
Assert.assertNotNull(response.getEntity());
- EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+ EasyMock.verify(overlordClient, inventoryView, server);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalNoDataSource()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, null))
- .andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, null);
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
null);
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager);
+ EasyMock.verify(overlordClient);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalWithVersions()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, ImmutableList.of("v1")))
- .andReturn(2).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, ImmutableList.of("v1"));
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(2))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
ImmutableList.of("v1"));
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 2),
response.getEntity());
- EasyMock.verify(segmentsMetadataManager);
+ EasyMock.verify(overlordClient);
}
@Test
public void testMarkAsUnusedSegmentsInIntervalWithNonExistentVersion()
{
final Interval theInterval = Intervals.of("2010-01-01/P1D");
-
EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1",
theInterval, ImmutableList.of("foo")))
- .andReturn(0).once();
- EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+ final SegmentsToUpdateFilter segmentFilter =
+ new SegmentsToUpdateFilter(theInterval, null, ImmutableList.of("foo"));
+ EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI,
segmentFilter))
+ .andReturn(Futures.immediateFuture(new
SegmentUpdateResponse(0))).once();
+ EasyMock.replay(overlordClient, inventoryView, server);
- final DataSourcesResource.SegmentsToUpdateFilter payload =
- new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null,
ImmutableList.of("foo"));
DataSourcesResource dataSourcesResource = createResource();
prepareRequestForAudit();
- Response response =
dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+ Response response =
dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter,
request);
Review Comment:
## Deprecated method or constructor invocation
Invoking [DataSourcesResource.markSegmentsAsUnused](1) should be avoided
because it has been deprecated.
[Show more
details](https://github.com/apache/druid/security/code-scanning/8511)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
