Skip to content

Allow reordered segment allocation in kafka indexing service #5805

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
gianm merged 3 commits into from
Jul 2, 2018
Merged

Allow reordered segment allocation in kafka indexing service #5805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b02daf0
Allow reordered segment allocation in kafka indexing service
jihoonson May 25, 2018
1dc24ef
address comments
jihoonson May 31, 2018
e667d21
fix a bug
jihoonson Jun 4, 2018
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
4 changes: 2 additions & 2 deletions indexing-service/src/test/java/io/druid/indexing/common/task/IndexTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,12 +440,12 @@ public void testAppendToExisting() throws Exception

Assert.assertEquals("test", segments.get(0).getDataSource());
Assert.assertEquals(Intervals.of("2014/P1D"), segments.get(0).getInterval());
Assert.assertTrue(segments.get(0).getShardSpec().getClass().equals(NumberedShardSpec.class));
Assert.assertEquals(NumberedShardSpec.class, segments.get(0).getShardSpec().getClass());
Assert.assertEquals(0, segments.get(0).getShardSpec().getPartitionNum());

Assert.assertEquals("test", segments.get(1).getDataSource());
Assert.assertEquals(Intervals.of("2014/P1D"), segments.get(1).getInterval());
Assert.assertTrue(segments.get(1).getShardSpec().getClass().equals(NumberedShardSpec.class));
Assert.assertEquals(NumberedShardSpec.class, segments.get(1).getShardSpec().getClass());
Assert.assertEquals(1, segments.get(1).getShardSpec().getPartitionNum());
}

Expand Down
9 changes: 6 additions & 3 deletions java-util/src/main/java/io/druid/java/util/common/Pair.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,28 @@

package io.druid.java.util.common;

import javax.annotation.Nullable;
import java.util.Objects;

/**
*/
public class Pair<T1, T2>
{

public static <T1, T2> Pair<T1, T2> of(T1 lhs, T2 rhs)
public static <T1, T2> Pair<T1, T2> of(@Nullable T1 lhs, @Nullable T2 rhs)
{
return new Pair<>(lhs, rhs);
}

@Nullable
public final T1 lhs;

@Nullable
public final T2 rhs;

public Pair(
T1 lhs,
T2 rhs
@Nullable T1 lhs,
@Nullable T2 rhs
)
{
this.lhs = lhs;
Expand Down
Loading