Skip to content

Commit ce3d719

Browse files
committed
[core] Minor refactor arguements for FileStoreCommitImpl
1 parent 974f577 commit ce3d719

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

paimon-core/src/main/java/org/apache/paimon/AbstractFileStore.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ public FileStoreCommitImpl newCommit(String commitUser, FileStoreTable table) {
326326
newStatsFileHandler(),
327327
bucketMode(),
328328
options.scanManifestParallelism(),
329+
createCommitPreCallbacks(table),
329330
createCommitCallbacks(commitUser, table),
330331
options.commitMaxRetries(),
331332
options.commitTimeout(),
@@ -335,8 +336,7 @@ public FileStoreCommitImpl newCommit(String commitUser, FileStoreTable table) {
335336
options.commitDiscardDuplicateFiles(),
336337
conflictDetectFactory,
337338
strictModeChecker,
338-
rollback,
339-
createCommitPreCallbacks(commitUser, table));
339+
rollback);
340340
}
341341

342342
@Override
@@ -395,6 +395,14 @@ public InternalRowPartitionComputer partitionComputer() {
395395
options.legacyPartitionName());
396396
}
397397

398+
private List<CommitPreCallback> createCommitPreCallbacks(FileStoreTable table) {
399+
List<CommitPreCallback> callbacks = new ArrayList<>();
400+
if (options.isChainTable()) {
401+
callbacks.add(new ChainTableCommitPreCallback(table));
402+
}
403+
return callbacks;
404+
}
405+
398406
private List<CommitCallback> createCommitCallbacks(String commitUser, FileStoreTable table) {
399407
List<CommitCallback> callbacks = new ArrayList<>();
400408

@@ -434,15 +442,6 @@ private List<CommitCallback> createCommitCallbacks(String commitUser, FileStoreT
434442
return callbacks;
435443
}
436444

437-
private List<CommitPreCallback> createCommitPreCallbacks(
438-
String commitUser, FileStoreTable table) {
439-
List<CommitPreCallback> callbacks = new ArrayList<>();
440-
if (options.isChainTable()) {
441-
callbacks.add(new ChainTableCommitPreCallback(table));
442-
}
443-
return callbacks;
444-
}
445-
446445
@Override
447446
@Nullable
448447
public PartitionExpire newPartitionExpire(String commitUser, FileStoreTable table) {

paimon-core/src/main/java/org/apache/paimon/operation/FileStoreCommitImpl.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ public class FileStoreCommitImpl implements FileStoreCommit {
150150
private final boolean dynamicPartitionOverwrite;
151151
private final String branchName;
152152
@Nullable private final Integer manifestReadParallelism;
153+
private final List<CommitPreCallback> commitPreCallbacks;
153154
private final List<CommitCallback> commitCallbacks;
154155
private final StatsFileHandler statsFileHandler;
155156
private final BucketMode bucketMode;
@@ -167,8 +168,6 @@ public class FileStoreCommitImpl implements FileStoreCommit {
167168
private CommitMetrics commitMetrics;
168169
private boolean appendCommitCheckConflict = false;
169170

170-
private final List<CommitPreCallback> commitPreCallbacks;
171-
172171
public FileStoreCommitImpl(
173172
SnapshotCommit snapshotCommit,
174173
FileIO fileIO,
@@ -193,6 +192,7 @@ public FileStoreCommitImpl(
193192
StatsFileHandler statsFileHandler,
194193
BucketMode bucketMode,
195194
@Nullable Integer manifestReadParallelism,
195+
List<CommitPreCallback> commitPreCallbacks,
196196
List<CommitCallback> commitCallbacks,
197197
int commitMaxRetries,
198198
long commitTimeout,
@@ -202,8 +202,7 @@ public FileStoreCommitImpl(
202202
boolean discardDuplicateFiles,
203203
ConflictDetection.Factory conflictDetectFactory,
204204
@Nullable StrictModeChecker strictModeChecker,
205-
@Nullable CommitRollback rollback,
206-
List<CommitPreCallback> commitPreCallbacks) {
205+
@Nullable CommitRollback rollback) {
207206
this.snapshotCommit = snapshotCommit;
208207
this.fileIO = fileIO;
209208
this.schemaManager = schemaManager;
@@ -226,6 +225,7 @@ public FileStoreCommitImpl(
226225
this.dynamicPartitionOverwrite = dynamicPartitionOverwrite;
227226
this.branchName = branchName;
228227
this.manifestReadParallelism = manifestReadParallelism;
228+
this.commitPreCallbacks = commitPreCallbacks;
229229
this.commitCallbacks = commitCallbacks;
230230
this.commitMaxRetries = commitMaxRetries;
231231
this.commitTimeout = commitTimeout;
@@ -245,7 +245,6 @@ public FileStoreCommitImpl(
245245
this.strictModeChecker = strictModeChecker;
246246
this.conflictDetection = conflictDetectFactory.create(scanner);
247247
this.commitCleaner = new CommitCleaner(manifestList, manifestFile, indexManifestFile);
248-
this.commitPreCallbacks = commitPreCallbacks;
249248
}
250249

251250
@Override

0 commit comments

Comments
 (0)