stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-28 20:47:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix some file bugs

Browse Source
This commit is contained in:
Stepan Usatiuk
2025-01-01 20:41:36 +01:00
parent 18a133abdc
commit 57ea21a3b2
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java
View File

@@ -365,8 +365,10 @@ public class DhfsFileServiceImpl implements DhfsFileService {
+ offset + " " + data.size());
}
if (size(fileUuid) < offset)
if (size(fileUuid) < offset) {
truncate(fileUuid, offset);
file = curTx.get(File.class, fileUuid).orElse(null);
}
// FIXME: Some kind of immutable interface?
var chunksAll = Collections.unmodifiableNavigableMap(file.chunks());
@@ -491,7 +493,16 @@ public class DhfsFileServiceImpl implements DhfsFileService {
}
}
file = file.toBuilder().chunks(newChunks).mTime(System.currentTimeMillis()).build();
NavigableMap<Long, JObjectKey> realNewChunks = new TreeMap<>();
for (var chunk : chunksAll.entrySet()) {
if (!removedChunks.containsKey(chunk.getKey())) {
realNewChunks.put(chunk.getKey(), chunk.getValue());
}
}
realNewChunks.putAll(newChunks);
file = file.toBuilder().chunks(Collections.unmodifiableNavigableMap(realNewChunks)).mTime(System.currentTimeMillis()).build();
curTx.put(file);
cleanupChunks(file, removedChunks.values());
updateFileSize(file);
@@ -576,7 +587,16 @@ public class DhfsFileServiceImpl implements DhfsFileService {
newChunks.put(tail.getKey(), newChunkData.key());
}
file = file.toBuilder().chunks(newChunks).mTime(System.currentTimeMillis()).build();
NavigableMap<Long, JObjectKey> realNewChunks = new TreeMap<>();
for (var chunk : chunksAll.entrySet()) {
if (!removedChunks.containsKey(chunk.getKey())) {
realNewChunks.put(chunk.getKey(), chunk.getValue());
}
}
realNewChunks.putAll(newChunks);
file = file.toBuilder().chunks(Collections.unmodifiableNavigableMap(realNewChunks)).mTime(System.currentTimeMillis()).build();
curTx.put(file);
cleanupChunks(file, removedChunks.values());
updateFileSize(file);