stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-29 04:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

use map for directory children

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-06-14 18:35:57 +02:00
parent 6f35897f10
commit e12d6b7c54
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/main/java/com/usatiuk/dhfs/storage/files/objects/Directory.java
View File

@@ -3,10 +3,9 @@ package com.usatiuk.dhfs.storage.files.objects;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.apache.commons.lang3.tuple.Pair;
import java.util.ArrayList; import java.util.Map;
import java.util.Collection; import java.util.TreeMap;
import java.util.UUID; import java.util.UUID;
@Accessors(chain = true) @Accessors(chain = true)
@@ -17,5 +16,5 @@ public class Directory extends DirEntry {
super(uuid); super(uuid);
} }
Collection<Pair<String, UUID>> children = new ArrayList<>(); Map<String, UUID> children = new TreeMap<>();
} }

42
server/src/main/java/com/usatiuk/dhfs/storage/files/service/DhfsFileServiceImpl.java
View File

@@ -15,7 +15,6 @@ import jakarta.annotation.Priority;
import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.event.Observes; import jakarta.enterprise.event.Observes;
import jakarta.inject.Inject; import jakarta.inject.Inject;
import org.apache.commons.lang3.tuple.Pair;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.file.Path; import java.nio.file.Path;
@@ -56,20 +55,23 @@ public class DhfsFileServiceImpl implements DhfsFileService {
if (!(from instanceof Directory dir)) if (!(from instanceof Directory dir))
return Uni.createFrom().item(Optional.empty()); return Uni.createFrom().item(Optional.empty());
for (var el : dir.getChildren()) { var pathFirstPart = path.getName(0).toString();
if (el.getLeft().equals(path.getName(0).toString())) {
var ref = jObjectRepository.readJObjectChecked(namespace, el.getRight().toString(), DirEntry.class)
.await().indefinitely();
if (!ref.isPresent()) {
Log.error("File missing when traversing directory " + from.getName() + ": " + el.getRight().toString());
return Uni.createFrom().item(Optional.empty());
}
if (path.getNameCount() == 1) return Uni.createFrom().item(ref);
return traverse(ref.get(), path.subpath(1, path.getNameCount())); var found = dir.getChildren().get(pathFirstPart);
} if (found == null)
return Uni.createFrom().item(Optional.empty());
var ref = jObjectRepository.readJObjectChecked(namespace, found.toString(), DirEntry.class)
.await().indefinitely();
if (!ref.isPresent()) {
Log.error("File missing when traversing directory " + from.getName() + ": " + found);
return Uni.createFrom().item(Optional.empty());
} }
return Uni.createFrom().item(Optional.empty());
if (path.getNameCount() == 1) return Uni.createFrom().item(ref);
return traverse(ref.get(), path.subpath(1, path.getNameCount()));
} }
@Override @Override
@@ -107,7 +109,7 @@ public class DhfsFileServiceImpl implements DhfsFileService {
File f = new File(fuuid); File f = new File(fuuid);
jObjectRepository.writeJObject(namespace, f).await().indefinitely(); jObjectRepository.writeJObject(namespace, f).await().indefinitely();
dir.getChildren().add(Pair.of(Path.of(name).getFileName().toString(), fuuid)); dir.getChildren().put(Path.of(name).getFileName().toString(), fuuid);
jObjectRepository.writeJObject(namespace, dir).await().indefinitely(); jObjectRepository.writeJObject(namespace, dir).await().indefinitely();
return Uni.createFrom().item(Optional.of(f)); return Uni.createFrom().item(Optional.of(f));
@@ -126,7 +128,7 @@ public class DhfsFileServiceImpl implements DhfsFileService {
Directory d = new Directory(duuid); Directory d = new Directory(duuid);
jObjectRepository.writeJObject(namespace, d).await().indefinitely(); jObjectRepository.writeJObject(namespace, d).await().indefinitely();
dir.getChildren().add(Pair.of(Path.of(name).getFileName().toString(), duuid)); dir.getChildren().put(Path.of(name).getFileName().toString(), duuid);
jObjectRepository.writeJObject(namespace, dir).await().indefinitely(); jObjectRepository.writeJObject(namespace, dir).await().indefinitely();
return Uni.createFrom().item(Optional.of(d)); return Uni.createFrom().item(Optional.of(d));
@@ -140,10 +142,10 @@ public class DhfsFileServiceImpl implements DhfsFileService {
if (!(found.get() instanceof Directory dir)) return Uni.createFrom().item(false); if (!(found.get() instanceof Directory dir)) return Uni.createFrom().item(false);
boolean removed = dir.getChildren().removeIf(p -> p.getLeft().equals(Path.of(name).getFileName().toString())); var removed = dir.getChildren().remove(Path.of(name).getFileName().toString());
if (removed) jObjectRepository.writeJObject(namespace, dir).await().indefinitely(); if (removed != null) jObjectRepository.writeJObject(namespace, dir).await().indefinitely();
return Uni.createFrom().item(removed); return Uni.createFrom().item(removed != null);
} }
@Override @Override
@@ -170,7 +172,7 @@ public class DhfsFileServiceImpl implements DhfsFileService {
if (!(found.get() instanceof Directory dir)) return Uni.createFrom().item(false); if (!(found.get() instanceof Directory dir)) return Uni.createFrom().item(false);
dir.getChildren().add(Pair.of(Path.of(to).getFileName().toString(), dent.get().getUuid())); dir.getChildren().put(Path.of(to).getFileName().toString(), dent.get().getUuid());
jObjectRepository.writeJObject(namespace, dir).await().indefinitely(); jObjectRepository.writeJObject(namespace, dir).await().indefinitely();
return Uni.createFrom().item(true); return Uni.createFrom().item(true);
@@ -183,7 +185,7 @@ public class DhfsFileServiceImpl implements DhfsFileService {
if (found.isEmpty()) throw new IllegalArgumentException(); if (found.isEmpty()) throw new IllegalArgumentException();
if (!(found.get() instanceof Directory foundDir)) throw new IllegalArgumentException(); if (!(found.get() instanceof Directory foundDir)) throw new IllegalArgumentException();
return Uni.createFrom().item(foundDir.getChildren().stream().map(Pair::getLeft).toList()); return Uni.createFrom().item(foundDir.getChildren().keySet().stream().toList());
} }
@Override @Override