This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new ddc19e9c1d HDDS-10007. Rename ManagedSstFileReader in
rocksdb-checkpoint-differ (#5859)
ddc19e9c1d is described below
commit ddc19e9c1db02a04dcfd0a77d970f5afe9a0ea77
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Fri Dec 29 19:25:23 2023 +0100
HDDS-10007. Rename ManagedSstFileReader in rocksdb-checkpoint-differ (#5859)
---
dev-support/ci/selective_ci_checks.bats | 25 ++++++++++++----------
...gedSstFileReader.java => SstFileSetReader.java} | 8 +++----
...stFileReader.java => TestSstFileSetReader.java} | 6 +++---
.../ozone/om/snapshot/SnapshotDiffManager.java | 6 +++---
.../ozone/om/snapshot/TestSnapshotDiffManager.java | 6 +++---
5 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/dev-support/ci/selective_ci_checks.bats
b/dev-support/ci/selective_ci_checks.bats
index cc14eeb094..9fe1708c91 100644
--- a/dev-support/ci/selective_ci_checks.bats
+++ b/dev-support/ci/selective_ci_checks.bats
@@ -177,17 +177,20 @@ load bats-assert/load.bash
assert_output -p needs-kubernetes-tests=false
}
-@test "native test in other module" {
- run dev-support/ci/selective_ci_checks.sh 7d01cc14a6
-
- assert_output -p
'basic-checks=["rat","author","checkstyle","findbugs","native","unit"]'
- assert_output -p needs-build=true
- assert_output -p needs-compile=true
- assert_output -p needs-compose-tests=false
- assert_output -p needs-dependency-check=false
- assert_output -p needs-integration-tests=false
- assert_output -p needs-kubernetes-tests=false
-}
+# disabled, because this test fails if
+#
hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdb/util/TestManagedSstFileReader.java
+# is not present in the current tree (i.e. if file is renamed, moved or
deleted)
+#@test "native test in other module" {
+# run dev-support/ci/selective_ci_checks.sh 7d01cc14a6
+#
+# assert_output -p
'basic-checks=["rat","author","checkstyle","findbugs","native","unit"]'
+# assert_output -p needs-build=true
+# assert_output -p needs-compile=true
+# assert_output -p needs-compose-tests=false
+# assert_output -p needs-dependency-check=false
+# assert_output -p needs-integration-tests=false
+# assert_output -p needs-kubernetes-tests=false
+#}
@test "kubernetes only" {
run dev-support/ci/selective_ci_checks.sh 5336bb9bd
diff --git
a/hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/rocksdb/util/ManagedSstFileReader.java
b/hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/rocksdb/util/SstFileSetReader.java
similarity index 97%
rename from
hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/rocksdb/util/ManagedSstFileReader.java
rename to
hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/rocksdb/util/SstFileSetReader.java
index 120b199c88..3b30ca5a14 100644
---
a/hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/rocksdb/util/ManagedSstFileReader.java
+++
b/hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/rocksdb/util/SstFileSetReader.java
@@ -46,16 +46,16 @@ import java.util.stream.StreamSupport;
import static java.nio.charset.StandardCharsets.UTF_8;
/**
- * ManagedSstFileReader provides an abstraction layer using which we can
- * iterate over multiple underlying SST files transparently.
+ * Provides an abstraction layer using which we can iterate over multiple
+ * underlying SST files transparently.
*/
-public class ManagedSstFileReader {
+public class SstFileSetReader {
private final Collection<String> sstFiles;
private volatile long estimatedTotalKeys = -1;
- public ManagedSstFileReader(final Collection<String> sstFiles) {
+ public SstFileSetReader(final Collection<String> sstFiles) {
this.sstFiles = sstFiles;
}
diff --git
a/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdb/util/TestManagedSstFileReader.java
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdb/util/TestSstFileSetReader.java
similarity index 98%
rename from
hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdb/util/TestManagedSstFileReader.java
rename to
hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdb/util/TestSstFileSetReader.java
index 588e54ad8b..3b281ee09e 100644
---
a/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdb/util/TestManagedSstFileReader.java
+++
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdb/util/TestSstFileSetReader.java
@@ -58,7 +58,7 @@ import static
org.apache.hadoop.hdds.utils.NativeConstants.ROCKS_TOOLS_NATIVE_LI
/**
* ManagedSstFileReader tests.
*/
-class TestManagedSstFileReader {
+class TestSstFileSetReader {
@TempDir
private File tempDir;
@@ -146,7 +146,7 @@ class TestManagedSstFileReader {
.collect(Collectors.toMap(Map.Entry::getKey,
Map.Entry::getValue));
try (Stream<String> keyStream =
- new ManagedSstFileReader(files).getKeyStream(
+ new SstFileSetReader(files).getKeyStream(
lowerBound.orElse(null), upperBound.orElse(null))) {
keyStream.forEach(key -> {
Assertions.assertEquals(1, keysInBoundary.get(key));
@@ -194,7 +194,7 @@ class TestManagedSstFileReader {
.orElse(true))
.collect(Collectors.toMap(Map.Entry::getKey,
Map.Entry::getValue));
- try (Stream<String> keyStream = new ManagedSstFileReader(files)
+ try (Stream<String> keyStream = new SstFileSetReader(files)
.getKeyStreamWithTombstone(sstDumpTool, lowerBound.orElse(null),
upperBound.orElse(null))) {
keyStream.forEach(
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotDiffManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotDiffManager.java
index 2c0a564306..99134799de 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotDiffManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotDiffManager.java
@@ -56,7 +56,7 @@ import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse;
import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus;
import org.apache.hadoop.util.ClosableIterator;
import org.apache.logging.log4j.util.Strings;
-import org.apache.ozone.rocksdb.util.ManagedSstFileReader;
+import org.apache.ozone.rocksdb.util.SstFileSetReader;
import org.apache.ozone.rocksdb.util.RdbUtil;
import org.apache.ozone.rocksdiff.DifferSnapshotInfo;
import org.apache.ozone.rocksdiff.RocksDBCheckpointDiffer;
@@ -1083,7 +1083,7 @@ public class SnapshotDiffManager implements AutoCloseable
{
String tablePrefix = getTablePrefix(tablePrefixes, fsTable.getName());
boolean isDirectoryTable =
fsTable.getName().equals(DIRECTORY_TABLE);
- ManagedSstFileReader sstFileReader = new ManagedSstFileReader(deltaFiles);
+ SstFileSetReader sstFileReader = new SstFileSetReader(deltaFiles);
validateEstimatedKeyChangesAreInLimits(sstFileReader);
String sstFileReaderLowerBound = tablePrefix;
String sstFileReaderUpperBound = null;
@@ -1204,7 +1204,7 @@ public class SnapshotDiffManager implements AutoCloseable
{
}
private void validateEstimatedKeyChangesAreInLimits(
- ManagedSstFileReader sstFileReader
+ SstFileSetReader sstFileReader
) throws RocksDBException, IOException {
if (sstFileReader.getEstimatedTotalKeys() >
maxAllowedKeyChangesForASnapDiff) {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
index 28af68e253..e453ebf7b5 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
@@ -63,7 +63,7 @@ import
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.ClosableIterator;
import org.apache.hadoop.util.ExitUtil;
-import org.apache.ozone.rocksdb.util.ManagedSstFileReader;
+import org.apache.ozone.rocksdb.util.SstFileSetReader;
import org.apache.ozone.rocksdb.util.RdbUtil;
import org.apache.ozone.rocksdiff.DifferSnapshotInfo;
import org.apache.ozone.rocksdiff.RocksDBCheckpointDiffer;
@@ -651,8 +651,8 @@ public class TestSnapshotDiffManager {
.map(i -> (i + 100) + "/key" + i).collect(Collectors.toSet());
// Mocking SSTFileReader functions to return the above keys list.
- try (MockedConstruction<ManagedSstFileReader> mockedSSTFileReader =
- Mockito.mockConstruction(ManagedSstFileReader.class,
+ try (MockedConstruction<SstFileSetReader> mockedSSTFileReader =
+ Mockito.mockConstruction(SstFileSetReader.class,
(mock, context) -> {
when(mock.getKeyStreamWithTombstone(any(), any(), any()))
.thenReturn(keysIncludingTombstones.stream());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
