Skip to content

[core] Slightly refatory code in LookupChangelogMergeFunctionWrapper #5010

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
JingsongLi merged 4 commits into from
Feb 11, 2025
Merged

[core] Slightly refatory code in LookupChangelogMergeFunctionWrapper #5010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a42c104
[core] Slightly refatory code in LookUpFunctionWrapper
leaves12138 Feb 5, 2025
050532a
fix comment
leaves12138 Feb 5, 2025
254bcd2
Fix comment
leaves12138 Feb 10, 2025
eb48082
Fix comment
leaves12138 Feb 10, 2025
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
31 changes: 18 additions & 13 deletions ...rc/main/java/org/apache/paimon/mergetree/compact/LookupChangelogMergeFunctionWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.paimon.KeyValue;
import org.apache.paimon.codegen.RecordEqualiser;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.data.serializer.InternalRowSerializer;
import org.apache.paimon.deletionvectors.DeletionVectorsMaintainer;
import org.apache.paimon.lookup.LookupStrategy;
import org.apache.paimon.mergetree.LookupLevels.PositionedKeyValue;
Expand Down Expand Up @@ -56,8 +57,7 @@
public class LookupChangelogMergeFunctionWrapper<T>
implements MergeFunctionWrapper<ChangelogResult> {

private final LookupMergeFunction mergeFunction;
private final MergeFunction<KeyValue> mergeFunction2;
private final MergeFunction<KeyValue> mergeFunction;
private final Function<InternalRow, T> lookup;

private final ChangelogResult reusedResult = new ChangelogResult();
Expand All @@ -68,6 +68,10 @@ public class LookupChangelogMergeFunctionWrapper<T>
private final @Nullable DeletionVectorsMaintainer deletionVectorsMaintainer;
private final Comparator<KeyValue> comparator;

private final LinkedList<KeyValue> candidates = new LinkedList<>();
private final InternalRowSerializer keySerializer;
private final InternalRowSerializer valueSerializer;

public LookupChangelogMergeFunctionWrapper(
MergeFunctionFactory<KeyValue> mergeFunctionFactory,
Function<InternalRow, T> lookup,
Expand All @@ -85,8 +89,10 @@ public LookupChangelogMergeFunctionWrapper(
deletionVectorsMaintainer != null,
"deletionVectorsMaintainer should not be null, there is a bug.");
}
this.mergeFunction = (LookupMergeFunction) mergeFunction;
this.mergeFunction2 = mergeFunctionFactory.create();
LookupMergeFunction lookupMergeFunction = (LookupMergeFunction) mergeFunction;
this.keySerializer = lookupMergeFunction.getKeySerializer();
this.valueSerializer = lookupMergeFunction.getValueSerializer();
this.mergeFunction = mergeFunctionFactory.create();
this.lookup = lookup;
this.valueEqualiser = valueEqualiser;
this.lookupStrategy = lookupStrategy;
Expand All @@ -96,18 +102,17 @@ public LookupChangelogMergeFunctionWrapper(

@Override
public void reset() {
mergeFunction.reset();
candidates.clear();
}

@Override
public void add(KeyValue kv) {
mergeFunction.add(kv);
candidates.add(kv.copy(keySerializer, valueSerializer));
}

@Override
public ChangelogResult getResult() {
// 1. Compute the latest high level record and containLevel0 of candidates
LinkedList<KeyValue> candidates = mergeFunction.candidates();
Iterator<KeyValue> descending = candidates.descendingIterator();
KeyValue highLevel = null;
boolean containLevel0 = false;
Expand Down Expand Up @@ -152,20 +157,20 @@ public ChangelogResult getResult() {
}

private KeyValue calculateResult(List<KeyValue> candidates, @Nullable KeyValue highLevel) {
mergeFunction2.reset();
mergeFunction.reset();
for (KeyValue candidate : candidates) {
if (highLevel != null && comparator.compare(highLevel, candidate) < 0) {
mergeFunction2.add(highLevel);
mergeFunction2.add(candidate);
mergeFunction.add(highLevel);
mergeFunction.add(candidate);
highLevel = null;
} else {
mergeFunction2.add(candidate);
mergeFunction.add(candidate);
}
}
if (highLevel != null) {
mergeFunction2.add(highLevel);
mergeFunction.add(highLevel);
}
return mergeFunction2.getResult();
return mergeFunction.getResult();
}

private void setChangelog(@Nullable KeyValue before, KeyValue after) {
Expand Down
12 changes: 8 additions & 4 deletions paimon-core/src/main/java/org/apache/paimon/mergetree/compact/LookupMergeFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ public void add(KeyValue kv) {
candidates.add(kv.copy(keySerializer, valueSerializer));
}

public InternalRowSerializer getKeySerializer() {
return keySerializer;
}

public InternalRowSerializer getValueSerializer() {
return valueSerializer;
}

@Override
public KeyValue getResult() {
// 1. Find the latest high level record
Expand All @@ -79,10 +87,6 @@ public KeyValue getResult() {
return mergeFunction.getResult();
}

LinkedList<KeyValue> candidates() {
return candidates;
}

public static MergeFunctionFactory<KeyValue> wrap(
MergeFunctionFactory<KeyValue> wrapped, RowType keyType, RowType valueType) {
if (wrapped.create() instanceof FirstRowMergeFunction) {
Expand Down