forked from apache/incubator-uniffle
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[apache#1747] feat(remote merge): Introduce common merger to merge mu…
…ltiple data streams. (apache#1925) ### What changes were proposed in this pull request? Introduce merger to merge multiple data streams according to key. Minimum heap K-way merge sorting is used to merge and sort the data streams that have been partially sorted. ### Why are the changes needed? Fix: apache#1747 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? unit test and test in cluster.
- Loading branch information
1 parent
2c670d5
commit 78df6c1
Showing
8 changed files
with
683 additions
and
0 deletions.
There are no files selected for viewing
31 changes: 31 additions & 0 deletions
31
common/src/main/java/org/apache/uniffle/common/merger/KeyValueIterator.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,31 @@ | ||
/* | ||
* 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.uniffle.common.merger; | ||
|
||
import java.io.IOException; | ||
|
||
public interface KeyValueIterator<K, V> { | ||
|
||
K getCurrentKey(); | ||
|
||
V getCurrentValue(); | ||
|
||
boolean next() throws IOException; | ||
|
||
void close() throws IOException; | ||
} |
35 changes: 35 additions & 0 deletions
35
common/src/main/java/org/apache/uniffle/common/merger/MergeState.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,35 @@ | ||
/* | ||
* 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.uniffle.common.merger; | ||
|
||
public enum MergeState { | ||
DONE(0), | ||
INITED(1), | ||
MERGING(2), | ||
INTERNAL_ERROR(3); | ||
|
||
private final int code; | ||
|
||
MergeState(int code) { | ||
this.code = code; | ||
} | ||
|
||
public int code() { | ||
return code; | ||
} | ||
} |
208 changes: 208 additions & 0 deletions
208
common/src/main/java/org/apache/uniffle/common/merger/Merger.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,208 @@ | ||
/* | ||
* 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.uniffle.common.merger; | ||
|
||
import java.io.IOException; | ||
import java.io.OutputStream; | ||
import java.util.ArrayList; | ||
import java.util.Comparator; | ||
import java.util.List; | ||
import java.util.function.Function; | ||
|
||
import org.apache.hadoop.io.DataOutputBuffer; | ||
import org.apache.hadoop.io.RawComparator; | ||
import org.apache.hadoop.util.PriorityQueue; | ||
|
||
import org.apache.uniffle.common.config.RssConf; | ||
import org.apache.uniffle.common.exception.RssException; | ||
import org.apache.uniffle.common.records.RecordsWriter; | ||
|
||
public class Merger { | ||
|
||
public static class MergeQueue<K, V> extends PriorityQueue<Segment> implements KeyValueIterator { | ||
|
||
private final RssConf rssConf; | ||
private final List<Segment> segments; | ||
private final Class<K> keyClass; | ||
private final Class<V> valueClass; | ||
private Comparator comparator; | ||
private boolean raw; | ||
|
||
private Object currentKey; | ||
private Object currentValue; | ||
private Segment minSegment; | ||
private Function<Integer, Segment> popSegmentHook; | ||
|
||
public MergeQueue( | ||
RssConf rssConf, | ||
List<Segment> segments, | ||
Class<K> keyClass, | ||
Class<V> valueClass, | ||
Comparator<K> comparator, | ||
boolean raw) { | ||
this.rssConf = rssConf; | ||
this.segments = segments; | ||
this.keyClass = keyClass; | ||
this.valueClass = valueClass; | ||
if (comparator == null) { | ||
throw new RssException("comparator is null!"); | ||
} | ||
this.raw = raw; | ||
this.comparator = comparator; | ||
} | ||
|
||
public void setPopSegmentHook(Function<Integer, Segment> popSegmentHook) { | ||
this.popSegmentHook = popSegmentHook; | ||
} | ||
|
||
@Override | ||
protected boolean lessThan(Object o1, Object o2) { | ||
if (raw) { | ||
Segment s1 = (Segment) o1; | ||
Segment s2 = (Segment) o2; | ||
DataOutputBuffer key1 = (DataOutputBuffer) s1.getCurrentKey(); | ||
DataOutputBuffer key2 = (DataOutputBuffer) s2.getCurrentKey(); | ||
int c = | ||
((RawComparator) comparator) | ||
.compare(key1.getData(), 0, key1.getLength(), key2.getData(), 0, key2.getLength()); | ||
return c < 0 || ((c == 0) && s1.getId() < s2.getId()); | ||
} else { | ||
Segment s1 = (Segment) o1; | ||
Segment s2 = (Segment) o2; | ||
Object key1 = s1.getCurrentKey(); | ||
Object key2 = s2.getCurrentKey(); | ||
int c = comparator.compare(key1, key2); | ||
return c < 0 || ((c == 0) && s1.getId() < s2.getId()); | ||
} | ||
} | ||
|
||
public void init() throws IOException { | ||
List<Segment> segmentsToMerge = new ArrayList(); | ||
for (Segment segment : segments) { | ||
boolean hasNext = segment.next(); | ||
if (hasNext) { | ||
segmentsToMerge.add(segment); | ||
} else { | ||
segment.close(); | ||
} | ||
} | ||
initialize(segmentsToMerge.size()); | ||
clear(); | ||
for (Segment segment : segmentsToMerge) { | ||
put(segment); | ||
} | ||
} | ||
|
||
@Override | ||
public Object getCurrentKey() { | ||
return currentKey; | ||
} | ||
|
||
@Override | ||
public Object getCurrentValue() { | ||
return currentValue; | ||
} | ||
|
||
@Override | ||
public boolean next() throws IOException { | ||
if (size() == 0) { | ||
resetKeyValue(); | ||
return false; | ||
} | ||
|
||
if (minSegment != null) { | ||
adjustPriorityQueue(minSegment); | ||
if (size() == 0) { | ||
minSegment = null; | ||
resetKeyValue(); | ||
return false; | ||
} | ||
} | ||
minSegment = top(); | ||
currentKey = minSegment.getCurrentKey(); | ||
currentValue = minSegment.getCurrentValue(); | ||
return true; | ||
} | ||
|
||
private void resetKeyValue() { | ||
currentKey = null; | ||
currentValue = null; | ||
} | ||
|
||
private void adjustPriorityQueue(Segment segment) throws IOException { | ||
if (segment.next()) { | ||
adjustTop(); | ||
} else { | ||
pop(); | ||
segment.close(); | ||
if (popSegmentHook != null) { | ||
Segment newSegment = popSegmentHook.apply((int) segment.getId()); | ||
if (newSegment != null) { | ||
if (newSegment.next()) { | ||
put(newSegment); | ||
} else { | ||
newSegment.close(); | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
void merge(OutputStream output) throws IOException { | ||
RecordsWriter<K, V> writer = | ||
new RecordsWriter<K, V>(rssConf, output, keyClass, valueClass, raw); | ||
boolean recorded = true; | ||
while (this.next()) { | ||
writer.append(this.getCurrentKey(), this.getCurrentValue()); | ||
if (output instanceof Recordable) { | ||
recorded = | ||
((Recordable) output) | ||
.record(writer.getTotalBytesWritten(), () -> writer.flush(), false); | ||
} | ||
} | ||
writer.flush(); | ||
if (!recorded) { | ||
((Recordable) output).record(writer.getTotalBytesWritten(), null, true); | ||
} | ||
writer.close(); | ||
} | ||
|
||
@Override | ||
public void close() throws IOException { | ||
Segment segment; | ||
while ((segment = pop()) != null) { | ||
segment.close(); | ||
} | ||
} | ||
} | ||
|
||
public static void merge( | ||
RssConf conf, | ||
OutputStream output, | ||
List<Segment> segments, | ||
Class keyClass, | ||
Class valueClass, | ||
Comparator comparator, | ||
boolean raw) | ||
throws IOException { | ||
MergeQueue mergeQueue = new MergeQueue(conf, segments, keyClass, valueClass, comparator, raw); | ||
mergeQueue.init(); | ||
mergeQueue.merge(output); | ||
mergeQueue.close(); | ||
} | ||
} |
30 changes: 30 additions & 0 deletions
30
common/src/main/java/org/apache/uniffle/common/merger/Recordable.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,30 @@ | ||
/* | ||
* 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.uniffle.common.merger; | ||
|
||
import java.io.IOException; | ||
|
||
public interface Recordable { | ||
|
||
@FunctionalInterface | ||
interface Flushable { | ||
void flush() throws IOException; | ||
} | ||
|
||
boolean record(long written, Flushable flush, boolean force) throws IOException; | ||
} |
41 changes: 41 additions & 0 deletions
41
common/src/main/java/org/apache/uniffle/common/merger/Segment.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,41 @@ | ||
/* | ||
* 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.uniffle.common.merger; | ||
|
||
import java.io.IOException; | ||
|
||
public abstract class Segment { | ||
|
||
private long id; | ||
|
||
public Segment(long id) { | ||
this.id = id; | ||
} | ||
|
||
public abstract boolean next() throws IOException; | ||
|
||
public abstract Object getCurrentKey(); | ||
|
||
public abstract Object getCurrentValue(); | ||
|
||
public long getId() { | ||
return this.id; | ||
} | ||
|
||
public abstract void close() throws IOException; | ||
} |
Oops, something went wrong.