Handle ConflictOccurredException exception

KodaiD · KodaiD · commit 4f6801f77f4b · 2025-11-14T09:39:47.000+09:00
diff --git a/core/src/main/java/com/scalar/db/storage/objectstorage/MutateStatementHandler.java b/core/src/main/java/com/scalar/db/storage/objectstorage/MutateStatementHandler.java
@@ -78,7 +78,7 @@ private void writePartition(ObjectStoragePartitionSnapshot snapshot) throws Exec
           wrapper.insert(snapshot.getObjectKey(), snapshot.getPartition().serialize());
         }
       }
-    } catch (PreconditionFailedException e) {
+    } catch (PreconditionFailedException | ConflictOccurredException e) {
       throw new RetriableExecutionException(
           CoreError.OBJECT_STORAGE_CONFLICT_OCCURRED_IN_MUTATION.buildMessage(e.getMessage()), e);
     } catch (ObjectStorageWrapperException e) {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ private void writePartition(ObjectStoragePartitionSnapshot snapshot) throws Exec`
`78`	`78`	`wrapper.insert(snapshot.getObjectKey(), snapshot.getPartition().serialize());`
`79`	`79`	`}`
`80`	`80`	`}`
`81`		`- } catch (PreconditionFailedException e) {`
	`81`	`+ } catch (PreconditionFailedException \| ConflictOccurredException e) {`
`82`	`82`	`throw new RetriableExecutionException(`
`83`	`83`	`CoreError.OBJECT_STORAGE_CONFLICT_OCCURRED_IN_MUTATION.buildMessage(e.getMessage()), e);`
`84`	`84`	`} catch (ObjectStorageWrapperException e) {`