This is an automated email from the ASF dual-hosted git repository.
ivank pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 079013e Rename LedgerMetadataBuilder#closingAt to parameter order
(#1835)
079013e is described below
commit 079013e6637ed3c3ea543cb2a094dbd5c8ee0e00
Author: Ivan Kelly <[email protected]>
AuthorDate: Thu Nov 29 10:07:00 2018 +0100
Rename LedgerMetadataBuilder#closingAt to parameter order (#1835)
* Rename LedgerMetadataBuilder#closingAt to clarify parameter order
The two parameters are long, which can be confusing.
Master issue: #281
---
.../main/java/org/apache/bookkeeper/client/LedgerHandle.java | 3 ++-
.../java/org/apache/bookkeeper/client/LedgerMetadata.java | 4 ++--
.../org/apache/bookkeeper/client/LedgerMetadataBuilder.java | 12 ++++++++++--
.../org/apache/bookkeeper/client/ReadOnlyLedgerHandle.java | 2 +-
.../org/apache/bookkeeper/client/HandleFailuresTest.java | 3 ++-
.../java/org/apache/bookkeeper/client/LedgerClose2Test.java | 6 ++++--
.../org/apache/bookkeeper/client/LedgerRecovery2Test.java | 3 ++-
.../org/apache/bookkeeper/client/MetadataUpdateLoopTest.java | 5 ++++-
.../bookkeeper/client/TestLedgerFragmentReplication.java | 2 +-
9 files changed, 28 insertions(+), 12 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
index dedae6e..9af3271 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
@@ -557,7 +557,8 @@ public class LedgerHandle implements WriteHandle {
},
(metadata) -> {
return LedgerMetadataBuilder.from(metadata)
- .closingAt(lastEntry, finalLength).build();
+
.withClosedState().withLastEntryId(lastEntry)
+ .withLength(finalLength).build();
},
LedgerHandle.this::setLedgerMetadata)
.run().whenComplete((metadata, ex) -> {
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java
index 514f1af..894a7b1 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java
@@ -441,7 +441,7 @@ public class LedgerMetadata implements
org.apache.bookkeeper.client.api.LedgerMe
if (data.getState() == LedgerMetadataFormat.State.IN_RECOVERY) {
builder.withInRecoveryState();
} else if (data.getState() == LedgerMetadataFormat.State.CLOSED) {
- builder.closingAt(data.getLastEntryId(), data.getLength());
+
builder.withClosedState().withLastEntryId(data.getLastEntryId()).withLength(data.getLength());
}
if (data.hasPassword()) {
@@ -483,7 +483,7 @@ public class LedgerMetadata implements
org.apache.bookkeeper.client.api.LedgerMe
if (l == IN_RECOVERY) {
builder.withInRecoveryState();
} else {
- builder.closingAt(l, length);
+
builder.withClosedState().withLastEntryId(l).withLength(length);
}
break;
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadataBuilder.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadataBuilder.java
index 4a42c70..9034e18 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadataBuilder.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadataBuilder.java
@@ -147,10 +147,18 @@ public class LedgerMetadataBuilder {
return this;
}
- public LedgerMetadataBuilder closingAt(long lastEntryId, long length) {
+ public LedgerMetadataBuilder withClosedState() {
+ this.state = LedgerMetadataFormat.State.CLOSED;
+ return this;
+ }
+
+ public LedgerMetadataBuilder withLastEntryId(long lastEntryId) {
this.lastEntryId = Optional.of(lastEntryId);
+ return this;
+ }
+
+ public LedgerMetadataBuilder withLength(long length) {
this.length = Optional.of(length);
- this.state = LedgerMetadataFormat.State.CLOSED;
return this;
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadOnlyLedgerHandle.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadOnlyLedgerHandle.java
index 9c2901c..59ddd56 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadOnlyLedgerHandle.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadOnlyLedgerHandle.java
@@ -326,7 +326,7 @@ class ReadOnlyLedgerHandle extends LedgerHandle implements
LedgerMetadataListene
}
});
}
- return builder.closingAt(lac, len).build();
+ return
builder.withClosedState().withLastEntryId(lac).withLength(len).build();
},
this::setLedgerMetadata).run();
f.thenRun(() -> {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/HandleFailuresTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/HandleFailuresTest.java
index e4b48d9..2f75e12 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/HandleFailuresTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/HandleFailuresTest.java
@@ -294,7 +294,8 @@ public class HandleFailuresTest {
changeInProgress.get();
ClientUtil.transformMetadata(clientCtx, 10L,
- (metadata) ->
LedgerMetadataBuilder.from(metadata).closingAt(1234L, 10L).build());
+ (metadata) -> LedgerMetadataBuilder.from(metadata)
+
.withClosedState().withLastEntryId(1234L).withLength(10L).build());
blockEnsembleChange.complete(null); // allow ensemble change to
continue
try {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerClose2Test.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerClose2Test.java
index 93846bb..541af0a 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerClose2Test.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerClose2Test.java
@@ -141,7 +141,8 @@ public class LedgerClose2Test {
closeInProgress.get();
ClientUtil.transformMetadata(clientCtx, 10L,
- (metadata) ->
LedgerMetadataBuilder.from(metadata).closingAt(lac, length).build());
+ (metadata) -> LedgerMetadataBuilder.from(metadata)
+
.withClosedState().withLastEntryId(lac).withLength(length).build());
blockClose.complete(null);
closeFuture.get();
@@ -183,7 +184,8 @@ public class LedgerClose2Test {
/* close with different length. can happen in cases where there's a
write outstanding */
ClientUtil.transformMetadata(clientCtx, 10L,
- (metadata) ->
LedgerMetadataBuilder.from(metadata).closingAt(lac + 1, length + 100).build());
+ (metadata) -> LedgerMetadataBuilder.from(metadata)
+ .withClosedState().withLastEntryId(lac +
1).withLength(length + 100).build());
blockClose.complete(null);
try {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecovery2Test.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecovery2Test.java
index 2a1050e..82c1a4b 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecovery2Test.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecovery2Test.java
@@ -123,7 +123,8 @@ public class LedgerRecovery2Test {
writingBack.get(10, TimeUnit.SECONDS);
ClientUtil.transformMetadata(clientCtx, 1L,
- (metadata) ->
LedgerMetadataBuilder.from(metadata).closingAt(-1, 0).build());
+ (metadata) -> LedgerMetadataBuilder.from(metadata)
+
.withClosedState().withLastEntryId(-1).withLength(0).build());
// allow recovery to continue
blocker.complete(null);
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MetadataUpdateLoopTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MetadataUpdateLoopTest.java
index 843ec9b..2544a20 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MetadataUpdateLoopTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MetadataUpdateLoopTest.java
@@ -351,7 +351,10 @@ public class MetadataUpdateLoopTest {
ledgerId,
reference::get,
(currentMetadata) -> !currentMetadata.isClosed(),
- (currentMetadata) ->
LedgerMetadataBuilder.from(currentMetadata).closingAt(10L, 100L).build(),
+ (currentMetadata) -> {
+ return LedgerMetadataBuilder.from(currentMetadata)
+
.withClosedState().withLastEntryId(10L).withLength(100L).build();
+ },
reference::compareAndSet).run();
CompletableFuture<Versioned<LedgerMetadata>> loop2 = new
MetadataUpdateLoop(
lm,
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java
index 3503e91..4b8d06c 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java
@@ -242,7 +242,7 @@ public class TestLedgerFragmentReplication extends
BookKeeperClusterTestCase {
LedgerMetadata metadata = LedgerMetadataBuilder.create()
.withEnsembleSize(3).withWriteQuorumSize(3).withAckQuorumSize(3)
.withPassword(TEST_PSSWD).withDigestType(TEST_DIGEST_TYPE.toApiDigestType())
- .closingAt(-1, 0)
+ .withClosedState().withLastEntryId(-1).withLength(0)
.newEnsembleEntry(0L, ensemble)
.build();
