Skip to content

use utc interval when create pending segments #9142

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
jihoonson merged 3 commits into from
Feb 26, 2020
Merged

use utc interval when create pending segments #9142

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
ee9f885
#8690 use utc interval when create pedding segments
liutang123 Oct 17, 2019
80eb6e5
Merge branch 'master' into 8690
gianm Feb 5, 2020
61479de
Merge branch 'master' into 8690
gianm Feb 21, 2020
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
3 changes: 2 additions & 1 deletion ...service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import org.apache.druid.timeline.partition.PartialShardSpec;
import org.joda.time.DateTime;
import org.joda.time.Interval;
import org.joda.time.chrono.ISOChronology;

import javax.annotation.Nullable;
import java.util.HashSet;
Expand Down Expand Up @@ -189,7 +190,7 @@ public SegmentIdWithShardSpec perform(
// 1) if something overlaps our timestamp, use that
// 2) otherwise try preferredSegmentGranularity & going progressively smaller

final Interval rowInterval = queryGranularity.bucket(timestamp);
final Interval rowInterval = queryGranularity.bucket(timestamp).withChronology(ISOChronology.getInstanceUTC());

final Set<DataSegment> usedSegmentsForRow =
new HashSet<>(msc.retrieveUsedSegmentsForInterval(dataSource, rowInterval, Segments.ONLY_VISIBLE));
Expand Down
29 changes: 29 additions & 0 deletions ...ice/src/test/java/org/apache/druid/indexing/common/actions/SegmentAllocateActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.common.granularity.Granularities;
import org.apache.druid.java.util.common.granularity.Granularity;
import org.apache.druid.java.util.common.granularity.PeriodGranularity;
import org.apache.druid.java.util.emitter.EmittingLogger;
import org.apache.druid.java.util.emitter.service.ServiceEmitter;
import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec;
Expand All @@ -49,6 +50,7 @@
import org.apache.druid.timeline.partition.SingleDimensionShardSpec;
import org.easymock.EasyMock;
import org.joda.time.DateTime;
import org.joda.time.Period;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
Expand Down Expand Up @@ -948,6 +950,33 @@ public void testWithPartialShardSpecAndOvershadowingSegments() throws IOExceptio
Assert.assertEquals(ImmutableList.of("dim1"), hashBasedNumberedShardSpec.getPartitionDimensions());
}

@Test
public void testSameIntervalWithSegmentGranularity()
{
final Task task = NoopTask.create();
taskActionTestKit.getTaskLockbox().add(task);
Granularity segmentGranularity = new PeriodGranularity(Period.hours(1), null, DateTimes.inferTzFromString("Asia/Shanghai"));

final SegmentIdWithShardSpec id1 = allocate(
task,
PARTY_TIME,
Granularities.MINUTE,
segmentGranularity,
"s1",
null
);
final SegmentIdWithShardSpec id2 = allocate(
task,
PARTY_TIME,
Granularities.MINUTE,
segmentGranularity,
"s2",
null
);
Assert.assertNotNull(id1);
Assert.assertNotNull(id2);
}

private SegmentIdWithShardSpec allocate(
final Task task,
final DateTime timestamp,
Expand Down
6 changes: 4 additions & 2 deletions server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import org.apache.druid.timeline.partition.PartitionChunk;
import org.apache.druid.timeline.partition.ShardSpec;
import org.joda.time.Interval;
import org.joda.time.chrono.ISOChronology;
import org.skife.jdbi.v2.Folder3;
import org.skife.jdbi.v2.Handle;
import org.skife.jdbi.v2.Query;
Expand Down Expand Up @@ -503,6 +504,7 @@ public SegmentIdWithShardSpec allocatePendingSegment(
Preconditions.checkNotNull(sequenceName, "sequenceName");
Preconditions.checkNotNull(interval, "interval");
Preconditions.checkNotNull(maxVersion, "version");
Interval allocateInterval = interval.withChronology(ISOChronology.getInstanceUTC());

return connector.retryWithHandle(
handle -> {
Expand All @@ -511,7 +513,7 @@ public SegmentIdWithShardSpec allocatePendingSegment(
handle,
dataSource,
sequenceName,
interval,
allocateInterval,
partialShardSpec,
maxVersion
);
Expand All @@ -521,7 +523,7 @@ public SegmentIdWithShardSpec allocatePendingSegment(
dataSource,
sequenceName,
previousSegmentId,
interval,
allocateInterval,
partialShardSpec,
maxVersion
);
Expand Down