forked from apache/druid
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request apache#1681 from gianm/ingest-segment-overlapping
Fix overlapping segments in IngestSegmentFirehose, DatasourceInputFormat
- Loading branch information
Showing
19 changed files
with
1,038 additions
and
266 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
indexing-hadoop/src/main/java/io/druid/indexer/hadoop/WindowedDataSegment.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * Licensed to Metamarkets Group Inc. (Metamarkets) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. Metamarkets 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 io.druid.indexer.hadoop; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import io.druid.timeline.DataSegment; | ||
| import org.joda.time.Interval; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| public class WindowedDataSegment | ||
| { | ||
| private final DataSegment segment; | ||
| private final Interval interval; | ||
|
|
||
| @JsonCreator | ||
| public WindowedDataSegment( | ||
| @JsonProperty("segment") final DataSegment segment, | ||
| @JsonProperty("interval") final Interval interval | ||
| ) | ||
| { | ||
| this.segment = segment; | ||
| this.interval = interval; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public DataSegment getSegment() | ||
| { | ||
| return segment; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public Interval getInterval() | ||
| { | ||
| return interval; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) | ||
| { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| WindowedDataSegment that = (WindowedDataSegment) o; | ||
| return Objects.equals(segment, that.segment) && | ||
| Objects.equals(interval, that.interval); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() | ||
| { | ||
| return Objects.hash(segment, interval); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() | ||
| { | ||
| return "WindowedDataSegment{" + | ||
| "segment=" + segment + | ||
| ", interval=" + interval + | ||
| '}'; | ||
| } | ||
|
|
||
| public static WindowedDataSegment of(final DataSegment segment) | ||
| { | ||
| return new WindowedDataSegment(segment, segment.getInterval()); | ||
| } | ||
| } |
Oops, something went wrong.