Skip to content

OAK-12098: blob-plugins - remove use of TransientFileFactory (part 2) #2744

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

Draft
reschke wants to merge 4 commits into
base: trunk
Choose a base branch
from
Draft

OAK-12098: blob-plugins - remove use of TransientFileFactory (part 2) #2744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a5424a
OAK-12098: blob-plugins - remove use of TransientFileFactory (part 2)
reschke Feb 16, 2026
e4e4f7a
Merge branch 'trunk' into OAK-12098
reschke Mar 9, 2026
98220e2
OAK-12098: use DELETE_ON_CLOSE instead)
reschke Mar 9, 2026
acbb4a9
OAK-12098: remove broken test assumption
reschke Mar 9, 2026
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
9 changes: 4 additions & 5 deletions .../src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
import java.security.DigestOutputStream;
import java.security.MessageDigest;
import java.util.Iterator;
Expand All @@ -52,8 +54,6 @@
import org.apache.jackrabbit.oak.spi.blob.AbstractSharedBackend;
import org.apache.jackrabbit.oak.spi.blob.BlobOptions;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.apache.jackrabbit.util.LazyFileInputStream;
import org.apache.jackrabbit.util.TransientFileFactory;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -323,11 +323,10 @@ public InputStream getStream() throws DataStoreException {
try {
// If cache configured to 0 will return null
if (cached == null || !cached.exists()) {
TransientFileFactory fileFactory = TransientFileFactory.getInstance();
File tmpFile = fileFactory.createTransientFile("temp0cache", null, temp);
final File tmpFile = Files.createTempFile(temp.toPath(), "blob-cache-", null).toFile();
try (InputStream in = backend.getRecord(getIdentifier()).getStream()) {
copyInputStreamToFile(in, tmpFile);
return new LazyFileInputStream(tmpFile);
return Files.newInputStream(tmpFile.toPath(), StandardOpenOption.DELETE_ON_CLOSE);
}
} else {
return new FileInputStream(cached);
Expand Down
15 changes: 8 additions & 7 deletions ...ob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import org.apache.jackrabbit.oak.spi.blob.BlobOptions;
import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.apache.jackrabbit.util.LazyFileInputStream;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
Expand Down Expand Up @@ -192,13 +191,15 @@
closer.register(is);

assertNotNull(is);
assertTrue(is instanceof LazyFileInputStream);
((LazyFileInputStream)is).open();

File tmp = new File(new File(path), "tmp");
Collection<File> temp0cacheFiles =
FileUtils.listFiles(tmp, FileFilterUtils.prefixFileFilter("temp0cache"), null);
assertEquals(1, temp0cacheFiles.size());

// OAK-12098: Incorrect assumptions about files still to be present
// File tmp = new File(new File(path), "tmp");

Check warning on line 197 in oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

This block of commented-out lines of code should be removed. 


See more on https://sonarcloud.io/project/issues?id=org.apache.jackrabbit%3Ajackrabbit-oak&issues=AZzT16DxGh3eRzM31JGD&open=AZzT16DxGh3eRzM31JGD&pullRequest=2744
//
// (tmp file names are implementation details)
// Collection<File> temp0cacheFiles =
// FileUtils.listFiles(tmp, FileFilterUtils.prefixFileFilter("blob-cache-"), null);
// assertEquals(1, temp0cacheFiles.size());

assertFile(is, f, folder, false);

Expand Down
Loading