Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NXP-30366: allow storage of S3 blobs in spread out subdirectories
- Loading branch information
Showing
10 changed files
with
244 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
...xeo-core-binarymanager-s3/src/test/java/org/nuxeo/ecm/blob/s3/TestS3BlobStoreSubdirs.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| * (C) Copyright 2019 Nuxeo (http://nuxeo.com/) and others. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * Contributors: | ||
| * Florent Guillaume | ||
| */ | ||
| package org.nuxeo.ecm.blob.s3; | ||
|
|
||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import org.junit.Test; | ||
| import org.nuxeo.runtime.test.runner.Deploy; | ||
|
|
||
| @Deploy("org.nuxeo.ecm.core.storage.binarymanager.s3.tests:OSGI-INF/test-blob-provider-s3-subdirs.xml") | ||
| public class TestS3BlobStoreSubdirs extends TestS3BlobStoreAbstract { | ||
|
|
||
| @Test | ||
| public void testFlags() { | ||
| assertFalse(bp.isTransactional()); | ||
| assertFalse(bp.isRecordMode()); | ||
| assertTrue(bs.getKeyStrategy().useDeDuplication()); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
...nuxeo-core-binarymanager-s3/src/test/resources/OSGI-INF/test-blob-provider-s3-subdirs.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?xml version="1.0"?> | ||
| <component name="org.nuxeo.ecm.blob.s3.test.subdirs" version="1.0.0"> | ||
| <extension target="org.nuxeo.ecm.core.blob.BlobManager" point="configuration"> | ||
| <blobprovider name="test"> | ||
| <class>org.nuxeo.ecm.blob.s3.S3BlobProvider</class> | ||
| <property name="bucket_prefix">base/</property> | ||
| <property name="subDirsDepth">2</property> | ||
| </blobprovider> | ||
| <blobprovider name="other"> | ||
| <class>org.nuxeo.ecm.blob.s3.S3BlobProvider</class> | ||
| <property name="bucket_prefix">other/</property> | ||
| <property name="subDirsDepth">3</property> | ||
| </blobprovider> | ||
| </extension> | ||
| </component> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
...anager-cloud/nuxeo-core-binarymanager-s3/src/test/resources/traces/trace-read-subdirs.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| @startuml | ||
| participant Nuxeo order 1 | ||
| participant Cache order 2 | ||
| participant S3 order 3 | ||
| == Read (subdirs) == | ||
| Nuxeo <-- Cache: missing | ||
| hnote right: acbd18db4cc2f85cedef654fccc4a4d8 | ||
| Nuxeo <- S3: read 3 bytes | ||
| hnote right: subdirs/ac/bd/acbd18db4cc2f85cedef654fccc4a4d8 | ||
| hnote right of Cache: ${TMP} | ||
| Cache --> Cache: rename | ||
| hnote right of Cache: acbd18db4cc2f85cedef654fccc4a4d8 | ||
| @enduml |
20 changes: 20 additions & 0 deletions
20
...nager-cloud/nuxeo-core-binarymanager-s3/src/test/resources/traces/trace-write-subdirs.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| @startuml | ||
| participant Nuxeo order 1 | ||
| participant Cache order 2 | ||
| participant S3 order 3 | ||
| == Write (subdirs) == | ||
| Nuxeo -> Cache: write 3 bytes | ||
| hnote right: bin_${TMP1}.tmp | ||
| Cache --> Cache: rename | ||
| hnote right of Cache: ${TMP2} | ||
| Nuxeo <-- Cache: missing | ||
| hnote right: acbd18db4cc2f85cedef654fccc4a4d8 | ||
| Nuxeo --> S3: getObjectMetadata | ||
| hnote right: subdirs/ac/bd/acbd18db4cc2f85cedef654fccc4a4d8 | ||
| Nuxeo <-- S3: missing | ||
| Nuxeo -> S3: write 3 bytes | ||
| hnote right: subdirs/ac/bd/acbd18db4cc2f85cedef654fccc4a4d8 | ||
| hnote right of Cache: ${TMP2} | ||
| Cache --> Cache: rename | ||
| hnote right of Cache: acbd18db4cc2f85cedef654fccc4a4d8 | ||
| @enduml |
Oops, something went wrong.