You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2015/07/08 03:02:10 UTC

[1/2] jclouds git commit: LocalBlobStore: list marker blobs with delimiters.

Repository: jclouds
Updated Branches:
  refs/heads/master 6d27fbb18 -> 5383148d9


LocalBlobStore: list marker blobs with delimiters.

When the delimiter option is specified, local blob store should behave
similarly to swift and return the directory marker blobs (directory
blobs) and the common prefix. This undoes the filtering we were
previously doing.


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/669feb4d
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/669feb4d
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/669feb4d

Branch: refs/heads/master
Commit: 669feb4d0c459b1612818869ce82b9b5d1915f42
Parents: 6d27fbb
Author: Timur Alperovich <ti...@gmail.com>
Authored: Tue Jul 7 14:48:03 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Jul 7 18:00:31 2015 -0700

----------------------------------------------------------------------
 .../org/jclouds/blobstore/config/LocalBlobStore.java | 11 +++--------
 .../src/test/clojure/org/jclouds/blobstore2_test.clj | 13 ++++++++-----
 .../strategy/internal/ListContainerTest.java         | 15 +++++++++------
 3 files changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/669feb4d/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
index e8702a0..ed7ff48 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
@@ -353,7 +353,7 @@ public final class LocalBlobStore implements BlobStore {
               transform(contents, new CommonPrefixes(prefix, delimiter)));
       commonPrefixes.remove(CommonPrefixes.NO_PREFIX);
 
-      contents = newTreeSet(filter(contents, new DelimiterFilter(prefix, delimiter, commonPrefixes)));
+      contents = newTreeSet(filter(contents, new DelimiterFilter(prefix, delimiter)));
 
       for (String o : commonPrefixes) {
          MutableStorageMetadata md = new MutableStorageMetadataImpl();
@@ -457,20 +457,15 @@ public final class LocalBlobStore implements BlobStore {
    private static class DelimiterFilter implements Predicate<StorageMetadata> {
       private final String prefix;
       private final String delimiter;
-      private final Set<String> commonPrefixes;
 
-      public DelimiterFilter(String prefix, String delimiter, final Set<String> commonPrefixes) {
+      public DelimiterFilter(String prefix, String delimiter) {
          this.prefix = prefix;
          this.delimiter = delimiter;
-         this.commonPrefixes = commonPrefixes;
       }
 
       public boolean apply(StorageMetadata metadata) {
          String name = metadata.getName();
          if (prefix == null || prefix.isEmpty()) {
-            if (commonPrefixes.contains(name)) {
-               return false;
-            }
             return name.indexOf(delimiter) == -1;
          }
          String prefixMatch;
@@ -482,7 +477,7 @@ public final class LocalBlobStore implements BlobStore {
          }
          if (name.matches(prefixMatch)) {
             String unprefixedName = name.replaceFirst(prefix, "");
-            if (unprefixedName.equals("") || commonPrefixes.contains(unprefixedName)) {
+            if (unprefixedName.equals("")) {
                // we are the prefix in this case, return false
                return false;
             }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/669feb4d/blobstore/src/test/clojure/org/jclouds/blobstore2_test.clj
----------------------------------------------------------------------
diff --git a/blobstore/src/test/clojure/org/jclouds/blobstore2_test.clj b/blobstore/src/test/clojure/org/jclouds/blobstore2_test.clj
index 8ea5b2a..055e155 100644
--- a/blobstore/src/test/clojure/org/jclouds/blobstore2_test.clj
+++ b/blobstore/src/test/clojure/org/jclouds/blobstore2_test.clj
@@ -73,11 +73,14 @@
   (create-directory blobstore-stub "container" "dir")
   (is (put-blob blobstore-stub "container"
                 (blob "dir/blob2" :payload "blob2")))
-  (is (= 3 (count-blobs blobstore-stub "container")))
-  (is (= 3 (count (blobs blobstore-stub "container"))))
-  (is (= 4 (count (blobs blobstore-stub "container" :recursive true))))
-  (is (= 3 (count (blobs blobstore-stub "container" :with-details true))))
-  (is (= 1 (count (blobs blobstore-stub "container" :in-directory "dir")))))
+  (is (put-blob blobstore-stub "container"
+                (blob "dir/blob3" :payload "blob3")))
+  (is (= 4 (count-blobs blobstore-stub "container")))
+  (is (= 4 (count (blobs blobstore-stub "container"))))
+  (is (= 5 (count (blobs blobstore-stub "container" :recursive true))))
+  (is (= 4 (count (blobs blobstore-stub "container" :with-details true))))
+  ;; jclouds will list dir and dir/
+  (is (= 2 (count (blobs blobstore-stub "container" :in-directory "dir")))))
 
 (deftest large-container-list-test
   (let [container-name "test"

http://git-wip-us.apache.org/repos/asf/jclouds/blob/669feb4d/blobstore/src/test/java/org/jclouds/blobstore/strategy/internal/ListContainerTest.java
----------------------------------------------------------------------
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/strategy/internal/ListContainerTest.java b/blobstore/src/test/java/org/jclouds/blobstore/strategy/internal/ListContainerTest.java
index a71429a..acef128 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/strategy/internal/ListContainerTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/strategy/internal/ListContainerTest.java
@@ -123,8 +123,9 @@ public class ListContainerTest {
       blobStore.putBlob(containerName, blobStore.blobBuilder(directory + "/foo").payload("").build());
       blobStore.putBlob(containerName, blobStore.blobBuilder(directory + "/bar").payload("").build());
       Iterable<? extends StorageMetadata> results = concatter.execute(containerName, ListContainerOptions.NONE);
-      assertThat(results).hasSize(1);
-      assertThat(Iterables.get(results, 0).getName()).isEqualTo(directory + '/');
+      assertThat(results).hasSize(2);
+      assertThat(Iterables.get(results, 0).getName()).isEqualTo(directory);
+      assertThat(Iterables.get(results, 1).getName()).isEqualTo(directory + '/');
    }
 
    public void testListMarkers() {
@@ -153,8 +154,9 @@ public class ListContainerTest {
       blobStore.createDirectory(containerName, "dir/dir");
 
       PageSet<? extends StorageMetadata> results = blobStore.list(containerName);
-      assertThat(results.size()).isEqualTo(1);
-      assertThat(Iterables.get(results, 0).getName()).isEqualTo("dir/");
+      assertThat(results.size()).isEqualTo(2);
+      assertThat(Iterables.get(results, 0).getName()).isEqualTo("dir");
+      assertThat(Iterables.get(results, 1).getName()).isEqualTo("dir/");
 
       results = blobStore.list(containerName, ListContainerOptions.Builder.inDirectory("dir"));
       assertThat(results.size()).isEqualTo(1);
@@ -162,7 +164,8 @@ public class ListContainerTest {
 
       blobStore.putBlob(containerName, blobStore.blobBuilder("dir/dir/blob").payload("").build());
       results = blobStore.list(containerName, ListContainerOptions.Builder.inDirectory("dir"));
-      assertThat(results.size()).isEqualTo(1);
-      assertThat(Iterables.get(results, 0).getName()).isEqualTo("dir/dir/");
+      assertThat(results.size()).isEqualTo(2);
+      assertThat(Iterables.get(results, 0).getName()).isEqualTo("dir/dir");
+      assertThat(Iterables.get(results, 1).getName()).isEqualTo("dir/dir/");
    }
 }


[2/2] jclouds git commit: Filesystem: disable directory integration test.

Posted by ga...@apache.org.
Filesystem: disable directory integration test.

There is no notion of marker blobs in the file system blob store,
which means that when listing results after issuing the
"createDirectory" request, the marker blob will not be in the result
set.


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/5383148d
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/5383148d
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/5383148d

Branch: refs/heads/master
Commit: 5383148d9ef92fb39d8958abbe9cae19c80ca609
Parents: 669feb4
Author: Timur Alperovich <ti...@gmail.com>
Authored: Tue Jul 7 15:20:02 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Jul 7 18:00:32 2015 -0700

----------------------------------------------------------------------
 .../integration/FilesystemContainerIntegrationTest.java        | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/5383148d/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java
index 4b6cd03..bf6c4ab 100644
--- a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java
+++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemContainerIntegrationTest.java
@@ -34,6 +34,7 @@ import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest;
 import org.jclouds.blobstore.integration.internal.BaseContainerIntegrationTest;
 import org.jclouds.filesystem.reference.FilesystemConstants;
 import org.jclouds.filesystem.utils.TestUtils;
+import org.testng.SkipException;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -155,6 +156,11 @@ public class FilesystemContainerIntegrationTest extends BaseContainerIntegration
       super.testListContainerMaxResults();
    }
 
+   @Override
+   public void testDirectory() {
+      throw new SkipException("There is no notion of marker blobs in the file system blob store");
+   }
+
    @DataProvider
    public Object[][] ignoreOnMacOSX() {
       return org.jclouds.utils.TestUtils.isMacOSX() ? TestUtils.NO_INVOCATIONS