Skip to content

Use s3 prefix plus raw path as the physical path #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ruhan1 merged 1 commit into from
Mar 14, 2024
Merged

Use s3 prefix plus raw path as the physical path #110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions storage/src/main/java/org/commonjava/storage/pathmapped/core/S3PhysicalStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@

public class S3PhysicalStore implements PhysicalStore
{
private static final int LEVEL_1_DIR_LENGTH = 2;

private static final int LEVEL_2_DIR_LENGTH = 2;

private static final int DIR_LENGTH = LEVEL_1_DIR_LENGTH + LEVEL_2_DIR_LENGTH;

private final Logger logger = LoggerFactory.getLogger( getClass() );

private final S3Client s3Client;
Expand All @@ -54,18 +48,20 @@ public S3PhysicalStore( S3Client s3Client, String bucket )
public FileInfo getFileInfo( String fileSystem, String path )
{
String id = getRandomFileId();
String dir = getStorageDir( id );
FileInfo fileInfo = new FileInfo();
fileInfo.setFileId( id );
fileInfo.setFileStorage( Paths.get( dir, id ).toString() );
fileInfo.setFileStorage( getS3Key( fileSystem, path ) );
return fileInfo;
}

private String getStorageDir( String fileId )
/**
* Some characters that might require special handling, like Colon ':'. This default impl is replacing colon
* with slash '/'. Derived classes can override the default behavior.
* @return valid S3 key string
*/
protected String getS3Key( String filesystem, String path )
{
String folder = fileId.substring( 0, LEVEL_1_DIR_LENGTH );
String subFolder = fileId.substring( LEVEL_1_DIR_LENGTH, DIR_LENGTH );
return folder + "/" + subFolder;
return Paths.get( filesystem.replaceAll(":", "/"), path ).toString();
}

@Override
Expand Down