hemantk-12 commented on code in PR #7925:
URL: https://github.com/apache/ozone/pull/7925#discussion_r2032016414
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java:
##########
@@ -696,6 +696,7 @@ private <V, R> List<Table.KeyValue<String, R>>
getTableEntries(String startKey,
*/
if (startKey != null) {
tableIterator.seek(startKey);
+ } else {
Review Comment:
If there is a Jira or GitHub discussion, could you please add it?
##########
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java:
##########
@@ -0,0 +1,214 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.om;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.utils.MapBackedTableIterator;
+import org.apache.hadoop.hdds.utils.db.Table;
+import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
+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() {
+ 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)
+ );
+ }
+
+ @SuppressWarnings({"checkstyle:ParameterNumber"})
+ 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, int numberOfEntries) 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);
+ V value = valueClass == String.class ? (V) key :
Mockito.mock(valueClass);
+ values.put(key, value);
+
+ if ((volumeNumberFilter == null || i == volumeNumberFilter) &&
+ (bucketNumberFilter == null || j == bucketNumberFilter) &&
+ (startKey == null || startKey.compareTo(key) <= 0)) {
+ keyValues.add(Table.newKeyValue(key, value));
+ }
+ }
+ }
+ }
+
+ when(table.iterator(anyString())).thenAnswer(i -> new
MapBackedTableIterator<>(values, i.getArgument(0)));
+ return keyValues.subList(0, Math.min(numberOfEntries, keyValues.size()));
+ }
+
+ @ParameterizedTest
+ @MethodSource("getTableIteratorParameters")
+ @SuppressWarnings({"checkstyle:ParameterNumber"})
+ public void testGetDeletedKeyEntries(int numberOfVolumes, int
numberOfBucketsPerVolume, int numberOfKeysPerBucket,
+ Integer volumeNumber, Integer
bucketNumber,
+ Integer startVolumeNumber, Integer
startBucketNumber, Integer startKeyNumber,
+ int numberOfEntries, Class<? extends
Exception> expectedException)
Review Comment:
nit: we should have success and failure scenarios as two separate tests.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
