Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorder list option handling for local blobstores 

We should apply the prefix first, recursive second, marker third, and
max keys last.  Also add some fixes to pass delimiter tests.
This commit is contained in:
Andrew Gaul 2015-01-17 00:45:35 -08:00
parent c770ffbeb0
commit 49d7d9d3b7
1 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
View File

@ -234,21 +234,6 @@ public final class LocalBlobStore implements BlobStore {
String marker = null;
if (options != null) {
if (options.getMarker() != null) {
final String finalMarker = options.getMarker();
Optional<StorageMetadata> lastMarkerMetadata = tryFind(contents, new Predicate<StorageMetadata>() {
public boolean apply(StorageMetadata metadata) {
return metadata.getName().compareTo(finalMarker) > 0;
}
});
if (lastMarkerMetadata.isPresent()) {
contents = contents.tailSet(lastMarkerMetadata.get());
} else {
// marker is after last key or container is empty
contents.clear();
}
}
final String prefix = options.getDir();
if (prefix != null && !prefix.isEmpty()) {
final String dirPrefix = prefix.endsWith(File.separator) ?
@ -261,16 +246,6 @@ public final class LocalBlobStore implements BlobStore {
}));
}
int maxResults = options.getMaxResults() != null ? options.getMaxResults() : 1000;
if (!contents.isEmpty()) {
StorageMetadata lastElement = contents.last();
contents = newTreeSet(Iterables.limit(contents, maxResults));
if (maxResults != 0 && !contents.contains(lastElement)) {
// Partial listing
marker = contents.last().getName();
}
}
if (!options.isRecursive()) {
String delimiter = storageStrategy.getSeparator();
SortedSet<String> commonPrefixes = newTreeSet(
@ -282,11 +257,58 @@ public final class LocalBlobStore implements BlobStore {
for (String o : commonPrefixes) {
MutableStorageMetadata md = new MutableStorageMetadataImpl();
md.setType(StorageType.RELATIVE_PATH);
if (prefix != null) {
if (!prefix.endsWith(delimiter)) {
o = prefix + delimiter + o;
} else {
o = prefix + o;
}
}
md.setName(o);
contents.add(md);
}
}
if (options.getMarker() != null) {
final String finalMarker = options.getMarker();
String delimiter = storageStrategy.getSeparator();
Optional<StorageMetadata> lastMarkerMetadata;
if (finalMarker.endsWith(delimiter)) {
lastMarkerMetadata = tryFind(contents, new Predicate<StorageMetadata>() {
public boolean apply(StorageMetadata metadata) {
int length = finalMarker.length() - 1;
return metadata.getName().substring(0, length).compareTo(finalMarker.substring(0, length)) > 0;
}
});
} else {
lastMarkerMetadata = tryFind(contents, new Predicate<StorageMetadata>() {
public boolean apply(StorageMetadata metadata) {
return metadata.getName().compareTo(finalMarker) > 0;
}
});
}
if (lastMarkerMetadata.isPresent()) {
contents = contents.tailSet(lastMarkerMetadata.get());
} else {
// marker is after last key or container is empty
contents.clear();
}
}
int maxResults = options.getMaxResults() != null ? options.getMaxResults() : 1000;
if (!contents.isEmpty()) {
StorageMetadata lastElement = contents.last();
contents = newTreeSet(Iterables.limit(contents, maxResults));
if (maxResults != 0 && !contents.contains(lastElement)) {
// Partial listing
lastElement = contents.last();
marker = lastElement.getName();
if (lastElement.getType() == StorageType.RELATIVE_PATH) {
marker += "/";
}
}
}
// trim metadata, if the response isn't supposed to be detailed.
if (!options.isDetailed()) {
for (StorageMetadata md : contents) {