This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new ae704ebfcaf IGNITE-25650 Move WAL compacted file constants to
NodeFileTree (#12135)
ae704ebfcaf is described below
commit ae704ebfcafc45c1c5fa967719fc329319690482
Author: Dmitry Werner <[email protected]>
AuthorDate: Wed Jun 18 19:51:59 2025 +0500
IGNITE-25650 Move WAL compacted file constants to NodeFileTree (#12135)
---
...gratingToWalV2SerializerWithCompactionTest.java | 4 +-
.../ignite/internal/management/wal/WalTask.java | 5 +--
.../cache/persistence/filename/NodeFileTree.java | 46 +++++++++++++++++-----
.../snapshot/IncrementalSnapshotProcessor.java | 3 +-
.../snapshot/SnapshotMetadataVerificationTask.java | 4 +-
.../persistence/wal/FileWriteAheadLogManager.java | 26 ++++--------
.../wal/reader/IgniteWalIteratorFactory.java | 6 +--
.../db/IgnitePdsStartWIthEmptyArchive.java | 3 +-
.../persistence/db/wal/IgniteLocalWalSizeTest.java | 7 +---
.../db/wal/WalCompactionSwitchOnTest.java | 3 +-
.../persistence/db/wal/WalCompactionTest.java | 3 +-
.../IncrementalSnapshotCheckBeforeRestoreTest.java | 7 +---
.../IncrementalSnapshotRestoreTest.java | 3 +-
13 files changed, 56 insertions(+), 64 deletions(-)
diff --git
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java
index 96e1e2adc38..0499cb0b1a6 100644
---
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java
+++
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java
@@ -36,8 +36,6 @@ import org.apache.ignite.lang.IgniteInClosure;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.junit.Test;
-import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.WAL_SEGMENT_FILE_COMPACTED_FILTER;
-
/**
* Saves data using previous version of ignite and then load this data using
actual version
*/
@@ -125,7 +123,7 @@ public class MigratingToWalV2SerializerWithCompactionTest
extends IgnitePersiste
NodeFileTree ft = ignite.context().pdsFolderResolver().fileTree();
- File[] compressedSegments =
ft.walArchive().listFiles(WAL_SEGMENT_FILE_COMPACTED_FILTER);
+ File[] compressedSegments =
ft.walArchive().listFiles(NodeFileTree::walCompactedSegment);
final int actualCompressedWalSegments = compressedSegments == null
? 0 : compressedSegments.length;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTask.java
index 3ff10ff0ced..fb436a198ab 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTask.java
@@ -47,8 +47,6 @@ import org.apache.ignite.internal.visor.VisorTaskArgument;
import org.apache.ignite.resources.LoggerResource;
import org.jetbrains.annotations.Nullable;
-import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.WAL_SEGMENT_FILE_COMPACTED_PATTERN;
-
/**
* Performs WAL cleanup clusterwide.
*/
@@ -60,8 +58,7 @@ public class WalTask extends
VisorMultiNodeTask<WalDeleteCommandArg, WalTaskResu
/** WAL archive file filter. */
private static final FileFilter WAL_ARCHIVE_FILE_FILTER = new FileFilter()
{
@Override public boolean accept(File file) {
- return NodeFileTree.walSegment(file) || (!file.isDirectory() &&
-
WAL_SEGMENT_FILE_COMPACTED_PATTERN.matcher(file.getName()).matches());
+ return NodeFileTree.walSegment(file) ||
NodeFileTree.walCompactedSegment(file);
}
};
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/NodeFileTree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/NodeFileTree.java
index c81daecc1e2..76feaf6e9ee 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/NodeFileTree.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/NodeFileTree.java
@@ -210,7 +210,7 @@ public class NodeFileTree extends SharedFileTree {
private static final String TMP_WAL_SEG_FILE_EXT = WAL_SEGMENT_FILE_EXT +
TMP_SUFFIX;
/** File extension of zipped WAL segment. */
- public static final String ZIP_WAL_SEG_FILE_EXT = WAL_SEGMENT_FILE_EXT +
ZIP_SUFFIX;
+ static final String ZIP_WAL_SEG_FILE_EXT = WAL_SEGMENT_FILE_EXT +
ZIP_SUFFIX;
/** File extension of temp zipped WAL segment. */
public static final String TMP_ZIP_WAL_SEG_FILE_EXT = ZIP_WAL_SEG_FILE_EXT
+ TMP_SUFFIX;
@@ -226,16 +226,11 @@ public class NodeFileTree extends SharedFileTree {
/** Pattern for segment file names. */
private static final Pattern WAL_NAME_PATTERN =
U.fixedLengthNumberNamePattern(WAL_SEGMENT_FILE_EXT);
- /** WAL segment file filter, see {@link #WAL_NAME_PATTERN} */
- private static final Predicate<File> WAL_SEGMENT_FILE_FILTER = file ->
!file.isDirectory() &&
- WAL_NAME_PATTERN.matcher(file.getName()).matches();
-
/** Pattern for WAL temp files - these files will be cleared at startup. */
private static final Pattern WAL_TEMP_NAME_PATTERN =
U.fixedLengthNumberNamePattern(TMP_WAL_SEG_FILE_EXT);
- /** WAL segment temporary file filter, see {@link #WAL_TEMP_NAME_PATTERN}
*/
- private static final Predicate<File> WAL_SEGMENT_TEMP_FILE_FILTER = file
-> !file.isDirectory() &&
- WAL_TEMP_NAME_PATTERN.matcher(file.getName()).matches();
+ /** Pattern for WAL compacted files. */
+ private static final Pattern WAL_SEGMENT_FILE_COMPACTED_PATTERN =
U.fixedLengthNumberNamePattern(ZIP_WAL_SEG_FILE_EXT);
/** Partition file prefix. */
static final String PART_FILE_PREFIX = "part-";
@@ -454,6 +449,21 @@ public class NodeFileTree extends SharedFileTree {
return walCdc().listFiles(f -> walSegment(f));
}
+ /** @return An array of compacted WAL segment files. */
+ public File[] walCompactedSegments() {
+ return wal().listFiles(NodeFileTree::walCompactedSegment);
+ }
+
+ /** @return An array of compacted or raw WAL segment files. */
+ public File[] walCompactedOrRawSegments() {
+ return wal().listFiles(NodeFileTree::walCompactedOrRawSegment);
+ }
+
+ /** @return An array of archive compacted or raw WAL segment files. */
+ public File[] walArchiveCompactedOrRawSegments() {
+ return walArchive().listFiles(NodeFileTree::walCompactedOrRawSegment);
+ }
+
/**
* @param idx Segment number.
* @return Segment file.
@@ -847,7 +857,7 @@ public class NodeFileTree extends SharedFileTree {
* @return {@code True} if file matches WAL segment file criteria.
*/
public static boolean walSegment(File f) {
- return WAL_SEGMENT_FILE_FILTER.test(f);
+ return !f.isDirectory() &&
WAL_NAME_PATTERN.matcher(f.getName()).matches();
}
/**
@@ -855,7 +865,23 @@ public class NodeFileTree extends SharedFileTree {
* @return {@code True} if file matches WAL segment temp file criteria.
*/
public static boolean walTmpSegment(File f) {
- return WAL_SEGMENT_TEMP_FILE_FILTER.test(f);
+ return !f.isDirectory() &&
WAL_TEMP_NAME_PATTERN.matcher(f.getName()).matches();
+ }
+
+ /**
+ * @param f File.
+ * @return {@code True} if file matches compacted WAL segment file
criteria.
+ */
+ public static boolean walCompactedSegment(File f) {
+ return !f.isDirectory() &&
WAL_SEGMENT_FILE_COMPACTED_PATTERN.matcher(f.getName()).matches();
+ }
+
+ /**
+ * @param f File.
+ * @return {@code True} if file matches compacted or raw WAL segment file
criteria.
+ */
+ public static boolean walCompactedOrRawSegment(File f) {
+ return walSegment(f) || walCompactedSegment(f);
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotProcessor.java
index bd30dfe284b..9ba4277dd92 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotProcessor.java
@@ -53,7 +53,6 @@ import static
org.apache.ignite.internal.pagemem.wal.record.WALRecord.RecordType
import static
org.apache.ignite.internal.pagemem.wal.record.WALRecord.RecordType.INCREMENTAL_SNAPSHOT_FINISH_RECORD;
import static
org.apache.ignite.internal.pagemem.wal.record.WALRecord.RecordType.INCREMENTAL_SNAPSHOT_START_RECORD;
import static
org.apache.ignite.internal.pagemem.wal.record.WALRecord.RecordType.TX_RECORD;
-import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER;
/** Processes incremental snapshot: parse WAL segments and handles records. */
abstract class IncrementalSnapshotProcessor {
@@ -227,7 +226,7 @@ abstract class IncrementalSnapshotProcessor {
if (!ift.wal().exists())
throw new IgniteCheckedException("Incremental snapshot WAL
directory doesn't exists [dir=" + ift.wal() + ']');
- File[] incSegs =
ift.wal().listFiles(WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER);
+ File[] incSegs = ift.walCompactedOrRawSegments();
if (incSegs == null)
throw new IgniteCheckedException("Failed to list WAL segments
from snapshot directory [dir=" + ift.root() + ']');
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataVerificationTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataVerificationTask.java
index b0da1caecf2..0636a6e1015 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataVerificationTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataVerificationTask.java
@@ -50,8 +50,6 @@ import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.LoggerResource;
import org.jetbrains.annotations.NotNull;
-import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.WAL_SEGMENT_FILE_COMPACTED_FILTER;
-
/** Snapshot task to verify snapshot metadata on the baseline nodes for given
snapshot name. */
@GridInternal
public class SnapshotMetadataVerificationTask
@@ -221,7 +219,7 @@ public class SnapshotMetadataVerificationTask
List<FileDescriptor> walSeg = factory.resolveWalFiles(
new IgniteWalIteratorFactory.IteratorParametersBuilder()
-
.filesOrDirs(ift.wal().listFiles(WAL_SEGMENT_FILE_COMPACTED_FILTER)));
+ .filesOrDirs(ift.walCompactedSegments()));
if (walSeg.isEmpty())
throw new IgniteException("No WAL segments found for
incremental snapshot [dir=" + ift.wal() + ']');
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
index 58dd4ed3049..6941ddc4142 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
@@ -156,7 +156,6 @@ import static
org.apache.ignite.internal.pagemem.wal.record.WALRecord.RecordType
import static
org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree.TMP_SUFFIX;
import static
org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree.TMP_ZIP_WAL_SEG_FILE_EXT;
import static
org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree.WAL_SEGMENT_FILE_EXT;
-import static
org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree.ZIP_WAL_SEG_FILE_EXT;
import static
org.apache.ignite.internal.processors.cache.persistence.wal.serializer.RecordSerializerFactory.LATEST_SERIALIZER_VERSION;
import static
org.apache.ignite.internal.processors.cache.persistence.wal.serializer.RecordV1Serializer.HEADER_RECORD_SIZE;
import static
org.apache.ignite.internal.processors.cache.persistence.wal.serializer.RecordV1Serializer.readPosition;
@@ -176,20 +175,9 @@ public class FileWriteAheadLogManager extends
GridCacheSharedManagerAdapter impl
/** Zero-filled buffer for file formatting. */
private static final byte[] FILL_BUF = new byte[1024 * 1024];
- /** */
- public static final Pattern WAL_SEGMENT_FILE_COMPACTED_PATTERN =
U.fixedLengthNumberNamePattern(ZIP_WAL_SEG_FILE_EXT);
-
- /** WAL segment file filter, see {@link NodeFileTree#walSegment(File)} */
- public static final FileFilter WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER =
file -> NodeFileTree.walSegment(file) ||
- (!file.isDirectory() &&
WAL_SEGMENT_FILE_COMPACTED_PATTERN.matcher(file.getName()).matches());
-
/** */
private static final Pattern WAL_SEGMENT_TEMP_FILE_COMPACTED_PATTERN =
U.fixedLengthNumberNamePattern(TMP_ZIP_WAL_SEG_FILE_EXT);
- /** */
- public static final FileFilter WAL_SEGMENT_FILE_COMPACTED_FILTER = file ->
!file.isDirectory() &&
- WAL_SEGMENT_FILE_COMPACTED_PATTERN.matcher(file.getName()).matches();
-
/** */
public static final FileFilter WAL_SEGMENT_TEMP_FILE_COMPACTED_FILTER =
file -> !file.isDirectory() &&
WAL_SEGMENT_TEMP_FILE_COMPACTED_PATTERN.matcher(file.getName()).matches();
@@ -1236,7 +1224,7 @@ public class FileWriteAheadLogManager extends
GridCacheSharedManagerAdapter impl
private long lastArchivedIndex() {
long lastIdx = -1;
- for (File file :
ft.walArchive().listFiles(WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER)) {
+ for (File file : ft.walArchiveCompactedOrRawSegments()) {
try {
long idx = ft.walSegmentIndex(file.toPath());
@@ -1443,7 +1431,7 @@ public class FileWriteAheadLogManager extends
GridCacheSharedManagerAdapter impl
segmentAware.setLastArchivedAbsoluteIndex(absIdx - 1);
// Getting segment sizes.
-
F.asList(ft.walArchive().listFiles(WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER)).stream()
+ F.asList(ft.walArchiveCompactedOrRawSegments()).stream()
.map(FileDescriptor::new)
.forEach(fd -> {
if (fd.isCompressed())
@@ -1737,7 +1725,7 @@ public class FileWriteAheadLogManager extends
GridCacheSharedManagerAdapter impl
* @return Raw or compressed WAL segments from archive.
*/
public FileDescriptor[] walArchiveFiles() {
- return
scan(ft.walArchive().listFiles(WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER));
+ return scan(ft.walArchiveCompactedOrRawSegments());
}
/**
@@ -1842,7 +1830,7 @@ public class FileWriteAheadLogManager extends
GridCacheSharedManagerAdapter impl
private IgniteBiTuple<Long, Long> scanMinMaxArchiveIndices() throws
IgniteCheckedException {
TreeMap<Long, FileDescriptor> archiveIndices = new TreeMap<>();
- for (File file :
ft.walArchive().listFiles(WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER)) {
+ for (File file : ft.walArchiveCompactedOrRawSegments()) {
try {
long idx = new FileDescriptor(file).idx();
@@ -1879,7 +1867,7 @@ public class FileWriteAheadLogManager extends
GridCacheSharedManagerAdapter impl
// If WAL archive is empty, try to find last not archived segment
in work directory and copy to WAL archive.
TreeMap<Long, FileDescriptor> workIndices = new TreeMap<>();
- for (File file :
ft.wal().listFiles(WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER)) {
+ for (File file : ft.walCompactedOrRawSegments()) {
FileDescriptor desc = readFileDescriptor(file, ioFactory);
if (desc != null)
@@ -3198,7 +3186,7 @@ public class FileWriteAheadLogManager extends
GridCacheSharedManagerAdapter impl
* @return found WAL file descriptors
*/
public static FileDescriptor[] loadFileDescriptors(final File walFilesDir)
throws IgniteCheckedException {
- final File[] files =
walFilesDir.listFiles(WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER);
+ final File[] files =
walFilesDir.listFiles(NodeFileTree::walCompactedOrRawSegment);
if (files == null) {
throw new IgniteCheckedException("WAL files directory does not not
denote a " +
@@ -3416,7 +3404,7 @@ public class FileWriteAheadLogManager extends
GridCacheSharedManagerAdapter impl
if (!F.isEmpty(workSegments) && (workSegments.length >
dsCfg.getWalSegments() || workSegments[0].idx() != 0))
toMove.addAll(F.asList(workSegments).subList(0,
workSegments.length - 1));
-
toMove.addAll(F.asList(scan(ft.wal().listFiles(WAL_SEGMENT_FILE_COMPACTED_FILTER))));
+ toMove.addAll(F.asList(scan(ft.walCompactedSegments())));
if (!toMove.isEmpty()) {
log.warning("Content of WAL working directory needs rearrangement,
some WAL segments will be moved to " +
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java
index 7f2830a9e57..717c2f83a1d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java
@@ -57,7 +57,6 @@ import org.jetbrains.annotations.Nullable;
import static java.lang.System.arraycopy;
import static java.nio.file.Files.walkFileTree;
-import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.WAL_SEGMENT_FILE_COMPACTED_PATTERN;
import static
org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneGridKernalContext.closeAllComponents;
import static
org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneGridKernalContext.startAllComponents;
import static
org.apache.ignite.internal.processors.cache.persistence.wal.serializer.RecordV1Serializer.HEADER_RECORD_SIZE;
@@ -341,10 +340,7 @@ public class IgniteWalIteratorFactory {
if (file.length() < HEADER_RECORD_SIZE)
return; // Filter out this segment as it is too short.
- String fileName = file.getName();
-
- if (!NodeFileTree.walSegment(file) &&
- !WAL_SEGMENT_FILE_COMPACTED_PATTERN.matcher(fileName).matches())
+ if (!NodeFileTree.walSegment(file) &&
!NodeFileTree.walCompactedSegment(file))
return; // Filter out this because it is not segment file.
FileDescriptor desc = readFileDescriptor(file, ioFactory);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsStartWIthEmptyArchive.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsStartWIthEmptyArchive.java
index b78f6d4cadb..7caac61c734 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsStartWIthEmptyArchive.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsStartWIthEmptyArchive.java
@@ -47,7 +47,6 @@ import org.junit.Ignore;
import org.junit.Test;
import static org.apache.ignite.events.EventType.EVT_WAL_SEGMENT_ARCHIVED;
-import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER;
/**
*
@@ -146,7 +145,7 @@ public class IgnitePdsStartWIthEmptyArchive extends
GridCommonAbstractTest {
long idxBefore = fhBefore.getSegmentId();
- File[] files =
ft.walArchive().listFiles(WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER);
+ File[] files = ft.walArchiveCompactedOrRawSegments();
Arrays.sort(files);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteLocalWalSizeTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteLocalWalSizeTest.java
index e68ab8df1e9..5e6235fd427 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteLocalWalSizeTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteLocalWalSizeTest.java
@@ -42,8 +42,6 @@ import org.junit.Test;
import static
org.apache.ignite.configuration.DataStorageConfiguration.UNLIMITED_WAL_ARCHIVE;
import static
org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree.WAL_SEGMENT_FILE_EXT;
import static
org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree.ZIP_SUFFIX;
-import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER;
-import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.WAL_SEGMENT_FILE_COMPACTED_PATTERN;
import static org.apache.ignite.testframework.GridTestUtils.getFieldValue;
import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;
@@ -214,7 +212,7 @@ public class IgniteLocalWalSizeTest extends
GridCommonAbstractTest {
Map<Long, Long> expSegmentSize = new HashMap<>();
-
F.asList(ft.walArchive().listFiles(WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER))
+ F.asList(ft.walArchiveCompactedOrRawSegments())
.stream()
.map(FileDescriptor::new)
.forEach(fd -> {
@@ -254,7 +252,6 @@ public class IgniteLocalWalSizeTest extends
GridCommonAbstractTest {
* @return {@code True} if file name matches segment name.
*/
private static boolean isSegmentFileName(@Nullable File f) {
- return f != null && (NodeFileTree.walSegment(f) ||
-
WAL_SEGMENT_FILE_COMPACTED_PATTERN.matcher(f.getName()).matches());
+ return f != null && (NodeFileTree.walSegment(f) ||
NodeFileTree.walCompactedSegment(f));
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionSwitchOnTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionSwitchOnTest.java
index e6d71204ec2..b8747c73b19 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionSwitchOnTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionSwitchOnTest.java
@@ -32,7 +32,6 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
-import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.WAL_SEGMENT_FILE_COMPACTED_FILTER;
import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.WAL_SEGMENT_TEMP_FILE_COMPACTED_FILTER;
/**
@@ -108,7 +107,7 @@ public class WalCompactionSwitchOnTest extends
GridCommonAbstractTest {
GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
- File[] archivedFiles =
archiveDir.listFiles(WAL_SEGMENT_FILE_COMPACTED_FILTER);
+ File[] archivedFiles =
archiveDir.listFiles(NodeFileTree::walCompactedSegment);
return archivedFiles.length == 20;
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
index 282032b10a4..b7f10fe4e46 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
@@ -50,7 +50,6 @@ import
org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
import static java.util.stream.Collectors.toSet;
-import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.WAL_SEGMENT_FILE_COMPACTED_FILTER;
/**
*
@@ -397,7 +396,7 @@ public class WalCompactionTest extends
GridCommonAbstractTest {
// Allow compressor to compress WAL segments.
assertTrue(GridTestUtils.waitForCondition(zippedWalSegment::exists,
15_000));
- File[] compressedSegments =
ft.walArchive().listFiles(WAL_SEGMENT_FILE_COMPACTED_FILTER);
+ File[] compressedSegments =
ft.walArchive().listFiles(NodeFileTree::walCompactedSegment);
long maxIdx = -1;
for (File f : compressedSegments)
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotCheckBeforeRestoreTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotCheckBeforeRestoreTest.java
index 80fb59a6741..fadc6fdf382 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotCheckBeforeRestoreTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotCheckBeforeRestoreTest.java
@@ -30,7 +30,6 @@ import
org.apache.ignite.internal.processors.cache.persistence.filename.Snapshot
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.AbstractSnapshotSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotMetadata;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotPartitionsVerifyTaskResult;
-import
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
@@ -258,8 +257,7 @@ public class IncrementalSnapshotCheckBeforeRestoreTest
extends AbstractSnapshotS
SnapshotFileTree sft = snapshotFileTree(srv, SNP);
- File[] segments = sft.incrementalSnapshotFileTree(1).wal()
- .listFiles(f ->
FileWriteAheadLogManager.WAL_SEGMENT_FILE_COMPACTED_PATTERN.matcher(f.getName()).matches());
+ File[] segments =
sft.incrementalSnapshotFileTree(1).walCompactedSegments();
Arrays.sort(segments);
@@ -362,8 +360,7 @@ public class IncrementalSnapshotCheckBeforeRestoreTest
extends AbstractSnapshotS
private void deleteWalSegment(int idx) {
SnapshotFileTree sft = snapshotFileTree(srv, SNP);
- File[] segments = sft.incrementalSnapshotFileTree(1).wal()
- .listFiles(f ->
FileWriteAheadLogManager.WAL_SEGMENT_FILE_COMPACTED_PATTERN.matcher(f.getName()).matches());
+ File[] segments =
sft.incrementalSnapshotFileTree(1).walCompactedSegments();
Arrays.sort(segments);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotRestoreTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotRestoreTest.java
index 03cd300e8c4..b0baec399fd 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotRestoreTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/incremental/IncrementalSnapshotRestoreTest.java
@@ -89,7 +89,6 @@ import org.junit.Test;
import static org.apache.ignite.events.EventType.EVT_CONSISTENCY_VIOLATION;
import static
org.apache.ignite.internal.processors.cache.persistence.snapshot.AbstractSnapshotSelfTest.snp;
-import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER;
/** */
public class IncrementalSnapshotRestoreTest extends
AbstractIncrementalSnapshotTest {
@@ -972,7 +971,7 @@ public class IncrementalSnapshotRestoreTest extends
AbstractIncrementalSnapshotT
SnapshotFileTree sft = snapshotFileTree(grid(nodeIdx), SNP);
- File[] incSegs =
sft.incrementalSnapshotFileTree(incIdx).wal().listFiles(WAL_SEGMENT_COMPACTED_OR_RAW_FILE_FILTER);
+ File[] incSegs =
sft.incrementalSnapshotFileTree(incIdx).walCompactedOrRawSegments();
Arrays.sort(incSegs);
