From a1054a0b437830bd50da88d92e254f314cf0a650 Mon Sep 17 00:00:00 2001 From: Chia-Chuan Yu Date: Sat, 8 Mar 2025 10:28:36 +0800 Subject: [PATCH 1/4] HDDS-12476. Add TestDataUtil#createKey variant with small random content --- .../fs/ozone/TestOzoneFSWithObjectStoreCreate.java | 14 +++++--------- .../java/org/apache/hadoop/ozone/TestDataUtil.java | 9 +++++++++ .../org/apache/hadoop/ozone/om/TestListKeys.java | 7 ++----- .../hadoop/ozone/om/TestListKeysWithFSO.java | 8 ++------ .../hadoop/ozone/om/TestObjectStoreWithFSO.java | 8 ++------ .../hadoop/ozone/om/TestRecursiveAclWithFSO.java | 7 +++---- .../om/snapshot/TestOmSnapshotFileSystem.java | 11 ++++------- 7 files changed, 27 insertions(+), 37 deletions(-) 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..10b895a2195c 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 @@ -352,13 +352,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 +399,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 = createKey(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..223d2d488165 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 @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.security.SecureRandom; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -104,6 +105,14 @@ public static OzoneVolume createVolume(OzoneClient client, } + public static byte[] createKey(OzoneBucket bucket, + String keyName, int length) throws IOException{ + byte[] content = RandomStringUtils.random(length, 0, 0 + , true, true, null, new SecureRandom()).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..b82f5b7bc47c 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 @@ -371,13 +371,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 = createKey(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..c51fd500f750 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 @@ -24,7 +24,6 @@ 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 +642,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 = createKey(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..09e11517e28f 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 @@ -559,14 +559,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 = createKey(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..a2d8c794a50c 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 @@ -329,12 +329,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); + createKey(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..69d6d6b63534 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.createKey(ozoneBucket, key, length); // Read the key with given key name. readkey(ozoneBucket, key, length, input); } From 5c6a29941fd79751afa913b41379901c462fc783 Mon Sep 17 00:00:00 2001 From: Chia-Chuan Yu Date: Sat, 8 Mar 2025 10:33:06 +0800 Subject: [PATCH 2/4] Fixed styles --- .../src/test/java/org/apache/hadoop/ozone/TestDataUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 223d2d488165..a6d2cdd29e0b 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 @@ -106,9 +106,9 @@ public static OzoneVolume createVolume(OzoneClient client, } public static byte[] createKey(OzoneBucket bucket, - String keyName, int length) throws IOException{ - byte[] content = RandomStringUtils.random(length, 0, 0 - , true, true, null, new SecureRandom()).getBytes(UTF_8); + String keyName, int length) throws IOException { + byte[] content = RandomStringUtils.random(length, 0, 0, + true, true, null, new SecureRandom()).getBytes(UTF_8); createKey(bucket, keyName, content); return content; } From 1cb6c36b3484d23b32a83e47e155b3643b928e47 Mon Sep 17 00:00:00 2001 From: Chia-Chuan Yu Date: Sat, 8 Mar 2025 13:55:54 +0800 Subject: [PATCH 3/4] Applied comments --- .../hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java | 2 +- .../test/java/org/apache/hadoop/ozone/TestDataUtil.java | 7 +++---- .../test/java/org/apache/hadoop/ozone/om/TestListKeys.java | 2 +- .../org/apache/hadoop/ozone/om/TestListKeysWithFSO.java | 2 +- .../org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java | 2 +- .../apache/hadoop/ozone/om/TestRecursiveAclWithFSO.java | 3 ++- .../hadoop/ozone/om/snapshot/TestOmSnapshotFileSystem.java | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) 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 10b895a2195c..712dd948a351 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 @@ -402,7 +402,7 @@ private void checkKeyList(Iterator ozoneKeyIterator, private void createAndAssertKey(OzoneBucket ozoneBucket, String key, int length) throws Exception { - byte[] input = createKey(ozoneBucket, key, length); + 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 a6d2cdd29e0b..036a6cdc6dd1 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 @@ -105,10 +105,9 @@ public static OzoneVolume createVolume(OzoneClient client, } - public static byte[] createKey(OzoneBucket bucket, - String keyName, int length) throws IOException { - byte[] content = RandomStringUtils.random(length, 0, 0, - true, true, null, new SecureRandom()).getBytes(UTF_8); + 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; } 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 b82f5b7bc47c..4dbdcbb60336 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 @@ -372,7 +372,7 @@ private void checkKeyShallowList(String keyPrefix, String startKey, private static void createAndAssertKeys(OzoneBucket ozoneBucket, List keys) throws Exception { for (String key : keys) { - byte[] input = createKey(ozoneBucket, key, 10); + byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, 10); // Read the key with given key name. 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 c51fd500f750..9ba1d332d096 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 @@ -643,7 +643,7 @@ private void checkKeyShallowList(String keyPrefix, String startKey, private static void createAndAssertKeys(OzoneBucket ozoneBucket, List keys) throws Exception { for (String key : keys) { - byte[] input = createKey(ozoneBucket, key, 10); + byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, 10); // Read the key with given key name. 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 09e11517e28f..230403d075b0 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 @@ -560,7 +560,7 @@ private void createAndAssertKeys(OzoneBucket ozoneBucket, List keys) throws Exception { for (String key : keys) { - byte[] input = createKey(ozoneBucket, key, 10); + byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, 10); // Read the key with given key name. 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 a2d8c794a50c..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; @@ -333,7 +334,7 @@ private void createKeys(ObjectStore objectStore, OzoneBucket ozoneBucket, String aclWorldAll = "world::a"; for (String key : keys) { - createKey(ozoneBucket, key, 10); + 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 69d6d6b63534..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 @@ -357,7 +357,7 @@ private void createKeys(OzoneBucket ozoneBucket, List keys) private void createKey(OzoneBucket ozoneBucket, String key, int length) throws Exception { - byte[] input = TestDataUtil.createKey(ozoneBucket, key, length); + byte[] input = TestDataUtil.createStringKey(ozoneBucket, key, length); // Read the key with given key name. readkey(ozoneBucket, key, length, input); } From 7e5a1bbf27b2e2794b833eb2395e443391cd3711 Mon Sep 17 00:00:00 2001 From: Chia-Chuan Yu Date: Sat, 8 Mar 2025 14:02:07 +0800 Subject: [PATCH 4/4] Fixed styles --- .../apache/hadoop/fs/ozone/TestOzoneFSWithObjectStoreCreate.java | 1 - .../src/test/java/org/apache/hadoop/ozone/TestDataUtil.java | 1 - .../src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java | 1 - .../java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java | 1 - .../java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java | 1 - 5 files changed, 5 deletions(-) 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 712dd948a351..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; 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 036a6cdc6dd1..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 @@ -25,7 +25,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.security.SecureRandom; import java.util.ArrayList; import java.util.HashMap; import java.util.List; 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 4dbdcbb60336..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; 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 9ba1d332d096..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,7 +19,6 @@ 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; 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 230403d075b0..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;