From f4f04e0929d07b37b61508e00e507cf42978d8ef Mon Sep 17 00:00:00 2001 From: Robert Newson Date: Wed, 26 Apr 2023 10:15:24 +0100 Subject: enhance out of order message --- nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java | 2 +- .../apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java index 7d893a9e2..a08b17816 100644 --- a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java +++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/core/Index.java @@ -152,7 +152,7 @@ public abstract class Index implements Closeable { protected final void assertUpdateSeqIsLower(final long updateSeq) throws UpdatesOutOfOrderException { assert Thread.holdsLock(this); if (!(updateSeq > this.updateSeq)) { - throw new UpdatesOutOfOrderException(); + throw new UpdatesOutOfOrderException(this.updateSeq, updateSeq); } } diff --git a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java b/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java index 3b89f41d2..fe7c1b899 100644 --- a/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java +++ b/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java @@ -15,10 +15,11 @@ package org.apache.couchdb.nouveau.core; import java.io.IOException; -public class UpdatesOutOfOrderException extends IOException { +public final class UpdatesOutOfOrderException extends IOException { - public UpdatesOutOfOrderException() { - super("Updates applied in the wrong order"); + public UpdatesOutOfOrderException(final long currentSeq, final long attemptedSeq) { + super(String.format("Updates applied in the wrong order (current seq: %d, attempted seq: %d)", + currentSeq, attemptedSeq)); } } -- cgit v1.2.1