Skip to content

Commit 399a84b

Browse files
chiacyuchiacyu
committed
Apply comments
1 parent 78fecea commit 399a84b

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

‎hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestCloseContainer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void testReplicasAreReportedForClosedContainerAfterRestart()
106106
throws Exception {
107107
// Create some keys to write data into the open containers
108108
for (int i = 0; i < 10; i++) {
109-
TestDataUtil.createKey(bucket, "key" + i, null,
109+
TestDataUtil.createKey(bucket, "key" + i,
110110
"this is the content".getBytes(StandardCharsets.UTF_8));
111111
}
112112
StorageContainerManager scm = cluster.getStorageContainerManager();
@@ -151,7 +151,7 @@ public void testCloseClosedContainer()
151151
throws Exception {
152152
// Create some keys to write data into the open containers
153153
for (int i = 0; i < 10; i++) {
154-
TestDataUtil.createKey(bucket, "key" + i, null,
154+
TestDataUtil.createKey(bucket, "key" + i,
155155
"this is the content".getBytes(StandardCharsets.UTF_8));
156156
}
157157
StorageContainerManager scm = cluster.getStorageContainerManager();

‎hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ private static void createAndAssertKeys(OzoneBucket ozoneBucket, List<String> ke
375375
byte[] input = new byte[length];
376376
Arrays.fill(input, (byte) 96);
377377
for (String key : keys) {
378-
createKey(ozoneBucket, key, null, input);
378+
createKey(ozoneBucket, key, input);
379379
// Read the key with given key name.
380380
readkey(ozoneBucket, key, length, input);
381381
}

‎hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ private static void createAndAssertKeys(OzoneBucket ozoneBucket, List<String> ke
647647
byte[] input = new byte[length];
648648
Arrays.fill(input, (byte) 96);
649649
for (String key : keys) {
650-
createKey(ozoneBucket, key, null, input);
650+
createKey(ozoneBucket, key, input);
651651
// Read the key with given key name.
652652
readkey(ozoneBucket, key, length, input);
653653
}

‎hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDeletingServiceIntegrationTest.java

+17-17
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ public void testMultipleSnapshotKeyReclaim() throws Exception {
199199
OzoneBucket bucket2 = TestDataUtil.createBucket(
200200
client, VOLUME_NAME, bucketArgs, BUCKET_NAME_TWO);
201201
// Create key1 and key2
202-
TestDataUtil.createKey(bucket2, "bucket2key1", null, CONTENT.array());
203-
TestDataUtil.createKey(bucket2, "bucket2key2", null, CONTENT.array());
202+
TestDataUtil.createKey(bucket2, "bucket2key1", CONTENT.array());
203+
TestDataUtil.createKey(bucket2, "bucket2key2", CONTENT.array());
204204

205205
// Create Snapshot
206206
client.getObjectStore().createSnapshot(VOLUME_NAME, BUCKET_NAME_TWO,
@@ -260,12 +260,12 @@ public void testSnapshotWithFSO() throws Exception {
260260

261261
// Create 10 keys
262262
for (int i = 1; i <= 10; i++) {
263-
TestDataUtil.createKey(bucket2, "key" + i, null, CONTENT.array());
263+
TestDataUtil.createKey(bucket2, "key" + i, CONTENT.array());
264264
}
265265

266266
// Create 5 keys to overwrite
267267
for (int i = 11; i <= 15; i++) {
268-
TestDataUtil.createKey(bucket2, "key" + i, null, CONTENT.array());
268+
TestDataUtil.createKey(bucket2, "key" + i, CONTENT.array());
269269
}
270270

271271
// Create Directory and Sub
@@ -278,7 +278,7 @@ public void testSnapshotWithFSO() throws Exception {
278278
String childDir = "/childDir" + j;
279279
client.getProxy().createDirectory(VOLUME_NAME,
280280
BUCKET_NAME_FSO, parent + childDir);
281-
TestDataUtil.createKey(bucket2, parent + childFile, null, CONTENT.array());
281+
TestDataUtil.createKey(bucket2, parent + childFile, CONTENT.array());
282282
}
283283
}
284284

@@ -294,7 +294,7 @@ public void testSnapshotWithFSO() throws Exception {
294294

295295
// Overwrite 3 keys -> Moves previous version to deletedTable
296296
for (int i = 11; i <= 13; i++) {
297-
TestDataUtil.createKey(bucket2, "key" + i, null, CONTENT.array());
297+
TestDataUtil.createKey(bucket2, "key" + i, CONTENT.array());
298298
}
299299
assertTableRowCount(keyTable, 24);
300300

@@ -358,7 +358,7 @@ public void testSnapshotWithFSO() throws Exception {
358358

359359
// Overwrite 2 keys
360360
for (int i = 14; i <= 15; i++) {
361-
TestDataUtil.createKey(bucket2, "key" + i, null, CONTENT.array());
361+
TestDataUtil.createKey(bucket2, "key" + i, CONTENT.array());
362362
}
363363

364364
// Delete 2 more keys
@@ -714,8 +714,8 @@ private synchronized void createSnapshotDataForBucket(OzoneBucket bucket) throws
714714
OmMetadataManagerImpl metadataManager = (OmMetadataManagerImpl)
715715
om.getMetadataManager();
716716

717-
TestDataUtil.createKey(bucket, bucket.getName() + "key0", null, CONTENT.array());
718-
TestDataUtil.createKey(bucket, bucket.getName() + "key1", null, CONTENT.array());
717+
TestDataUtil.createKey(bucket, bucket.getName() + "key0", CONTENT.array());
718+
TestDataUtil.createKey(bucket, bucket.getName() + "key1", CONTENT.array());
719719
assertTableRowCount(keyTable, 2);
720720

721721
// Create Snapshot 1.
@@ -725,8 +725,8 @@ private synchronized void createSnapshotDataForBucket(OzoneBucket bucket) throws
725725

726726
// Overwrite bucket1key0, This is a newer version of the key which should
727727
// reclaimed as this is a different version of the key.
728-
TestDataUtil.createKey(bucket, bucket.getName() + "key0", null, CONTENT.array());
729-
TestDataUtil.createKey(bucket, bucket.getName() + "key2", null, CONTENT.array());
728+
TestDataUtil.createKey(bucket, bucket.getName() + "key0", CONTENT.array());
729+
TestDataUtil.createKey(bucket, bucket.getName() + "key2", CONTENT.array());
730730

731731
// Key 1 cannot be reclaimed as it is still referenced by Snapshot 1.
732732
client.getProxy().deleteKey(bucket.getVolumeName(), bucket.getName(),
@@ -750,8 +750,8 @@ private synchronized void createSnapshotDataForBucket(OzoneBucket bucket) throws
750750
// deletedTable when Snapshot 2 is taken.
751751
assertTableRowCount(deletedTable, 0);
752752

753-
TestDataUtil.createKey(bucket, bucket.getName() + "key3", null, CONTENT.array());
754-
TestDataUtil.createKey(bucket, bucket.getName() + "key4", null, CONTENT.array());
753+
TestDataUtil.createKey(bucket, bucket.getName() + "key3", CONTENT.array());
754+
TestDataUtil.createKey(bucket, bucket.getName() + "key4", CONTENT.array());
755755
client.getProxy().deleteKey(bucket.getVolumeName(), bucket.getName(),
756756
bucket.getName() + "key4", false);
757757
assertTableRowCount(keyTable, 1);
@@ -811,15 +811,15 @@ private synchronized void createSnapshotFSODataForBucket(OzoneBucket bucket) thr
811811
throw new RuntimeException(ex);
812812
}
813813
}));
814-
TestDataUtil.createKey(bucket, "dir0/" + bucket.getName() + "key0", null, CONTENT.array());
815-
TestDataUtil.createKey(bucket, "dir1/" + bucket.getName() + "key1", null, CONTENT.array());
814+
TestDataUtil.createKey(bucket, "dir0/" + bucket.getName() + "key0", CONTENT.array());
815+
TestDataUtil.createKey(bucket, "dir1/" + bucket.getName() + "key1", CONTENT.array());
816816
assertTableRowCount(keyTable, countMap.get(keyTable.getName()) + 2);
817817
assertTableRowCount(dirTable, countMap.get(dirTable.getName()) + 2);
818818

819819
// Overwrite bucket1key0, This is a newer version of the key which should
820820
// reclaimed as this is a different version of the key.
821-
TestDataUtil.createKey(bucket, "dir0/" + bucket.getName() + "key0", null, CONTENT.array());
822-
TestDataUtil.createKey(bucket, "dir2/" + bucket.getName() + "key2", null, CONTENT.array());
821+
TestDataUtil.createKey(bucket, "dir0/" + bucket.getName() + "key0", CONTENT.array());
822+
TestDataUtil.createKey(bucket, "dir2/" + bucket.getName() + "key2", CONTENT.array());
823823
assertTableRowCount(keyTable, countMap.get(keyTable.getName()) + 3);
824824
assertTableRowCount(dirTable, countMap.get(dirTable.getName()) + 3);
825825
assertTableRowCount(deletedTable, countMap.get(deletedTable.getName()) + 1);

‎hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneContainerUpgradeShell.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private static void writeKey(String keyName) throws IOException {
180180
TestDataUtil.createVolumeAndBucket(client, VOLUME_NAME, BUCKET_NAME);
181181
TestDataUtil.createKey(
182182
client.getObjectStore().getVolume(VOLUME_NAME).getBucket(BUCKET_NAME),
183-
keyName, null, "test".getBytes(StandardCharsets.UTF_8));
183+
keyName, "test".getBytes(StandardCharsets.UTF_8));
184184
}
185185
}
186186

0 commit comments

Comments
 (0)