Skip to content

CNDB-16175: CNDB-15990: Avoid varargs allocations in atomicMoveWithFallback #2163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelsembwever merged 1 commit into from
Dec 12, 2025
Merged

CNDB-16175: CNDB-15990: Avoid varargs allocations in atomicMoveWithFallback #2163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/java/org/apache/cassandra/io/util/PathUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,19 @@ public final class PathUtils
private static final Logger logger = LoggerFactory.getLogger(PathUtils.class);
private static final NoSpamLogger nospam1m = NoSpamLogger.getLogger(logger, 1, TimeUnit.MINUTES);

private static Consumer<Path> onDeletion = path -> {};
private static final boolean USE_NIX_RECURSIVE_DELETE = CassandraRelevantProperties.USE_NIX_RECURSIVE_DELETE.getBoolean();

private static final CopyOption[] ATOMIC_MOVE_OPTIONS = {
StandardCopyOption.REPLACE_EXISTING,
StandardCopyOption.ATOMIC_MOVE
};

private static final CopyOption[] REPLACE_EXISTING_OPTIONS = {
StandardCopyOption.REPLACE_EXISTING
};

private static Consumer<Path> onDeletion = path -> {};

public static FileChannel newReadChannel(Path path) throws NoSuchFileException
{
return newFileChannel(path, READ_OPTIONS);
Expand Down Expand Up @@ -556,12 +566,12 @@ private static void atomicMoveWithFallback(Path from, Path to) throws IOExceptio
{
try
{
Files.move(from, to, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE);
Files.move(from, to, ATOMIC_MOVE_OPTIONS);
}
catch (AtomicMoveNotSupportedException e)
{
logger.trace("Could not do an atomic move", e);
Files.move(from, to, StandardCopyOption.REPLACE_EXISTING);
Files.move(from, to, REPLACE_EXISTING_OPTIONS);
}
}

Expand Down