You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@ozone.apache.org by "echonesis (via GitHub)" <gi...@apache.org> on 2026/07/03 07:27:03 UTC
Re: [PR] HDDS-12807. Clean up TestKeyManagerImpl unit test [ozone]
echonesis commented on code in PR #10640:
URL: https://github.com/apache/ozone/pull/10640#discussion_r3518177950
##########
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java:
##########
@@ -41,62 +41,93 @@
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
import org.apache.ratis.util.function.CheckedFunction;
import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.Mockito;
/**
* Test class for unit tests KeyManagerImpl.
*/
public class TestKeyManagerImpl {
- private static Stream<Arguments> getTableIteratorParameters() {
+ private static Stream<TableIteratorTestCase> getSuccessfulTableIteratorParameters() {
return Stream.of(
- Arguments.argumentSet("Fetch first 50 entries for volume 0, bucket 0",
- 5, 10, 100, 0, 0, 0, 0, 0, 50, null),
- Arguments.argumentSet("Fetch first 50 entries for any volume/bucket", 5, 10, 100, null, null, 0, 0, 0, 50,
- null),
- Arguments.argumentSet("Fetch first 30 entries for volume 1, bucket 1", 5, 10, 100, 1, 1, 0, 0, 0, 30, null),
- Arguments.argumentSet("Fetch 20 entries from offset (2,2,10) for volume 2, bucket 2", 5, 10, 100, 2, 2, 2, 2,
- 10, 20, null),
- Arguments.argumentSet("Fetch 40 entries from offset (2,2,50) for volume 3, bucket 3", 5, 10, 100, 3, 3, 3, 3,
- 50, 40, null),
- Arguments.argumentSet("Fetch 200 entries from the very beginning (null start offsets)", 5, 10, 100, null,
- null, null, null, null, 200, null),
- Arguments.argumentSet("Fetch 200 entries starting from bucket 3, key 50, spanning 3 buckets", 5, 10, 100,
- null, null, 0, 3, 50, 200, null),
- Arguments.argumentSet("Invalid: bucket is set but volume is null", 5, 10, 100, null, 1, 0, 0, 0, 10,
- IOException.class),
- Arguments.argumentSet("Invalid: volume is set but bucket is null", 5, 10, 100, 1, null, 0, 0, 0, 10,
- IOException.class),
- Arguments.argumentSet("Fetch 50 entries from volume 2, bucket 5, but only 31 exist", 5, 10, 100, 2, 5, 2, 5,
- 70, 50, null),
- Arguments.argumentSet("Start from last volume (4), second-last bucket (8), key 80 but only 131 entries exist",
- 5, 10, 100, null, null, 4, 8, 80, 200, null)
+ TableIteratorTestCase.newBuilder("Fetch first 50 entries for volume 0, bucket 0")
+ .volumeBucket(0, 0)
+ .start(0, 0, 0)
+ .entries(50)
+ .build(),
+ TableIteratorTestCase.newBuilder("Fetch first 50 entries for any volume/bucket")
+ .start(0, 0, 0)
+ .entries(50)
+ .build(),
+ TableIteratorTestCase.newBuilder("Fetch first 30 entries for volume 1, bucket 1")
+ .volumeBucket(1, 1)
+ .start(0, 0, 0)
+ .entries(30)
+ .build(),
+ TableIteratorTestCase.newBuilder("Fetch 20 entries from offset (2,2,10) for volume 2, bucket 2")
+ .volumeBucket(2, 2)
+ .start(2, 2, 10)
+ .entries(20)
+ .build(),
+ TableIteratorTestCase.newBuilder("Fetch 40 entries from offset (2,2,50) for volume 3, bucket 3")
+ .volumeBucket(3, 3)
+ .start(3, 3, 50)
+ .entries(40)
+ .build(),
+ TableIteratorTestCase.newBuilder("Fetch 200 entries from the very beginning (null start offsets)")
+ .start(null, null, null)
+ .entries(200)
+ .build(),
+ TableIteratorTestCase.newBuilder("Fetch 200 entries starting from bucket 3, key 50, spanning 3 buckets")
+ .start(0, 3, 50)
+ .entries(200)
+ .build(),
+ TableIteratorTestCase.newBuilder("Fetch 50 entries from volume 2, bucket 5, but only 31 exist")
+ .volumeBucket(2, 5)
+ .start(2, 5, 70)
+ .entries(50)
+ .build(),
+ TableIteratorTestCase.newBuilder("Start from last volume (4), second-last bucket (8), key 80 "
+ + "but only 131 entries exist")
+ .start(4, 8, 80)
+ .entries(200)
+ .build()
);
}
- @SuppressWarnings({"checkstyle:ParameterNumber"})
+ private static Stream<TableIteratorTestCase> getInvalidTableIteratorParameters() {
+ return Stream.of(
+ TableIteratorTestCase.newBuilder("Invalid: bucket is set but volume is null")
+ .volumeBucket(null, 1)
+ .start(0, 0, 0)
+ .entries(10)
+ .build(),
+ TableIteratorTestCase.newBuilder("Invalid: volume is set but bucket is null")
+ .volumeBucket(1, null)
+ .start(0, 0, 0)
+ .entries(10)
+ .build()
+ );
+ }
+
+ @SuppressWarnings("unchecked")
private <V> List<Table.KeyValue<String, V>> mockTableIterator(
- Class<V> valueClass, Table<String, V> table, int numberOfVolumes, int numberOfBucketsPerVolume,
- int numberOfKeysPerBucket, String volumeNamePrefix, String bucketNamePrefix, String keyPrefix,
- Integer volumeNumberFilter, Integer bucketNumberFilter, Integer startVolumeNumber, Integer startBucketNumber,
- Integer startKeyNumber, CheckedFunction<Table.KeyValue<String, V>, Boolean, IOException> filter,
- int numberOfEntries) throws IOException {
+ Class<V> valueClass, Table<String, V> table, TableIteratorTestCase testCase, String volumeNamePrefix,
+ String bucketNamePrefix, String keyPrefix,
+ CheckedFunction<Table.KeyValue<String, V>, Boolean, IOException> filter) throws IOException {
TreeMap<String, V> values = new TreeMap<>();
List<Table.KeyValue<String, V>> keyValues = new ArrayList<>();
- String startKey = startVolumeNumber == null || startBucketNumber == null || startKeyNumber == null ? null
- : (String.format("/%s%010d/%s%010d/%s%010d", volumeNamePrefix, startVolumeNumber, bucketNamePrefix,
- startBucketNumber, keyPrefix, startKeyNumber));
- for (int i = 0; i < numberOfVolumes; i++) {
- for (int j = 0; j < numberOfBucketsPerVolume; j++) {
- for (int k = 0; k < numberOfKeysPerBucket; k++) {
- String key = String.format("/%s%010d/%s%010d/%s%010d", volumeNamePrefix, i, bucketNamePrefix, j,
- keyPrefix, k);
+ String startKey = getTableKey(volumeNamePrefix, testCase.getStartVolumeNumber(), bucketNamePrefix,
+ testCase.getStartBucketNumber(), keyPrefix, testCase.getStartKeyNumber());
+ for (int i = 0; i < testCase.getNumberOfVolumes(); i++) {
+ for (int j = 0; j < testCase.getNumberOfBucketsPerVolume(); j++) {
+ for (int k = 0; k < testCase.getNumberOfKeysPerBucket(); k++) {
+ String key = getTableKey(volumeNamePrefix, i, bucketNamePrefix, j, keyPrefix, k);
V value = valueClass == String.class ? (V) key : mock(valueClass);
Review Comment:
Thanks for mentioning!
Update it in the next commit.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@ozone.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@ozone.apache.org
For additional commands, e-mail: issues-help@ozone.apache.org