Skip to content

Commit a0788b1

Browse files
zcoozcoo
authored
[typo] fix typos waitUtil-> waitUntil (apache#1402)
* fix typos waitUtil-> waitUntil * fix typos waitUtil-> waitUntil
1 parent f7b91f0 commit a0788b1

File tree

37 files changed

+163
-162
lines changed

37 files changed

+163
-162
lines changed

‎fluss-client/src/main/java/com/alibaba/fluss/client/table/scanner/log/LogFetchBuffer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ CompletedFetch poll() {
175175
* <li>The thread was interrupted
176176
* </ol>
177177
*
178-
* @param deadlineNanos the deadline time to wait util
178+
* @param deadlineNanos the deadline time to wait until
179179
* @return false if the waiting time detectably elapsed before return from the method, else true
180180
*/
181181
boolean awaitNotEmpty(long deadlineNanos) throws InterruptedException {

‎fluss-client/src/main/java/com/alibaba/fluss/client/table/scanner/log/LogFetcher.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public synchronized void sendFetches() {
178178
}
179179

180180
/**
181-
* @param deadlineNanos the deadline time to wait util
181+
* @param deadlineNanos the deadline time to wait until
182182
* @return false if the waiting time detectably elapsed before return from the method, else true
183183
*/
184184
public boolean awaitNotEmpty(long deadlineNanos) {

‎fluss-client/src/test/java/com/alibaba/fluss/client/admin/ClientToServerITCaseBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public static void verifyPartitionLogs(
231231
public static void waitAllReplicasReady(long tableId, int expectBucketCount) {
232232
// retry until all replica ready.
233233
for (int i = 0; i < expectBucketCount; i++) {
234-
FLUSS_CLUSTER_EXTENSION.waitUtilAllReplicaReady(new TableBucket(tableId, i));
234+
FLUSS_CLUSTER_EXTENSION.waitUntilAllReplicaReady(new TableBucket(tableId, i));
235235
}
236236
}
237237

‎fluss-client/src/test/java/com/alibaba/fluss/client/admin/FlussAdminITCase.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ void testGetKvSnapshot() throws Exception {
613613
Map<Integer, CompletedSnapshot> expectedSnapshots = new HashMap<>();
614614
for (int bucket = 0; bucket < bucketNum; bucket++) {
615615
CompletedSnapshot completedSnapshot =
616-
FLUSS_CLUSTER_EXTENSION.waitUtilSnapshotFinished(
616+
FLUSS_CLUSTER_EXTENSION.waitUntilSnapshotFinished(
617617
new TableBucket(tableId, bucket), 0);
618618
expectedSnapshots.put(bucket, completedSnapshot);
619619
}
@@ -628,9 +628,9 @@ void testGetKvSnapshot() throws Exception {
628628
upsertWriter.flush();
629629

630630
TableBucket tb = new TableBucket(snapshots.getTableId(), 0);
631-
// wait util the snapshot finish
631+
// wait until the snapshot finish
632632
expectedSnapshots.put(
633-
tb.getBucket(), FLUSS_CLUSTER_EXTENSION.waitUtilSnapshotFinished(tb, 1));
633+
tb.getBucket(), FLUSS_CLUSTER_EXTENSION.waitUntilSnapshotFinished(tb, 1));
634634

635635
// check snapshot
636636
snapshots = admin.getLatestKvSnapshots(tablePath1).get();

‎fluss-client/src/test/java/com/alibaba/fluss/client/security/acl/FlussAuthorizationITCase.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ void testListDatabases() throws ExecutionException, InterruptedException {
335335
OperationType.DESCRIBE,
336336
PermissionType.ALLOW)));
337337
rootAdmin.createAcls(aclBindings).all().get();
338-
FLUSS_CLUSTER_EXTENSION.waitUtilAuthenticationSync(aclBindings, true);
338+
FLUSS_CLUSTER_EXTENSION.waitUntilAuthenticationSync(aclBindings, true);
339339
assertThat(guestAdmin.listDatabases().get()).isEqualTo(Collections.singletonList("fluss"));
340340

341341
aclBindings =
@@ -348,7 +348,7 @@ void testListDatabases() throws ExecutionException, InterruptedException {
348348
OperationType.ALL,
349349
PermissionType.ALLOW)));
350350
rootAdmin.createAcls(aclBindings).all().get();
351-
FLUSS_CLUSTER_EXTENSION.waitUtilAuthenticationSync(aclBindings, true);
351+
FLUSS_CLUSTER_EXTENSION.waitUntilAuthenticationSync(aclBindings, true);
352352
assertThat(guestAdmin.listDatabases().get())
353353
.containsExactlyInAnyOrderElementsOf(
354354
Lists.newArrayList("fluss", DATA1_TABLE_PATH_PK.getDatabaseName()));
@@ -397,7 +397,7 @@ void testListTables() throws Exception {
397397
OperationType.DESCRIBE,
398398
PermissionType.ALLOW)));
399399
rootAdmin.createAcls(aclBindings).all().get();
400-
FLUSS_CLUSTER_EXTENSION.waitUtilAuthenticationSync(aclBindings, true);
400+
FLUSS_CLUSTER_EXTENSION.waitUntilAuthenticationSync(aclBindings, true);
401401
assertThat(guestAdmin.listTables(DATA1_TABLE_PATH_PK.getDatabaseName()).get())
402402
.isEqualTo(Collections.singletonList(DATA1_TABLE_PATH_PK.getTableName()));
403403
}
@@ -430,7 +430,7 @@ void testGetMetaInfo() throws Exception {
430430
OperationType.DESCRIBE,
431431
PermissionType.ALLOW)));
432432
rootAdmin.createAcls(aclBindings).all().get();
433-
FLUSS_CLUSTER_EXTENSION.waitUtilAuthenticationSync(aclBindings, true);
433+
FLUSS_CLUSTER_EXTENSION.waitUntilAuthenticationSync(aclBindings, true);
434434
assertThat(guestGateway.metadata(metadataRequest).get().getTableMetadatasList())
435435
.hasSize(1);
436436
}
@@ -445,7 +445,7 @@ void testInitWriter() throws Exception {
445445
TableDescriptor.builder().schema(DATA1_SCHEMA).distributedBy(1).build();
446446
rootAdmin.createTable(writeAclTable, descriptor, false).get();
447447
TableInfo tableInfo = rootAdmin.getTableInfo(writeAclTable).get();
448-
FLUSS_CLUSTER_EXTENSION.waitUtilTableReady(tableInfo.getTableId());
448+
FLUSS_CLUSTER_EXTENSION.waitUntilTableReady(tableInfo.getTableId());
449449
// create acl to allow guest write.
450450
List<AclBinding> aclBindings =
451451
Collections.singletonList(
@@ -457,7 +457,7 @@ void testInitWriter() throws Exception {
457457
OperationType.WRITE,
458458
PermissionType.ALLOW)));
459459
rootAdmin.createAcls(aclBindings).all().get();
460-
FLUSS_CLUSTER_EXTENSION.waitUtilAuthenticationSync(aclBindings, true);
460+
FLUSS_CLUSTER_EXTENSION.waitUntilAuthenticationSync(aclBindings, true);
461461

462462
FlussConnection flussConnection = (FlussConnection) guestConn;
463463
TabletServerGateway tabletServerGateway =
@@ -506,9 +506,9 @@ void testProduceWithNoWriteAuthorization() throws Exception {
506506
TableDescriptor.builder().schema(DATA1_SCHEMA).distributedBy(1).build();
507507
rootAdmin.createTable(writeAclTable, descriptor, false).get();
508508
rootAdmin.createTable(noWriteAclTable, descriptor, false).get();
509-
FLUSS_CLUSTER_EXTENSION.waitUtilTableReady(
509+
FLUSS_CLUSTER_EXTENSION.waitUntilTableReady(
510510
rootAdmin.getTableInfo(writeAclTable).get().getTableId());
511-
FLUSS_CLUSTER_EXTENSION.waitUtilTableReady(
511+
FLUSS_CLUSTER_EXTENSION.waitUntilTableReady(
512512
rootAdmin.getTableInfo(noWriteAclTable).get().getTableId());
513513

514514
// create acl to allow guest write for writeAclTable.
@@ -528,9 +528,9 @@ void testProduceWithNoWriteAuthorization() throws Exception {
528528
new AccessControlEntry(
529529
guestPrincipal, "*", READ, PermissionType.ALLOW)));
530530
rootAdmin.createAcls(aclBindingOfWriteAclTables).all().get();
531-
FLUSS_CLUSTER_EXTENSION.waitUtilAuthenticationSync(aclBindingOfWriteAclTables, true);
531+
FLUSS_CLUSTER_EXTENSION.waitUntilAuthenticationSync(aclBindingOfWriteAclTables, true);
532532
rootAdmin.createAcls(aclBindingOfNoWriteAclTables).all().get();
533-
FLUSS_CLUSTER_EXTENSION.waitUtilAuthenticationSync(aclBindingOfNoWriteAclTables, true);
533+
FLUSS_CLUSTER_EXTENSION.waitUntilAuthenticationSync(aclBindingOfNoWriteAclTables, true);
534534

535535
// 1. Try to write data to noWriteAclTable. It should throw AuthorizationException because
536536
// of request writeId failed.
@@ -576,7 +576,7 @@ void testProduceAndConsumer() throws Exception {
576576
TableDescriptor descriptor =
577577
TableDescriptor.builder().schema(DATA1_SCHEMA).distributedBy(1).build();
578578
rootAdmin.createTable(DATA1_TABLE_PATH, descriptor, false).get();
579-
FLUSS_CLUSTER_EXTENSION.waitUtilTableReady(
579+
FLUSS_CLUSTER_EXTENSION.waitUntilTableReady(
580580
rootAdmin.getTableInfo(DATA1_TABLE_PATH).get().getTableId());
581581
// create acl to allow guest write.
582582
List<AclBinding> aclBindings =
@@ -589,7 +589,7 @@ void testProduceAndConsumer() throws Exception {
589589
OperationType.WRITE,
590590
PermissionType.ALLOW)));
591591
rootAdmin.createAcls(aclBindings).all().get();
592-
FLUSS_CLUSTER_EXTENSION.waitUtilAuthenticationSync(aclBindings, true);
592+
FLUSS_CLUSTER_EXTENSION.waitUntilAuthenticationSync(aclBindings, true);
593593
try (Table table = guestConn.getTable(DATA1_TABLE_PATH)) {
594594
AppendWriter appendWriter = table.newAppend().createWriter();
595595
appendWriter.append(row(1, "a")).get();

‎fluss-client/src/test/java/com/alibaba/fluss/client/table/FlussFailServerTableITCase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class FlussFailServerTableITCase extends ClientToServerITCaseBase {
5050
void beforeEach() throws Exception {
5151
// since we kill and start one tablet server in each test,
5252
// we need to wait for metadata to be updated to servers
53-
FLUSS_CLUSTER_EXTENSION.waitUtilAllGatewayHasSameMetadata();
53+
FLUSS_CLUSTER_EXTENSION.waitUntilAllGatewayHasSameMetadata();
5454
super.setup();
5555
}
5656

‎fluss-client/src/test/java/com/alibaba/fluss/client/table/scanner/batch/KvSnapshotBatchScannerITCase.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void testScanSnapshot() throws Exception {
101101
Map<TableBucket, List<InternalRow>> expectedRowByBuckets = putRows(tableId, tablePath, 10);
102102

103103
// wait snapshot finish
104-
waitUtilAllSnapshotFinished(expectedRowByBuckets.keySet(), 0);
104+
waitUntilAllSnapshotFinished(expectedRowByBuckets.keySet(), 0);
105105

106106
// test read snapshot
107107
testSnapshotRead(tablePath, expectedRowByBuckets);
@@ -110,7 +110,7 @@ void testScanSnapshot() throws Exception {
110110
expectedRowByBuckets = putRows(tableId, tablePath, 20);
111111

112112
// wait snapshot finish
113-
waitUtilAllSnapshotFinished(expectedRowByBuckets.keySet(), 1);
113+
waitUntilAllSnapshotFinished(expectedRowByBuckets.keySet(), 1);
114114

115115
// test read snapshot
116116
testSnapshotRead(tablePath, expectedRowByBuckets);
@@ -166,9 +166,9 @@ private static int getBucketId(InternalRow row) {
166166
return function.bucketing(key, DEFAULT_BUCKET_NUM);
167167
}
168168

169-
private void waitUtilAllSnapshotFinished(Set<TableBucket> tableBuckets, long snapshotId) {
169+
private void waitUntilAllSnapshotFinished(Set<TableBucket> tableBuckets, long snapshotId) {
170170
for (TableBucket tableBucket : tableBuckets) {
171-
FLUSS_CLUSTER_EXTENSION.waitUtilSnapshotFinished(tableBucket, snapshotId);
171+
FLUSS_CLUSTER_EXTENSION.waitUntilSnapshotFinished(tableBucket, snapshotId);
172172
}
173173
}
174174
}

‎fluss-client/src/test/java/com/alibaba/fluss/client/table/scanner/log/LogFetcherTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ protected void setup() throws Exception {
6464

6565
// We create table data1NonPkTablePath previously.
6666
tableId = createTable(DATA1_TABLE_PATH, DATA1_TABLE_DESCRIPTOR, false);
67-
FLUSS_CLUSTER_EXTENSION.waitUtilTableReady(tableId);
67+
FLUSS_CLUSTER_EXTENSION.waitUntilTableReady(tableId);
6868

6969
RpcClient rpcClient = FLUSS_CLUSTER_EXTENSION.getRpcClient();
7070
MetadataUpdater metadataUpdater = new MetadataUpdater(clientConf, rpcClient);

‎fluss-client/src/test/java/com/alibaba/fluss/client/table/scanner/log/LogScannerITCase.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ void testScanFromStartTimestamp(boolean isPartitioned) throws Exception {
288288
String partitionName = null;
289289
Long partitionId = null;
290290
if (!isPartitioned) {
291-
FLUSS_CLUSTER_EXTENSION.waitUtilTableReady(tableId);
291+
FLUSS_CLUSTER_EXTENSION.waitUntilTableReady(tableId);
292292
} else {
293293
Map<String, Long> partitionNameAndIds =
294294
FLUSS_CLUSTER_EXTENSION.waitUntilPartitionAllReady(tablePath);
@@ -297,7 +297,7 @@ void testScanFromStartTimestamp(boolean isPartitioned) throws Exception {
297297
partitionNameAndIds.entrySet().iterator().next();
298298
partitionName = partitionNameAndIdEntry.getKey();
299299
partitionId = partitionNameAndIds.get(partitionName);
300-
FLUSS_CLUSTER_EXTENSION.waitUtilTablePartitionReady(tableId, partitionId);
300+
FLUSS_CLUSTER_EXTENSION.waitUntilTablePartitionReady(tableId, partitionId);
301301
}
302302

303303
long firstStartTimestamp = System.currentTimeMillis();
@@ -390,14 +390,14 @@ void testScanFromLatestOffsets(boolean isPartitioned) throws Exception {
390390
String partitionName = null;
391391
Long partitionId = null;
392392
if (!isPartitioned) {
393-
FLUSS_CLUSTER_EXTENSION.waitUtilTableReady(tableId);
393+
FLUSS_CLUSTER_EXTENSION.waitUntilTableReady(tableId);
394394
} else {
395395
Map<String, Long> partitionNameAndIds =
396396
FLUSS_CLUSTER_EXTENSION.waitUntilPartitionAllReady(tablePath);
397397
// just pick one partition
398398
partitionName = partitionNameAndIds.keySet().iterator().next();
399399
partitionId = partitionNameAndIds.get(partitionName);
400-
FLUSS_CLUSTER_EXTENSION.waitUtilTablePartitionReady(tableId, partitionId);
400+
FLUSS_CLUSTER_EXTENSION.waitUntilTablePartitionReady(tableId, partitionId);
401401
}
402402

403403
int batchRecordSize = 10;

‎fluss-client/src/test/java/com/alibaba/fluss/client/table/scanner/log/RemoteLogScannerITCase.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void testScanFromRemote() throws Exception {
9696
appendWriter.append(row).get();
9797
}
9898

99-
FLUSS_CLUSTER_EXTENSION.waitUtilSomeLogSegmentsCopyToRemote(new TableBucket(tableId, 0));
99+
FLUSS_CLUSTER_EXTENSION.waitUntilSomeLogSegmentsCopyToRemote(new TableBucket(tableId, 0));
100100

101101
// test fetch.
102102
LogScanner logScanner = table.newScan().createLogScanner();
@@ -147,7 +147,7 @@ void testScanFromRemoteAndProject(String format) throws Exception {
147147
}
148148
}
149149

150-
FLUSS_CLUSTER_EXTENSION.waitUtilSomeLogSegmentsCopyToRemote(new TableBucket(tableId, 0));
150+
FLUSS_CLUSTER_EXTENSION.waitUntilSomeLogSegmentsCopyToRemote(new TableBucket(tableId, 0));
151151

152152
// test fetch.
153153
LogScanner logScanner = createLogScanner(table, new int[] {0, 2});
@@ -237,7 +237,7 @@ void testPartitionTableFetchFromRemote() throws Exception {
237237
}
238238

239239
for (long id : partitionIdByNames.values()) {
240-
FLUSS_CLUSTER_EXTENSION.waitUtilSomeLogSegmentsCopyToRemote(
240+
FLUSS_CLUSTER_EXTENSION.waitUntilSomeLogSegmentsCopyToRemote(
241241
new TableBucket(tableId, id, 0));
242242
}
243243

0 commit comments

Comments
 (0)