Skip to content

Fix validation of empty segment IDs in markUsed and markUnused APIs #16145

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
abhishekrb19 merged 1 commit into from
Mar 18, 2024
Merged

Fix validation of empty segment IDs in markUsed and markUnused APIs #16145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion server/src/main/java/org/apache/druid/server/http/DataSourcesResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
import org.apache.druid.timeline.TimelineObjectHolder;
import org.apache.druid.timeline.VersionedIntervalTimeline;
import org.apache.druid.timeline.partition.PartitionChunk;
import org.apache.druid.utils.CollectionUtils;
import org.joda.time.DateTime;
import org.joda.time.Interval;

Expand Down Expand Up @@ -1020,7 +1021,12 @@ public Set<String> getSegmentIds()

public boolean isValid()
{
return (interval == null ^ segmentIds == null) && (segmentIds == null || !segmentIds.isEmpty());
final boolean hasSegmentIds = !CollectionUtils.isNullOrEmpty(segmentIds);
if (interval == null) {
return hasSegmentIds;
} else {
return !hasSegmentIds;
}
}
}
}
52 changes: 38 additions & 14 deletions server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ public void testMarkAsUsedNonOvershadowedSegmentsNoDataSource()
}

@Test
public void testMarkAsUsedNonOvershadowedSegmentsInvalidPayloadNoArguments()
public void testMarkAsUsedNonOvershadowedSegmentsWithNullIntervalAndSegmentIds()
{
DataSourcesResource dataSourcesResource = createResource();

Expand All @@ -838,19 +838,45 @@ public void testMarkAsUsedNonOvershadowedSegmentsInvalidPayloadNoArguments()
}

@Test
public void testMarkAsUsedNonOvershadowedSegmentsInvalidPayloadBothArguments()
public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullIntervalAndEmptySegmentIds()
{
DataSourcesResource dataSourcesResource = createResource();

Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
"datasource1",
new DataSourcesResource.MarkDataSourceSegmentsPayload(Intervals.of("2010-01-22/P1D"), ImmutableSet.of())
);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
}

@Test
public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullIntervalAndNullSegmentIds()
{
DataSourcesResource dataSourcesResource = createResource();

Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
"datasource1",
new DataSourcesResource.MarkDataSourceSegmentsPayload(Intervals.of("2010-01-22/P1D"), null)
);
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
}

@Test
public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullIntervalAndSegmentIds()
{
DataSourcesResource dataSourcesResource = createResource();

Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
"datasource1",
new DataSourcesResource.MarkDataSourceSegmentsPayload(Intervals.of("2010-01-22/P1D"), ImmutableSet.of("segment1"))
);
Assert.assertEquals(400, response.getStatus());
}

@Test
public void testMarkAsUsedNonOvershadowedSegmentsInvalidPayloadEmptyArray()
public void testMarkAsUsedNonOvershadowedSegmentsWithNullIntervalAndEmptySegmentIds()
{
DataSourcesResource dataSourcesResource = createResource();

Expand Down Expand Up @@ -1170,8 +1196,7 @@ public void testMarkAsUnusedSegmentsInIntervalNoDataSource()
@Test
public void testMarkSegmentsAsUnusedNullPayload()
{
DataSourcesResource dataSourcesResource =
createResource();
DataSourcesResource dataSourcesResource = createResource();

Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", null, request);
Assert.assertEquals(400, response.getStatus());
Expand All @@ -1183,10 +1208,9 @@ public void testMarkSegmentsAsUnusedNullPayload()
}

@Test
public void testMarkSegmentsAsUnusedInvalidPayload()
public void testMarkSegmentsAsUnusedWithNullIntervalAndSegmentIds()
{
DataSourcesResource dataSourcesResource =
createResource();
DataSourcesResource dataSourcesResource = createResource();

final DataSourcesResource.MarkDataSourceSegmentsPayload payload =
new DataSourcesResource.MarkDataSourceSegmentsPayload(null, null);
Expand All @@ -1197,17 +1221,17 @@ public void testMarkSegmentsAsUnusedInvalidPayload()
}

@Test
public void testMarkSegmentsAsUnusedInvalidPayloadBothArguments()
public void testMarkSegmentsAsUnusedWithNonNullIntervalAndEmptySegmentIds()
{
DataSourcesResource dataSourcesResource =
createResource();
DataSourcesResource dataSourcesResource = createResource();

final DataSourcesResource.MarkDataSourceSegmentsPayload payload =
new DataSourcesResource.MarkDataSourceSegmentsPayload(Intervals.of("2010-01-01/P1D"), ImmutableSet.of());

prepareRequestForAudit();
Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
Assert.assertEquals(400, response.getStatus());
Assert.assertNotNull(response.getEntity());

Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
}

@Test
Expand Down