diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java index f72b4c9f4d6b..0f5f24fd6609 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java @@ -21,7 +21,6 @@ import static org.apache.hadoop.ozone.OzoneConsts.ETAG; import static org.apache.hadoop.ozone.OzoneConsts.MD5_HASH; import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_SCHEME; -import static org.apache.hadoop.ozone.TestDataUtil.createKey; import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.NOT_A_FILE; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -352,13 +351,9 @@ public void testListKeysWithNotNormalizedPath() throws Exception { keys.add(OmUtils.normalizeKey(key2, false)); keys.add(OmUtils.normalizeKey(key3, false)); - int length = 10; - byte[] input = new byte[length]; - Arrays.fill(input, (byte)96); - - createAndAssertKey(ozoneBucket, key1, 10, input); - createAndAssertKey(ozoneBucket, key2, 10, input); - createAndAssertKey(ozoneBucket, key3, 10, input); + createAndAssertKey(ozoneBucket, key1, 10); + createAndAssertKey(ozoneBucket, key2, 10); + createAndAssertKey(ozoneBucket, key3, 10); // Iterator with key name as prefix. @@ -403,10 +398,10 @@ private void checkKeyList(Iterator ozoneKeyIterator, assertEquals(keys, outputKeys); } - private void createAndAssertKey(OzoneBucket ozoneBucket, String key, int length, byte[] input) + private void createAndAssertKey(OzoneBucket ozoneBucket, String key, int length) throws Exception { - createKey(ozoneBucket, key, input); + byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, length); // Read the key with given key name. readKey(ozoneBucket, key, length, input); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDataUtil.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDataUtil.java index 8215c7a5a426..ab6e7de9c735 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDataUtil.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestDataUtil.java @@ -104,6 +104,13 @@ public static OzoneVolume createVolume(OzoneClient client, } + public static byte[] createStringKey(OzoneBucket bucket, String keyName, int length) + throws IOException { + byte[] content = RandomStringUtils.secure().nextAlphanumeric(length).getBytes(UTF_8); + createKey(bucket, keyName, content); + return content; + } + public static void createKey(OzoneBucket bucket, String keyName, byte[] content) throws IOException { createKey(bucket, keyName, null, content); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java index 2f98caeb6965..7956222bbe4c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java @@ -20,7 +20,6 @@ import static com.google.common.collect.Lists.newLinkedList; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_CLIENT_LIST_CACHE_SIZE; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_ITERATE_BATCH_SIZE; -import static org.apache.hadoop.ozone.TestDataUtil.createKey; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.params.provider.Arguments.of; @@ -371,13 +370,10 @@ private void checkKeyShallowList(String keyPrefix, String startKey, private static void createAndAssertKeys(OzoneBucket ozoneBucket, List keys) throws Exception { - int length = 10; - byte[] input = new byte[length]; - Arrays.fill(input, (byte) 96); for (String key : keys) { - createKey(ozoneBucket, key, input); + byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, 10); // Read the key with given key name. - readkey(ozoneBucket, key, length, input); + readkey(ozoneBucket, key, 10, input); } } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java index c8e8c21995ce..73b064720e9b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java @@ -19,12 +19,10 @@ import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_CLIENT_LIST_CACHE_SIZE; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_ITERATE_BATCH_SIZE; -import static org.apache.hadoop.ozone.TestDataUtil.createKey; import static org.junit.jupiter.api.Assertions.assertEquals; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -643,13 +641,10 @@ private void checkKeyShallowList(String keyPrefix, String startKey, private static void createAndAssertKeys(OzoneBucket ozoneBucket, List keys) throws Exception { - int length = 10; - byte[] input = new byte[length]; - Arrays.fill(input, (byte) 96); for (String key : keys) { - createKey(ozoneBucket, key, input); + byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, 10); // Read the key with given key name. - readkey(ozoneBucket, key, length, input); + readkey(ozoneBucket, key, 10, input); } } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java index 18309fb9b6fd..eaaedda5cffd 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java @@ -22,7 +22,6 @@ import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_ITERATE_BATCH_SIZE; import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_DELIMITER; import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_SCHEME; -import static org.apache.hadoop.ozone.TestDataUtil.createKey; import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_ALREADY_EXISTS; import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_NOT_FOUND; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -559,14 +558,10 @@ private void checkKeyList(Iterator ozoneKeyIterator, private void createAndAssertKeys(OzoneBucket ozoneBucket, List keys) throws Exception { - int length = 10; - byte[] input = new byte[length]; - Arrays.fill(input, (byte) 96); - for (String key : keys) { - createKey(ozoneBucket, key, input); + byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, 10); // Read the key with given key name. - readKey(ozoneBucket, key, length, input); + readKey(ozoneBucket, key, 10, input); } } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java index 556f5264039b..7391eca3fa23 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java @@ -33,6 +33,7 @@ import org.apache.commons.lang3.RandomStringUtils; import org.apache.hadoop.hdds.protocol.StorageType; import org.apache.hadoop.ozone.OzoneAcl; +import org.apache.hadoop.ozone.TestDataUtil; import org.apache.hadoop.ozone.client.BucketArgs; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneBucket; @@ -329,12 +330,11 @@ private void setKeyAcl(ObjectStore objectStore, String volumeName, private void createKeys(ObjectStore objectStore, OzoneBucket ozoneBucket, List keys) throws Exception { - int length = 10; + String aclWorldAll = "world::a"; - byte[] input = new byte[length]; - Arrays.fill(input, (byte) 96); + for (String key : keys) { - createKey(ozoneBucket, key, input); + TestDataUtil.createStringKey(ozoneBucket, key, 10); setKeyAcl(objectStore, ozoneBucket.getVolumeName(), ozoneBucket.getName(), key, aclWorldAll); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFileSystem.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFileSystem.java index a25f55218598..30444b9aac64 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFileSystem.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshotFileSystem.java @@ -349,18 +349,15 @@ private void checkKeyList(Iterator ozoneKeyIterator, private void createKeys(OzoneBucket ozoneBucket, List keys) throws Exception { - int length = 10; - byte[] input = new byte[length]; - Arrays.fill(input, (byte) 96); for (String key : keys) { - createKey(ozoneBucket, key, 10, input); + createKey(ozoneBucket, key, 10); } } - private void createKey(OzoneBucket ozoneBucket, String key, int length, - byte[] input) throws Exception { + private void createKey(OzoneBucket ozoneBucket, String key, int length) + throws Exception { - TestDataUtil.createKey(ozoneBucket, key, input); + byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, length); // Read the key with given key name. readkey(ozoneBucket, key, length, input); }