1 files changed, 20 insertions, 0 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java b/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java
index 9957898e459..4a77d30ec92 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java
@@ -387,6 +387,18 @@ public class ProgressToken {
     }
 
     /**
+     * Marks the current bucket as finished and advances the bucket cursor;
+     * throws instead if the current bucket is already {@link #addBucket added}.
+     */
+    void skipCurrentBucket() {
+        if (buckets.containsKey(bucketToKeyWrapper(getCurrentBucketId())))
+            throw new IllegalStateException("Current bucket was already added to the explicit bucket set");
+
+        ++finishedBucketCount;
+        ++bucketCursor;
+    }
+
+    /**
      * Directly generate a bucket Id key for the <code>n</code>th bucket in
      * reverse sorted order.
      *
@@ -428,6 +440,14 @@ public class ProgressToken {
         return bucketCursor;
     }
 
+    static BucketId toBucketId(long bucketCursor, int distributionBits) {
+        return new BucketId(keyToBucketId(makeNthBucketKey(bucketCursor, distributionBits)));
+    }
+
+    BucketId getCurrentBucketId() {
+        return toBucketId(getBucketCursor(), getDistributionBitCount());
+    }
+
     protected void setBucketCursor(long bucketCursor) {
         this.bucketCursor = bucketCursor;
     }