This is an automated email from the ASF dual-hosted git repository. xuba pushed a commit to branch v0.7.x-test-front in repository https://gitbox.apache.org/repos/asf/amoro.git
commit 88aedfff0e9c574f795e7d6f660ef10bef6edf1d Author: Paul Lin <[email protected]> AuthorDate: Thu Mar 28 09:38:45 2024 +0800 [Hotfix] Fix typo in StatedPersistentBase (#2685) (cherry picked from commit 3bf7104278ddaeb99e10c862352202e73d4bb2d1) --- .../netease/arctic/server/optimizing/TaskRuntime.java | 10 +++++----- .../arctic/server/persistence/StatedPersistentBase.java | 4 ++-- .../com/netease/arctic/server/table/TableRuntime.java | 16 ++++++++-------- .../server/persistence/TestStatedPersistentBase.java | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ams/server/src/main/java/com/netease/arctic/server/optimizing/TaskRuntime.java b/ams/server/src/main/java/com/netease/arctic/server/optimizing/TaskRuntime.java index eab409f20..9eb82409e 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/optimizing/TaskRuntime.java +++ b/ams/server/src/main/java/com/netease/arctic/server/optimizing/TaskRuntime.java @@ -73,7 +73,7 @@ public class TaskRuntime extends StatedPersistentBase { } public void complete(OptimizerThread thread, OptimizingTaskResult result) { - invokeConsisitency( + invokeConsistency( () -> { validThread(thread); if (result.getErrorMessage() != null) { @@ -107,7 +107,7 @@ public class TaskRuntime extends StatedPersistentBase { } void reset() { - invokeConsisitency( + invokeConsistency( () -> { statusMachine.accept(Status.PLANNED); startTime = ArcticServiceConstants.INVALID_TIME; @@ -123,7 +123,7 @@ public class TaskRuntime extends StatedPersistentBase { } public void schedule(OptimizerThread thread) { - invokeConsisitency( + invokeConsistency( () -> { statusMachine.accept(Status.SCHEDULED); token = thread.getToken(); @@ -134,7 +134,7 @@ public class TaskRuntime extends StatedPersistentBase { } public void ack(OptimizerThread thread) { - invokeConsisitency( + invokeConsistency( () -> { validThread(thread); statusMachine.accept(Status.ACKED); @@ -143,7 +143,7 @@ public class TaskRuntime extends StatedPersistentBase { } void tryCanceling() { - invokeConsisitency( + invokeConsistency( () -> { if (statusMachine.tryAccepting(Status.CANCELED)) { endTime = System.currentTimeMillis(); diff --git a/ams/server/src/main/java/com/netease/arctic/server/persistence/StatedPersistentBase.java b/ams/server/src/main/java/com/netease/arctic/server/persistence/StatedPersistentBase.java index 1cbd67d4f..48ed466a4 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/persistence/StatedPersistentBase.java +++ b/ams/server/src/main/java/com/netease/arctic/server/persistence/StatedPersistentBase.java @@ -45,7 +45,7 @@ public abstract class StatedPersistentBase extends PersistentBase { consistentFields = getOrCreateConsistentFields(); } - protected final void invokeConsisitency(Runnable runnable) { + protected final void invokeConsistency(Runnable runnable) { stateLock.lock(); Map<Field, Object> states = retainStates(); try { @@ -58,7 +58,7 @@ public abstract class StatedPersistentBase extends PersistentBase { } } - protected final <T> T invokeConsisitency(Supplier<T> supplier) { + protected final <T> T invokeConsistency(Supplier<T> supplier) { stateLock.lock(); Map<Field, Object> states = retainStates(); try { diff --git a/ams/server/src/main/java/com/netease/arctic/server/table/TableRuntime.java b/ams/server/src/main/java/com/netease/arctic/server/table/TableRuntime.java index 40ae6f10e..d66efd363 100644 --- a/ams/server/src/main/java/com/netease/arctic/server/table/TableRuntime.java +++ b/ams/server/src/main/java/com/netease/arctic/server/table/TableRuntime.java @@ -163,7 +163,7 @@ public class TableRuntime extends StatedPersistentBase { } public void beginPlanning() { - invokeConsisitency( + invokeConsistency( () -> { OptimizingStatus originalStatus = optimizingStatus; updateOptimizingStatus(OptimizingStatus.PLANNING); @@ -173,7 +173,7 @@ public class TableRuntime extends StatedPersistentBase { } public void planFailed() { - invokeConsisitency( + invokeConsistency( () -> { OptimizingStatus originalStatus = optimizingStatus; updateOptimizingStatus(OptimizingStatus.PENDING); @@ -183,7 +183,7 @@ public class TableRuntime extends StatedPersistentBase { } public void beginProcess(OptimizingProcess optimizingProcess) { - invokeConsisitency( + invokeConsistency( () -> { OptimizingStatus originalStatus = optimizingStatus; this.optimizingProcess = optimizingProcess; @@ -196,7 +196,7 @@ public class TableRuntime extends StatedPersistentBase { } public void beginCommitting() { - invokeConsisitency( + invokeConsistency( () -> { OptimizingStatus originalStatus = optimizingStatus; updateOptimizingStatus(OptimizingStatus.COMMITTING); @@ -206,7 +206,7 @@ public class TableRuntime extends StatedPersistentBase { } public void setPendingInput(OptimizingEvaluator.PendingInput pendingInput) { - invokeConsisitency( + invokeConsistency( () -> { this.pendingInput = pendingInput; if (optimizingStatus == OptimizingStatus.IDLE) { @@ -222,7 +222,7 @@ public class TableRuntime extends StatedPersistentBase { } public TableRuntime refresh(AmoroTable<?> table) { - return invokeConsisitency( + return invokeConsistency( () -> { TableConfiguration configuration = tableConfiguration; boolean configChanged = updateConfigInternal(table.properties()); @@ -237,7 +237,7 @@ public class TableRuntime extends StatedPersistentBase { } public void cleanPendingInput() { - invokeConsisitency( + invokeConsistency( () -> { pendingInput = null; if (optimizingStatus == OptimizingStatus.PLANNING @@ -267,7 +267,7 @@ public class TableRuntime extends StatedPersistentBase { } public void completeProcess(boolean success) { - invokeConsisitency( + invokeConsistency( () -> { OptimizingStatus originalStatus = optimizingStatus; if (success) { diff --git a/ams/server/src/test/java/com/netease/arctic/server/persistence/TestStatedPersistentBase.java b/ams/server/src/test/java/com/netease/arctic/server/persistence/TestStatedPersistentBase.java index 0400481ed..0cfea7490 100644 --- a/ams/server/src/test/java/com/netease/arctic/server/persistence/TestStatedPersistentBase.java +++ b/ams/server/src/test/java/com/netease/arctic/server/persistence/TestStatedPersistentBase.java @@ -45,7 +45,7 @@ public class TestStatedPersistentBase { public void testStateField() throws Throwable { ExtendedPersistency proxy = new ExtendedPersistency(); try { - proxy.invokeConsisitency( + proxy.invokeConsistency( () -> { proxy.stringState = "test"; proxy.intState = 42; @@ -63,7 +63,7 @@ public class TestStatedPersistentBase { public void testNormalField() throws Throwable { ExtendedPersistency proxy = new ExtendedPersistency(); try { - proxy.invokeConsisitency( + proxy.invokeConsistency( () -> { proxy.booleanField = true; proxy.longField = 123456789L;
