Skip to content

Commit

Permalink
Speed improvements (#33)
Browse files Browse the repository at this point in the history 
* Use 0 sized arrays when using toArray

* Avoid multiple access to the file system

The plexus DirectoryScanner usually access the file system multiple times for each file, so cache all attributes
  • Loading branch information
@gnodet
gnodet authored Nov 25, 2020
1 parent da6411b commit 5b79b54
Show file tree
Hide file tree
Showing 7 changed files with 231 additions and 100 deletions.
126 changes: 86 additions & 40 deletions src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.attribute.FileOwnerAttributeView;
import java.nio.file.attribute.FileTime;
import java.nio.file.attribute.PosixFilePermission;
import java.security.Principal;
import java.util.Collections;
Expand Down Expand Up @@ -52,62 +53,77 @@ public class FileAttributes

private final boolean symbolicLink;

private final boolean regularFile;

private final boolean directory;

private final boolean other;

private final int octalMode;

private final Set<PosixFilePermission> permissions;

private final long size;

private final FileTime lastModifiedTime;

public FileAttributes( @Nonnull File file, @Nonnull Map<Integer, String> userCache,
@Nonnull Map<Integer, String> groupCache )
throws IOException
{

Path path = file.toPath();
if ( AttributeUtils.isUnix( path ) )
Set<String> views = path.getFileSystem().supportedFileAttributeViews();
String names;
if ( views.contains( "unix" ) )
{
names = "unix:*";
}
else if ( views.contains( "posix" ) )
{
Map<String, Object> attrs = Files.readAttributes( path, "unix:permissions,gid,uid,isSymbolicLink,mode", LinkOption.NOFOLLOW_LINKS );
this.permissions = (Set<PosixFilePermission>) attrs.get( "permissions" );

groupId = (Integer) attrs.get( "gid" );

String groupName = groupCache.get( groupId );
if ( groupName != null )
{
this.groupName = groupName;
}
else
{
Object group = Files.getAttribute( path, "unix:group", LinkOption.NOFOLLOW_LINKS );
this.groupName = ( (Principal) group ).getName();
groupCache.put( groupId, this.groupName );
}
userId = (Integer) attrs.get( "uid" );
String userName = userCache.get( userId );
if ( userName != null )
{
this.userName = userName;
}
else
{
Object owner = Files.getAttribute( path, "unix:owner", LinkOption.NOFOLLOW_LINKS );
this.userName = ( (Principal) owner ).getName();
userCache.put( userId, this.userName );
}
octalMode = (Integer) attrs.get( "mode" ) & 0xfff; // Mask off top bits for compatibilty. Maybe check if we
// can skip this
symbolicLink = (Boolean) attrs.get( "isSymbolicLink" );
names = "posix:*";
}
else
{
FileOwnerAttributeView fa = AttributeUtils.getFileOwnershipInfo( file );
this.userName = fa.getOwner().getName();
userId = null;
this.groupName = null;
this.groupId = null;
octalMode = PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE;
permissions = Collections.emptySet();
symbolicLink = Files.isSymbolicLink( path );
names = "basic:*";
}
Map<String, Object> attrs = Files.readAttributes( path, names, LinkOption.NOFOLLOW_LINKS);
if ( !attrs.containsKey( "group" ) && !attrs.containsKey( "owner" ) && views.contains( "owner" ) )
{
Map<String, Object> ownerAttrs = Files.readAttributes( path, "owner:*", LinkOption.NOFOLLOW_LINKS);
Map<String, Object> newAttrs = new HashMap<>( attrs );
newAttrs.putAll( ownerAttrs );
attrs = newAttrs;
}
this.groupId = (Integer) attrs.get( "gid" );
this.groupName = attrs.containsKey( "group" ) ? ((Principal) attrs.get( "group" ) ).getName() : null;
this.userId = (Integer) attrs.get( "uid" );
this.userName = attrs.containsKey( "owner" ) ? ((Principal) attrs.get( "owner" ) ).getName() : null;
this.symbolicLink = (Boolean) attrs.get( "isSymbolicLink" );
this.regularFile = (Boolean) attrs.get( "isRegularFile" );
this.directory = (Boolean) attrs.get( "isDirectory" );
this.other = (Boolean) attrs.get( "isOther" );
this.octalMode = attrs.containsKey( "mode" ) ? (Integer) attrs.get( "mode" ) & 0xfff : PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE;
this.permissions = attrs.containsKey( "permissions" ) ? (Set<PosixFilePermission>) attrs.get( "permissions" ) : Collections.<PosixFilePermission>emptySet();
this.size = (Long) attrs.get( "size" );
this.lastModifiedTime = (FileTime) attrs.get( "lastModifiedTime" );
}

public FileAttributes( @Nullable Integer userId, String userName, @Nullable Integer groupId, @Nullable String groupName,
int octalMode, boolean symbolicLink, boolean regularFile, boolean directory, boolean other,
Set<PosixFilePermission> permissions, long size, FileTime lastModifiedTime) {
this.userId = userId;
this.userName = userName;
this.groupId = groupId;
this.groupName = groupName;
this.octalMode = octalMode;
this.symbolicLink = symbolicLink;
this.regularFile = regularFile;
this.directory = directory;
this.other = other;
this.permissions = permissions;
this.size = size;
this.lastModifiedTime = lastModifiedTime;
}

public static @Nonnull
Expand Down Expand Up @@ -290,4 +306,34 @@ public boolean isSymbolicLink()
{
return symbolicLink;
}

public boolean isRegularFile()
{
return regularFile;
}

public boolean isDirectory()
{
return directory;
}

public boolean isOther()
{
return other;
}

public long getSize()
{
return size;
}

public FileTime getLastModifiedTime()
{
return lastModifiedTime;
}

protected Set<PosixFilePermission> getPermissions()
{
return permissions;
}
}
116 changes: 59 additions & 57 deletions ...ain/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,69 +43,71 @@ public static PlexusIoResourceAttributes mergeAttributes( PlexusIoResourceAttrib
{
return base;
}
SimpleResourceAttributes result;
if ( base == null )
{
result = new SimpleResourceAttributes();
return new SimpleResourceAttributes(
override.getUserId() != null && override.getUserId() != -1
? override.getUserId()
: def != null && def.getUserId() != null && def.getUserId() != -1
? def.getUserId()
: null,
override.getUserName() != null
? override.getUserName()
: def != null
? def.getUserName()
: null,
override.getGroupId() != null && override.getGroupId() != -1
? override.getGroupId()
: def != null && def.getGroupId() != null && def.getGroupId() != -1
? def.getGroupId()
: null,
override.getGroupName() != null
? override.getGroupName()
: def != null
? def.getGroupName()
: null,
override.getOctalMode() );
}
else
{
result = new SimpleResourceAttributes( base.getUserId(), base.getUserName(), base.getGroupId(),
base.getGroupName(), base.getOctalMode() );
result.setSymbolicLink( base.isSymbolicLink() );
Integer uid = override.getUserId() != null && override.getUserId() != -1
? override.getUserId()
: base.getUserId() != null && base.getUserId() != -1
? base.getUserId()
: def.getUserId() != null && def.getUserId() != -1
? def.getUserId()
: null;
String uname = override.getUserName() != null
? override.getUserName()
: base.getUserName() != null
? base.getUserName()
: def.getUserName();
Integer gid = override.getGroupId() != null && override.getGroupId() != -1
? override.getGroupId()
: base.getGroupId() != null && base.getGroupId() != -1
? base.getGroupId()
: def.getGroupId() != null && def.getGroupId() != -1
? def.getGroupId()
: null;
String gname = override.getGroupName() != null
? override.getGroupName()
: base.getGroupName() != null
? base.getGroupName()
: def.getGroupName();
int mode = override.getOctalMode() > 0
? override.getOctalMode()
: base.getOctalMode() >= 0
? base.getOctalMode()
: def.getOctalMode();
if ( base instanceof FileAttributes )
{
return new UserGroupModeFileAttributes( uid, uname, gid, gname, mode, (FileAttributes) base );
}
else
{
return new SimpleResourceAttributes( uid, uname, gid, gname, mode, base.isSymbolicLink() );
}
}

if ( override.getGroupId() != null && override.getGroupId() != -1 )
{
result.setGroupId( override.getGroupId() );
}

if ( def != null && def.getGroupId() >= 0 && ( result.getGroupId() == null || result.getGroupId() < 0 ) )
{
result.setGroupId( def.getGroupId() );
}

if ( override.getGroupName() != null )
{
result.setGroupName( override.getGroupName() );
}

if ( def != null && result.getGroupName() == null )
{
result.setGroupName( def.getGroupName() );
}

if ( override.getUserId() != null && override.getUserId() != -1 )
{
result.setUserId( override.getUserId() );
}

if ( def != null && def.getUserId() >= 0 && ( result.getUserId() == null || result.getUserId() < 0 ) )
{
result.setUserId( def.getUserId() );
}

if ( override.getUserName() != null )
{
result.setUserName( override.getUserName() );
}

if ( def != null && result.getUserName() == null )
{
result.setUserName( def.getUserName() );
}

if ( override.getOctalMode() > 0 )
{
result.setOctalMode( override.getOctalMode() );
}

if ( def != null && result.getOctalMode() < 0 )
{
result.setOctalMode( def.getOctalMode() );
}

return result;
}

public static boolean isGroupExecutableInOctal( int mode )
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@ public SimpleResourceAttributes( Integer uid, String userName, Integer gid, Stri
this.mode = mode;
}

public SimpleResourceAttributes( Integer uid, String userName, Integer gid, String groupName, int mode, boolean isSymbolicLink )
{
this.uid = uid;
this.userName = userName;
this.gid = gid;
this.groupName = groupName;
this.mode = mode;
this.isSymbolicLink = isSymbolicLink;
}

public static PlexusIoResourceAttributes lastResortDummyAttributesForBrokenOS()
{
return new SimpleResourceAttributes();
Expand Down
47 changes: 47 additions & 0 deletions src/main/java/org/codehaus/plexus/components/io/attributes/UserGroupModeFileAttributes.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package org.codehaus.plexus.components.io.attributes;

/*
* Copyright 2007 The Codehaus Foundation.
*
* 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.
*/

import javax.annotation.Nullable;

/*
* A very simple pojo based PlexusIoResourceAttributes without any kind of backing
*/
public class UserGroupModeFileAttributes
extends FileAttributes
{

public UserGroupModeFileAttributes( Integer uid, String userName, Integer gid, String groupName, int mode, FileAttributes base )
{
super( uid, userName, gid, groupName, mode,
base.isSymbolicLink(), base.isRegularFile(), base.isDirectory(), base.isOther(),
base.getPermissions(), base.getSize(), base.getLastModifiedTime() );
}

public String toString()
{
return String.format(
"%nResource Attributes:%n------------------------------%nuser: %s%ngroup: %s%nuid: %d%ngid: %d%nmode: %06o",
getUserName() == null ? "" : getUserName(),
getGroupName() == null ? "" : getGroupName(),
getUserId() != null ? getUserId() : 0,
getGroupId() != null ? getGroupId() : 0,
getOctalMode() );
}


}
Loading

0 comments on commit 5b79b54

Please sign in to comment.