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

Revert "Always return ETag from filesystem object store" 

This reverts commit 496e27f1af.  This
commit imposed too much computational overhead when listing blobs.
This commit is contained in:
Andrew Gaul 2016-01-28 19:24:23 -08:00
parent b6920ca44b
commit 86e947dded
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java
View File

@ -371,11 +371,6 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy {
userMetadata.put(attribute.substring(XATTR_USER_METADATA_PREFIX.length()), value); userMetadata.put(attribute.substring(XATTR_USER_METADATA_PREFIX.length()), value);
} }
if (hashCode == null) {
// content-md5 xattr not found; recompute
hashCode = byteSource.hash(Hashing.md5());
}
builder.payload(byteSource) builder.payload(byteSource)
.cacheControl(cacheControl) .cacheControl(cacheControl)
.contentDisposition(contentDisposition) .contentDisposition(contentDisposition)

30
apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java
View File

@ -16,7 +16,6 @@
*/ */
package org.jclouds.filesystem.strategy.internal; package org.jclouds.filesystem.strategy.internal;
import static com.google.common.io.BaseEncoding.base16;
import static org.jclouds.filesystem.util.Utils.isMacOSX; import static org.jclouds.filesystem.util.Utils.isMacOSX;
import static org.jclouds.utils.TestUtils.randomByteSource; import static org.jclouds.utils.TestUtils.randomByteSource;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
@ -56,8 +55,6 @@ import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.hash.HashCode;
import com.google.common.hash.Hashing;
import com.google.common.io.ByteSource; import com.google.common.io.ByteSource;
import com.google.common.io.Files; import com.google.common.io.Files;
import com.google.common.util.concurrent.Uninterruptibles; import com.google.common.util.concurrent.Uninterruptibles;
@ -670,27 +667,6 @@ public class FilesystemStorageStrategyImplTest {
assertFalse(blob.getMetadata().getUserMetadata().containsKey("key1")); assertFalse(blob.getMetadata().getUserMetadata().containsKey("key1"));
} }
// This test will become irrelevant if the JVM starts supporting
// user extended attributes on HFS+. Nobody will complain.
@Test(dataProvider = "onlyOnMacOSX")
public void testEtagReturnedWithoutXattrSupport() throws Exception {
String blobKey = TestUtils.createRandomBlobKey();
ByteSource content = randomByteSource().slice(0, 1024);
HashCode expectedHash = content.hash(Hashing.md5());
// write blob
Blob blob = new BlobBuilderImpl()
.name(blobKey)
.payload(content)
.build();
String etag = storageStrategy.putBlob(CONTAINER_NAME, blob);
// read blob & check etag
blob = storageStrategy.getBlob(CONTAINER_NAME, blobKey);
assertEquals(blob.getMetadata().getContentMetadata().getContentMD5AsHashCode(), expectedHash);
assertEquals(blob.getMetadata().getETag(), base16().lowerCase().encode(expectedHash.asBytes()));
}
// ---------------------------------------------------------- Private methods // ---------------------------------------------------------- Private methods
/** /**
@ -710,10 +686,4 @@ public class FilesystemStorageStrategyImplTest {
return isMacOSX() ? TestUtils.NO_INVOCATIONS return isMacOSX() ? TestUtils.NO_INVOCATIONS
: TestUtils.SINGLE_NO_ARG_INVOCATION; : TestUtils.SINGLE_NO_ARG_INVOCATION;
} }
@DataProvider
public Object[][] onlyOnMacOSX() {
return isMacOSX() ?
TestUtils.SINGLE_NO_ARG_INVOCATION : TestUtils.NO_INVOCATIONS;
}
} }