Skip to content

Commit 167f4d8

Browse files
mxsmmxsm
authored
[ISSUE#173] fix DLedgerServer The code is not formatted correctly
1 parent bf5b46d commit 167f4d8

File tree

7 files changed

+103
-85
lines changed

7 files changed

+103
-85
lines changed

‎src/main/java/io/openmessaging/storage/dledger/DLedgerServer.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,22 +436,42 @@ private void checkPreferredLeader() {
436436
}
437437
}
438438

439+
@Deprecated
439440
public DLedgerStore getdLedgerStore() {
440441
return dLedgerStore;
441442
}
442443

444+
public DLedgerStore getDLedgerStore() {
445+
return dLedgerStore;
446+
}
447+
448+
@Deprecated
443449
public DLedgerRpcService getdLedgerRpcService() {
444450
return dLedgerRpcService;
445451
}
446452

453+
public DLedgerRpcService getDLedgerRpcService() {
454+
return dLedgerRpcService;
455+
}
456+
457+
@Deprecated
447458
public DLedgerLeaderElector getdLedgerLeaderElector() {
448459
return dLedgerLeaderElector;
449460
}
450461

462+
public DLedgerLeaderElector getDLedgerLeaderElector() {
463+
return dLedgerLeaderElector;
464+
}
465+
466+
@Deprecated
451467
public DLedgerConfig getdLedgerConfig() {
452468
return dLedgerConfig;
453469
}
454470

471+
public DLedgerConfig getDLedgerConfig() {
472+
return dLedgerConfig;
473+
}
474+
455475
public NettyRemotingServer getRemotingServer() {
456476
if (this.dLedgerRpcService instanceof DLedgerRpcNettyService) {
457477
return ((DLedgerRpcNettyService) this.dLedgerRpcService).getRemotingServer();

‎src/test/java/io/openmessaging/storage/dledger/AppendAndGetTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ public void testThreeServerInMemory() throws Exception {
8787
Assertions.assertEquals(i, appendEntryResponse.getIndex());
8888
}
8989
Thread.sleep(1000);
90-
Assertions.assertEquals(9, dLedgerServer0.getdLedgerStore().getLedgerEndIndex());
91-
Assertions.assertEquals(9, dLedgerServer1.getdLedgerStore().getLedgerEndIndex());
92-
Assertions.assertEquals(9, dLedgerServer2.getdLedgerStore().getLedgerEndIndex());
90+
Assertions.assertEquals(9, dLedgerServer0.getDLedgerStore().getLedgerEndIndex());
91+
Assertions.assertEquals(9, dLedgerServer1.getDLedgerStore().getLedgerEndIndex());
92+
Assertions.assertEquals(9, dLedgerServer2.getDLedgerStore().getLedgerEndIndex());
9393

9494
for (int i = 0; i < 10; i++) {
9595
GetEntriesResponse getEntriesResponse = dLedgerClient.get(i);
@@ -113,9 +113,9 @@ public void testThreeServerInFile() throws Exception {
113113
Assertions.assertEquals(i, appendEntryResponse.getIndex());
114114
}
115115
Thread.sleep(100);
116-
Assertions.assertEquals(9, dLedgerServer0.getdLedgerStore().getLedgerEndIndex());
117-
Assertions.assertEquals(9, dLedgerServer1.getdLedgerStore().getLedgerEndIndex());
118-
Assertions.assertEquals(9, dLedgerServer2.getdLedgerStore().getLedgerEndIndex());
116+
Assertions.assertEquals(9, dLedgerServer0.getDLedgerStore().getLedgerEndIndex());
117+
Assertions.assertEquals(9, dLedgerServer1.getDLedgerStore().getLedgerEndIndex());
118+
Assertions.assertEquals(9, dLedgerServer2.getDLedgerStore().getLedgerEndIndex());
119119

120120
for (int i = 0; i < 10; i++) {
121121
GetEntriesResponse getEntriesResponse = dLedgerClient.get(i);
@@ -141,9 +141,9 @@ public void testThreeServerInFileWithAsyncRequests() throws Exception {
141141
futures.add(dLedgerServer1.handleAppend(request));
142142
}
143143
Thread.sleep(1000);
144-
Assertions.assertEquals(9, dLedgerServer0.getdLedgerStore().getLedgerEndIndex());
145-
Assertions.assertEquals(9, dLedgerServer1.getdLedgerStore().getLedgerEndIndex());
146-
Assertions.assertEquals(9, dLedgerServer2.getdLedgerStore().getLedgerEndIndex());
144+
Assertions.assertEquals(9, dLedgerServer0.getDLedgerStore().getLedgerEndIndex());
145+
Assertions.assertEquals(9, dLedgerServer1.getDLedgerStore().getLedgerEndIndex());
146+
Assertions.assertEquals(9, dLedgerServer2.getDLedgerStore().getLedgerEndIndex());
147147

148148
DLedgerClient dLedgerClient = launchClient(group, peers);
149149
for (int i = 0; i < futures.size(); i++) {

‎src/test/java/io/openmessaging/storage/dledger/AppendAndPushTest.java‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ public void testPushCommittedIndex() throws Exception {
5555
Assertions.assertTrue(future instanceof AppendFuture);
5656
futures.add(future);
5757
}
58-
Assertions.assertEquals(9, dLedgerServer0.getdLedgerStore().getLedgerEndIndex());
59-
Assertions.assertEquals(-1, dLedgerServer0.getdLedgerStore().getCommittedIndex());
58+
Assertions.assertEquals(9, dLedgerServer0.getDLedgerStore().getLedgerEndIndex());
59+
Assertions.assertEquals(-1, dLedgerServer0.getDLedgerStore().getCommittedIndex());
6060
DLedgerServer dLedgerServer1 = launchServer(group, peers, "n1", "n0", DLedgerConfig.FILE);
6161
long start = System.currentTimeMillis();
62-
while (DLedgerUtils.elapsed(start) < 3000 && dLedgerServer1.getdLedgerStore().getCommittedIndex() != 9) {
62+
while (DLedgerUtils.elapsed(start) < 3000 && dLedgerServer1.getDLedgerStore().getCommittedIndex() != 9) {
6363
DLedgerUtils.sleep(100);
6464
}
65-
Assertions.assertEquals(9, dLedgerServer0.getdLedgerStore().getCommittedIndex());
66-
Assertions.assertEquals(9, dLedgerServer1.getdLedgerStore().getCommittedIndex());
65+
Assertions.assertEquals(9, dLedgerServer0.getDLedgerStore().getCommittedIndex());
66+
Assertions.assertEquals(9, dLedgerServer1.getDLedgerStore().getCommittedIndex());
6767
}
6868

6969
@Test
@@ -82,16 +82,16 @@ public void testPushNetworkOffline() throws Exception {
8282
Assertions.assertTrue(future instanceof AppendFuture);
8383
futures.add(future);
8484
}
85-
Assertions.assertEquals(9, dLedgerServer0.getdLedgerStore().getLedgerEndIndex());
86-
Thread.sleep(dLedgerServer0.getdLedgerConfig().getMaxWaitAckTimeMs() + 100);
85+
Assertions.assertEquals(9, dLedgerServer0.getDLedgerStore().getLedgerEndIndex());
86+
Thread.sleep(dLedgerServer0.getDLedgerConfig().getMaxWaitAckTimeMs() + 100);
8787
for (int i = 0; i < futures.size(); i++) {
8888
CompletableFuture<AppendEntryResponse> future = futures.get(i);
8989
Assertions.assertTrue(future.isDone());
9090
Assertions.assertEquals(DLedgerResponseCode.WAIT_QUORUM_ACK_TIMEOUT.getCode(), future.get().getCode());
9191
}
9292

9393
boolean hasWait = false;
94-
for (int i = 0; i < dLedgerServer0.getdLedgerConfig().getMaxPendingRequestsNum(); i++) {
94+
for (int i = 0; i < dLedgerServer0.getDLedgerConfig().getMaxPendingRequestsNum(); i++) {
9595
AppendEntryRequest appendEntryRequest = new AppendEntryRequest();
9696
appendEntryRequest.setGroup(group);
9797
appendEntryRequest.setRemoteId(dLedgerServer0.getMemberState().getSelfId());
@@ -139,15 +139,15 @@ public void testPushNetworkNotStable() throws Exception {
139139
});
140140
Thread.sleep(500);
141141
Assertions.assertTrue(!sendSuccess.get());
142-
//restart servre1
142+
//restart server1
143143
dLedgerServer1 = launchServer(group, peers, "n1", "n0", DLedgerConfig.FILE);
144144
Thread.sleep(1500);
145145
Assertions.assertTrue(sendSuccess.get());
146146

147-
Assertions.assertEquals(0, dLedgerServer0.getdLedgerStore().getLedgerBeginIndex());
148-
Assertions.assertEquals(1, dLedgerServer0.getdLedgerStore().getLedgerEndIndex());
149-
Assertions.assertEquals(0, dLedgerServer1.getdLedgerStore().getLedgerBeginIndex());
150-
Assertions.assertEquals(1, dLedgerServer1.getdLedgerStore().getLedgerEndIndex());
147+
Assertions.assertEquals(0, dLedgerServer0.getDLedgerStore().getLedgerBeginIndex());
148+
Assertions.assertEquals(1, dLedgerServer0.getDLedgerStore().getLedgerEndIndex());
149+
Assertions.assertEquals(0, dLedgerServer1.getDLedgerStore().getLedgerBeginIndex());
150+
Assertions.assertEquals(1, dLedgerServer1.getDLedgerStore().getLedgerEndIndex());
151151
}
152152

153153
@Test
@@ -165,7 +165,7 @@ public void testPushMissed() throws Exception {
165165
return dLedgerServer1.handlePush(x.getArgument(0));
166166
}
167167
}).when(mockServer1).handlePush(any());
168-
((DLedgerRpcNettyService) dLedgerServer1.getdLedgerRpcService()).setdLedgerServer(mockServer1);
168+
((DLedgerRpcNettyService) dLedgerServer1.getDLedgerRpcService()).setdLedgerServer(mockServer1);
169169

170170
for (int i = 0; i < 10; i++) {
171171
AppendEntryRequest appendEntryRequest = new AppendEntryRequest();
@@ -176,11 +176,11 @@ public void testPushMissed() throws Exception {
176176
Assertions.assertEquals(appendEntryResponse.getCode(), DLedgerResponseCode.SUCCESS.getCode());
177177
Assertions.assertEquals(i, appendEntryResponse.getIndex());
178178
}
179-
Assertions.assertEquals(0, dLedgerServer0.getdLedgerStore().getLedgerBeginIndex());
180-
Assertions.assertEquals(9, dLedgerServer0.getdLedgerStore().getLedgerEndIndex());
179+
Assertions.assertEquals(0, dLedgerServer0.getDLedgerStore().getLedgerBeginIndex());
180+
Assertions.assertEquals(9, dLedgerServer0.getDLedgerStore().getLedgerEndIndex());
181181

182-
Assertions.assertEquals(0, dLedgerServer1.getdLedgerStore().getLedgerBeginIndex());
183-
Assertions.assertEquals(9, dLedgerServer1.getdLedgerStore().getLedgerEndIndex());
182+
Assertions.assertEquals(0, dLedgerServer1.getDLedgerStore().getLedgerBeginIndex());
183+
Assertions.assertEquals(9, dLedgerServer1.getDLedgerStore().getLedgerEndIndex());
184184
}
185185

186186
@Test
@@ -191,20 +191,20 @@ public void testPushTruncate() throws Exception {
191191
for (int i = 0; i < 10; i++) {
192192
DLedgerEntry entry = new DLedgerEntry();
193193
entry.setBody(new byte[128]);
194-
DLedgerEntry resEntry = dLedgerServer0.getdLedgerStore().appendAsLeader(entry);
194+
DLedgerEntry resEntry = dLedgerServer0.getDLedgerStore().appendAsLeader(entry);
195195
Assertions.assertEquals(i, resEntry.getIndex());
196196
}
197-
Assertions.assertEquals(0, dLedgerServer0.getdLedgerStore().getLedgerBeginIndex());
198-
Assertions.assertEquals(9, dLedgerServer0.getdLedgerStore().getLedgerEndIndex());
197+
Assertions.assertEquals(0, dLedgerServer0.getDLedgerStore().getLedgerBeginIndex());
198+
Assertions.assertEquals(9, dLedgerServer0.getDLedgerStore().getLedgerEndIndex());
199199
List<DLedgerEntry> entries = new ArrayList<>();
200200
for (long i = 0; i < 10; i++) {
201-
entries.add(dLedgerServer0.getdLedgerStore().get(i));
201+
entries.add(dLedgerServer0.getDLedgerStore().get(i));
202202
}
203203
dLedgerServer0.shutdown();
204204

205205
DLedgerServer dLedgerServer1 = launchServer(group, peers, "n1", "n0", DLedgerConfig.FILE);
206206
for (int i = 0; i < 5; i++) {
207-
DLedgerEntry resEntry = dLedgerServer1.getdLedgerStore().appendAsFollower(entries.get(i), 0, "n0");
207+
DLedgerEntry resEntry = dLedgerServer1.getDLedgerStore().appendAsFollower(entries.get(i), 0, "n0");
208208
Assertions.assertEquals(i, resEntry.getIndex());
209209
}
210210
dLedgerServer1.shutdown();
@@ -213,10 +213,10 @@ public void testPushTruncate() throws Exception {
213213
dLedgerServer1 = launchServer(group, peers, "n1", "n1", DLedgerConfig.FILE);
214214
dLedgerServer0 = launchServer(group, peers, "n0", "n1", DLedgerConfig.FILE);
215215
Thread.sleep(1000);
216-
Assertions.assertEquals(0, dLedgerServer0.getdLedgerStore().getLedgerBeginIndex());
217-
Assertions.assertEquals(4, dLedgerServer0.getdLedgerStore().getLedgerEndIndex());
218-
Assertions.assertEquals(0, dLedgerServer1.getdLedgerStore().getLedgerBeginIndex());
219-
Assertions.assertEquals(4, dLedgerServer1.getdLedgerStore().getLedgerEndIndex());
216+
Assertions.assertEquals(0, dLedgerServer0.getDLedgerStore().getLedgerBeginIndex());
217+
Assertions.assertEquals(4, dLedgerServer0.getDLedgerStore().getLedgerEndIndex());
218+
Assertions.assertEquals(0, dLedgerServer1.getDLedgerStore().getLedgerBeginIndex());
219+
Assertions.assertEquals(4, dLedgerServer1.getDLedgerStore().getLedgerEndIndex());
220220
for (int i = 0; i < 10; i++) {
221221
AppendEntryRequest request = new AppendEntryRequest();
222222
request.setGroup(group);
@@ -235,7 +235,7 @@ public void testBatchAppend() throws Exception {
235235
DLedgerServer dLedgerServer1 = launchServer(group, peers, "n1", "n0", DLedgerConfig.FILE);
236236
DLedgerServer mockServer1 = Mockito.spy(dLedgerServer1);
237237
doAnswer(x -> dLedgerServer1.handlePush(x.getArgument(0))).when(mockServer1).handlePush(any());
238-
((DLedgerRpcNettyService) dLedgerServer1.getdLedgerRpcService()).setdLedgerServer(mockServer1);
238+
((DLedgerRpcNettyService) dLedgerServer1.getDLedgerRpcService()).setdLedgerServer(mockServer1);
239239

240240

241241
BatchAppendEntryRequest appendEntryRequest = new BatchAppendEntryRequest();
@@ -261,11 +261,11 @@ public void testBatchAppend() throws Exception {
261261
Assertions.assertEquals(appendEntryResponse.getCode(), DLedgerResponseCode.SUCCESS.getCode());
262262
Assertions.assertEquals(count - 1, appendEntryResponse.getIndex());
263263

264-
Assertions.assertEquals(0, dLedgerServer0.getdLedgerStore().getLedgerBeginIndex());
265-
Assertions.assertEquals(count - 1, dLedgerServer0.getdLedgerStore().getLedgerEndIndex());
264+
Assertions.assertEquals(0, dLedgerServer0.getDLedgerStore().getLedgerBeginIndex());
265+
Assertions.assertEquals(count - 1, dLedgerServer0.getDLedgerStore().getLedgerEndIndex());
266266

267-
Assertions.assertEquals(0, dLedgerServer1.getdLedgerStore().getLedgerBeginIndex());
268-
Assertions.assertEquals(count - 1, dLedgerServer1.getdLedgerStore().getLedgerEndIndex());
267+
Assertions.assertEquals(0, dLedgerServer1.getDLedgerStore().getLedgerBeginIndex());
268+
Assertions.assertEquals(count - 1, dLedgerServer1.getDLedgerStore().getLedgerEndIndex());
269269
Thread.sleep(1000);
270270
}
271271
}

0 commit comments

Comments
 (0)