swamirishi commented on code in PR #9268:
URL: https://github.com/apache/ozone/pull/9268#discussion_r2525657005
##########
hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdiff/TestRocksDiffUtils.java:
##########
@@ -92,95 +83,40 @@ public static Stream<Arguments> values() {
@ParameterizedTest
@MethodSource("values")
- public void testFilterRelevantSstFilesWithPreExistingCompactionInfo(String
validSSTColumnFamilyName,
- String
invalidColumnFamilyName,
- String
validSSTFileStartRange,
- String
validSSTFileEndRange,
- String
invalidSSTFileStartRange,
- String
invalidSSTFileEndRange) {
+ public void testFilterRelevantSstFilesMap(String validSSTColumnFamilyName,
String invalidColumnFamilyName,
+ String validSSTFileStartRange, String validSSTFileEndRange, String
invalidSSTFileStartRange,
+ String invalidSSTFileEndRange) {
String validSstFile = "filePath/validSSTFile.sst";
String invalidSstFile = "filePath/invalidSSTFile.sst";
String untrackedSstFile = "filePath/untrackedSSTFile.sst";
String expectedPrefix =
String.valueOf((char)(((int)validSSTFileEndRange.charAt(0) +
validSSTFileStartRange.charAt(0)) / 2));
- Set<String> sstFile = Sets.newTreeSet(validSstFile, invalidSstFile,
untrackedSstFile);
- Set<String> inputSstFiles = new HashSet<>();
+ Map<String, SstFileInfo> sstFile = ImmutableMap.of(
+ validSstFile, new SstFileInfo(validSstFile, validSSTFileStartRange,
validSSTFileEndRange,
+ validSSTColumnFamilyName), invalidSstFile, new
SstFileInfo(invalidSstFile, invalidSSTFileStartRange,
+ invalidSSTFileEndRange, invalidColumnFamilyName), untrackedSstFile,
+ new SstFileInfo(untrackedSstFile, null, null, null));
+ Map<String, SstFileInfo> inputSstFiles = new HashMap<>();
List<Set<String>> tablesToLookupSet =
Arrays.asList(ImmutableSet.of(validSSTColumnFamilyName),
ImmutableSet.of(invalidColumnFamilyName),
ImmutableSet.of(validSSTColumnFamilyName, invalidColumnFamilyName),
Collections.emptySet());
for (Set<String> tablesToLookup : tablesToLookupSet) {
inputSstFiles.clear();
- inputSstFiles.addAll(sstFile);
+ inputSstFiles.putAll(sstFile);
RocksDiffUtils.filterRelevantSstFiles(inputSstFiles,
+ tablesToLookup,
new TablePrefixInfo(
new HashMap<String, String>() {{
put(invalidColumnFamilyName,
getLexicographicallyHigherString(invalidSSTFileEndRange));
put(validSSTColumnFamilyName, expectedPrefix);
- }}), ImmutableMap.of("validSSTFile", new
CompactionNode(validSstFile, 0, validSSTFileStartRange,
- validSSTFileEndRange, validSSTColumnFamilyName),
"invalidSSTFile",
- new CompactionNode(invalidSstFile, 0, invalidSSTFileStartRange,
- invalidSSTFileEndRange, invalidColumnFamilyName)),
tablesToLookup);
+ }}));
if (tablesToLookup.contains(validSSTColumnFamilyName)) {
- Assertions.assertEquals(Sets.newTreeSet(validSstFile,
untrackedSstFile), inputSstFiles,
+ Assertions.assertEquals(Sets.newTreeSet(validSstFile,
untrackedSstFile), inputSstFiles.keySet(),
"Failed for " + tablesToLookup);
} else {
- Assertions.assertEquals(Sets.newTreeSet(untrackedSstFile),
inputSstFiles, "Failed for " + tablesToLookup);
- }
- }
- }
-
- private LiveFileMetaData getMockedLiveFileMetadata(String columnFamilyName,
String startRange,
- String endRange,
- String name) {
- LiveFileMetaData liveFileMetaData = Mockito.mock(LiveFileMetaData.class);
-
Mockito.when(liveFileMetaData.largestKey()).thenReturn(endRange.getBytes(StandardCharsets.UTF_8));
-
Mockito.when(liveFileMetaData.columnFamilyName()).thenReturn(columnFamilyName.getBytes(StandardCharsets.UTF_8));
-
Mockito.when(liveFileMetaData.smallestKey()).thenReturn(startRange.getBytes(StandardCharsets.UTF_8));
- Mockito.when(liveFileMetaData.fileName()).thenReturn("basePath/" + name +
".sst");
- return liveFileMetaData;
- }
-
- @ParameterizedTest
- @MethodSource("values")
- public void testFilterRelevantSstFilesFromDB(String validSSTColumnFamilyName,
Review Comment:
this test case is not valid anymore. There is only a filter function which
doesn't read anything from the db anymore
--
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]
