This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 116966354 [minor] Rename doCompaction to waitCompaction in
PrepareCommitOperator
116966354 is described below
commit 1169663544ff5e77abe64eb499eaaa8d9cab6c5d
Author: Jingsong <[email protected]>
AuthorDate: Tue Aug 1 10:55:44 2023 +0800
[minor] Rename doCompaction to waitCompaction in PrepareCommitOperator
---
.../flink/sink/AppendOnlyTableCompactionWorkerOperator.java | 4 ++--
.../apache/paimon/flink/sink/GlobalFullCompactionSinkWrite.java | 8 ++++----
.../java/org/apache/paimon/flink/sink/PrepareCommitOperator.java | 6 +++---
.../org/apache/paimon/flink/sink/RowDataStoreWriteOperator.java | 4 ++--
.../java/org/apache/paimon/flink/sink/StoreCompactOperator.java | 4 ++--
.../java/org/apache/paimon/flink/sink/TableWriteOperator.java | 4 ++--
.../paimon/flink/sink/cdc/CdcRecordStoreMultiWriteOperator.java | 4 ++--
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/AppendOnlyTableCompactionWorkerOperator.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/AppendOnlyTableCompactionWorkerOperator.java
index 8ba064884..abcc8d618 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/AppendOnlyTableCompactionWorkerOperator.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/AppendOnlyTableCompactionWorkerOperator.java
@@ -57,9 +57,9 @@ public class AppendOnlyTableCompactionWorkerOperator
}
@Override
- protected List<Committable> prepareCommit(boolean doCompaction, long
checkpointId)
+ protected List<Committable> prepareCommit(boolean waitCompaction, long
checkpointId)
throws IOException {
- // ignore doCompaction tag
+ // ignore waitCompaction tag
ArrayList<CommitMessage> tempList = new ArrayList<>(result);
result.clear();
return tempList.stream()
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/GlobalFullCompactionSinkWrite.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/GlobalFullCompactionSinkWrite.java
index 847153ae0..8e0745afb 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/GlobalFullCompactionSinkWrite.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/GlobalFullCompactionSinkWrite.java
@@ -130,7 +130,7 @@ public class GlobalFullCompactionSinkWrite extends
StoreSinkWriteImpl {
}
@Override
- public List<Committable> prepareCommit(boolean doCompaction, long
checkpointId)
+ public List<Committable> prepareCommit(boolean waitCompaction, long
checkpointId)
throws IOException {
checkSuccessfulFullCompaction();
@@ -154,10 +154,10 @@ public class GlobalFullCompactionSinkWrite extends
StoreSinkWriteImpl {
}
if (!writtenBuckets.isEmpty() &&
isFullCompactedIdentifier(checkpointId, deltaCommits)) {
- doCompaction = true;
+ waitCompaction = true;
}
- if (doCompaction) {
+ if (waitCompaction) {
if (LOG.isDebugEnabled()) {
LOG.debug("Submit full compaction for checkpoint #{}",
checkpointId);
}
@@ -165,7 +165,7 @@ public class GlobalFullCompactionSinkWrite extends
StoreSinkWriteImpl {
commitIdentifiersToCheck.add(checkpointId);
}
- return super.prepareCommit(doCompaction, checkpointId);
+ return super.prepareCommit(waitCompaction, checkpointId);
}
private void checkSuccessfulFullCompaction() {
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/PrepareCommitOperator.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/PrepareCommitOperator.java
index 9dd4b8cdc..d4397309b 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/PrepareCommitOperator.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/PrepareCommitOperator.java
@@ -106,11 +106,11 @@ public abstract class PrepareCommitOperator<IN, OUT>
extends AbstractStreamOpera
}
}
- private void emitCommittables(boolean doCompaction, long checkpointId)
throws IOException {
- prepareCommit(doCompaction, checkpointId)
+ private void emitCommittables(boolean waitCompaction, long checkpointId)
throws IOException {
+ prepareCommit(waitCompaction, checkpointId)
.forEach(committable -> output.collect(new
StreamRecord<>(committable)));
}
- protected abstract List<OUT> prepareCommit(boolean doCompaction, long
checkpointId)
+ protected abstract List<OUT> prepareCommit(boolean waitCompaction, long
checkpointId)
throws IOException;
}
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/RowDataStoreWriteOperator.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/RowDataStoreWriteOperator.java
index 51eb54948..860cfc2a5 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/RowDataStoreWriteOperator.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/RowDataStoreWriteOperator.java
@@ -178,9 +178,9 @@ public class RowDataStoreWriteOperator extends
TableWriteOperator<RowData> {
}
@Override
- protected List<Committable> prepareCommit(boolean doCompaction, long
checkpointId)
+ protected List<Committable> prepareCommit(boolean waitCompaction, long
checkpointId)
throws IOException {
- List<Committable> committables = super.prepareCommit(doCompaction,
checkpointId);
+ List<Committable> committables = super.prepareCommit(waitCompaction,
checkpointId);
if (logCallback != null) {
try {
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/StoreCompactOperator.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/StoreCompactOperator.java
index daa851286..a2f398fd3 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/StoreCompactOperator.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/StoreCompactOperator.java
@@ -125,9 +125,9 @@ public class StoreCompactOperator extends
PrepareCommitOperator<RowData, Committ
}
@Override
- protected List<Committable> prepareCommit(boolean doCompaction, long
checkpointId)
+ protected List<Committable> prepareCommit(boolean waitCompaction, long
checkpointId)
throws IOException {
- return write.prepareCommit(doCompaction, checkpointId);
+ return write.prepareCommit(waitCompaction, checkpointId);
}
@Override
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/TableWriteOperator.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/TableWriteOperator.java
index 914576195..860116081 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/TableWriteOperator.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/TableWriteOperator.java
@@ -113,8 +113,8 @@ public abstract class TableWriteOperator<IN> extends
PrepareCommitOperator<IN, C
}
@Override
- protected List<Committable> prepareCommit(boolean doCompaction, long
checkpointId)
+ protected List<Committable> prepareCommit(boolean waitCompaction, long
checkpointId)
throws IOException {
- return write.prepareCommit(doCompaction, checkpointId);
+ return write.prepareCommit(waitCompaction, checkpointId);
}
}
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/cdc/CdcRecordStoreMultiWriteOperator.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/cdc/CdcRecordStoreMultiWriteOperator.java
index 531178938..34292d0ef 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/cdc/CdcRecordStoreMultiWriteOperator.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/cdc/CdcRecordStoreMultiWriteOperator.java
@@ -204,14 +204,14 @@ public class CdcRecordStoreMultiWriteOperator
}
@Override
- protected List<MultiTableCommittable> prepareCommit(boolean doCompaction,
long checkpointId)
+ protected List<MultiTableCommittable> prepareCommit(boolean
waitCompaction, long checkpointId)
throws IOException {
List<MultiTableCommittable> committables = new LinkedList<>();
for (Map.Entry<Identifier, StoreSinkWrite> entry : writes.entrySet()) {
Identifier key = entry.getKey();
StoreSinkWrite write = entry.getValue();
committables.addAll(
- write.prepareCommit(doCompaction, checkpointId).stream()
+ write.prepareCommit(waitCompaction, checkpointId).stream()
.map(
committable ->
MultiTableCommittable.fromCommittable(key, committable))
