implements PR-026 walker cache input and comparison policy

This commit is contained in:
2026-03-24 13:42:49 +00:00
parent 2870a0677b
commit 1442adc7b3
4 changed files with 261 additions and 10 deletions
@@ -5,6 +5,7 @@ import java.nio.file.Path;
public record PackerFileProbe(
Path path,
String mimeType,
long size,
long lastModified,
byte[] content) {
}
@@ -4,7 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.tika.Tika;
import p.packer.messages.diagnostics.PackerDiagnosticCategory;
import p.packer.messages.diagnostics.PackerDiagnosticSeverity;
import p.packer.models.PackerAssetCacheEntry;
import p.packer.models.PackerDiagnostic;
import p.packer.models.PackerFileCacheEntry;
import p.packer.models.PackerFileProbe;
import p.packer.models.PackerProbeResult;
import p.packer.models.PackerWalkResult;
@@ -12,8 +14,12 @@ import p.packer.models.PackerWalkResult;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.HexFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
@@ -37,7 +43,7 @@ public abstract class PackerAbstractBankWalker<R> {
return Optional.empty();
}
final var lastModified = filePath.toFile().lastModified();
final var fileProbe = new PackerFileProbe(filePath, mimeType, lastModified, bytes);
final var fileProbe = new PackerFileProbe(filePath, mimeType, bytes.length, lastModified, bytes);
return Optional.of(fileProbe);
}
@@ -53,11 +59,13 @@ public abstract class PackerAbstractBankWalker<R> {
return path.getFileName().toString().equalsIgnoreCase("asset.json");
}
private List<PackerFileProbe> processFileProbeWhenSupported(
private List<PackerProbeResult> processFileProbeWhenSupported(
final Path assetRoot,
final Optional<PackerAssetCacheEntry> priorAssetCache,
final R requirements,
final Set<String> supportedMimeTypes,
final List<PackerDiagnostic> diagnostics) {
final List<PackerFileProbe> supportedFileProbes = new ArrayList<>();
final List<PackerProbeResult> probeResults = new ArrayList<>();
try {
final var validPaths = retrieveValidPaths(assetRoot);
for (final var filePath : validPaths) {
@@ -66,7 +74,12 @@ public abstract class PackerAbstractBankWalker<R> {
continue;
}
final var fileProbe = fileProbeMaybe.get();
supportedFileProbes.add(fileProbe);
final var cachedEntry = resolvePriorFileCache(assetRoot, fileProbe.path(), priorAssetCache);
if (cachedEntry.isPresent() && canReuseMetadata(fileProbe, cachedEntry.get())) {
probeResults.add(new PackerProbeResult(fileProbe, cachedEntry.get().metadata(), List.of()));
continue;
}
probeResults.add(processFileProbe(fileProbe, requirements));
}
} catch (IOException exception) {
diagnostics.add(new PackerDiagnostic(
@@ -77,16 +90,68 @@ public abstract class PackerAbstractBankWalker<R> {
true
));
}
return supportedFileProbes;
return probeResults;
}
public PackerWalkResult walk(
final Path assetRoot,
final R requirements) {
return walk(assetRoot, requirements, Optional.empty());
}
public PackerWalkResult walk(
final Path assetRoot,
final R requirements,
final Optional<PackerAssetCacheEntry> priorAssetCache) {
final List<PackerDiagnostic> rootDiagnostics = new ArrayList<>();
final List<PackerProbeResult> probeResults = new ArrayList<>();
processFileProbeWhenSupported(assetRoot, getSupportedMimeTypes(), rootDiagnostics)
.forEach(fileProbe -> probeResults.add(processFileProbe(fileProbe, requirements)));
final List<PackerProbeResult> probeResults = processFileProbeWhenSupported(
assetRoot,
Objects.requireNonNull(priorAssetCache, "priorAssetCache"),
requirements,
getSupportedMimeTypes(),
rootDiagnostics);
return new PackerWalkResult(probeResults, rootDiagnostics);
}
protected boolean canReuseMetadata(
final PackerFileProbe fileProbe,
final PackerFileCacheEntry cachedEntry) {
if (fileProbe.size() != cachedEntry.size()) {
return false;
}
if (fileProbe.lastModified() > cachedEntry.lastModified()) {
return false;
}
if (cachedEntry.mimeType() != null && !cachedEntry.mimeType().equals(fileProbe.mimeType())) {
return false;
}
if (cachedEntry.fingerprint() == null || cachedEntry.fingerprint().isBlank()) {
return true;
}
return cachedEntry.fingerprint().equals(computeFingerprint(fileProbe));
}
protected String computeFingerprint(final PackerFileProbe fileProbe) {
try {
final MessageDigest digest = MessageDigest.getInstance("SHA-256");
return HexFormat.of().formatHex(digest.digest(fileProbe.content()));
} catch (NoSuchAlgorithmException exception) {
throw new IllegalStateException("SHA-256 fingerprint is unavailable", exception);
}
}
private Optional<PackerFileCacheEntry> resolvePriorFileCache(
final Path assetRoot,
final Path filePath,
final Optional<PackerAssetCacheEntry> priorAssetCache) {
if (priorAssetCache.isEmpty()) {
return Optional.empty();
}
final String relativePath = assetRoot.toAbsolutePath()
.normalize()
.relativize(filePath.toAbsolutePath().normalize())
.toString()
.replace('\\', '/');
return priorAssetCache.get().findFile(relativePath);
}
}
@@ -12,6 +12,7 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
public class PackerAssetWalker {
@@ -34,6 +35,13 @@ public class PackerAssetWalker {
public PackerWalkResult walk(
final Path assetRoot,
final PackerAssetDeclaration declaration) {
return walk(assetRoot, declaration, Optional.empty());
}
public PackerWalkResult walk(
final Path assetRoot,
final PackerAssetDeclaration declaration,
final Optional<PackerAssetCacheEntry> priorAssetCache) {
final List<PackerDiagnostic> diagnostics = new ArrayList<>();
switch (declaration.assetFamily()) {
case TILE_BANK -> {
@@ -57,7 +65,7 @@ public class PackerAssetWalker {
true));
return new PackerWalkResult(List.of(), diagnostics);
}
final var walkResult = tileBankWalker.walk(assetRoot, requirementBuildResult.requirements);
final var walkResult = tileBankWalker.walk(assetRoot, requirementBuildResult.requirements, priorAssetCache);
diagnostics.addAll(walkResult.diagnostics());
return new PackerWalkResult(walkResult.probeResults(), diagnostics);
}
@@ -82,7 +90,7 @@ public class PackerAssetWalker {
true));
return new PackerWalkResult(List.of(), diagnostics);
}
final var walkResult = soundBankWalker.walk(assetRoot, result.requirements);
final var walkResult = soundBankWalker.walk(assetRoot, result.requirements, priorAssetCache);
diagnostics.addAll(walkResult.diagnostics());
return new PackerWalkResult(walkResult.probeResults(), diagnostics);
}