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

[MRM-1327] namespaces should be paths to avoid being too flat. Use queries for some other traversal methods. 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1051458 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2010-12-21 11:21:57 +00:00
parent 2a6a4e570f
commit 7f610bca75
1 changed files with 68 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
View File

@ -73,6 +73,7 @@ import javax.jcr.query.QueryResult;
* @todo review all methods for alternate implementations (use of queries) * @todo review all methods for alternate implementations (use of queries)
* @todo below: exception handling * @todo below: exception handling
* @todo below: revise storage format for project version metadata * @todo below: revise storage format for project version metadata
* @todo review for unnecessary node addition in r/o methods
*/ */
public class JcrMetadataRepository public class JcrMetadataRepository
implements MetadataRepository implements MetadataRepository
@ -83,6 +84,8 @@ public class JcrMetadataRepository
private static final String FACET_NODE_TYPE = "archiva:facet"; private static final String FACET_NODE_TYPE = "archiva:facet";
private static final String QUERY_ARTIFACTS = "SELECT * FROM [" + ARTIFACT_NODE_TYPE + "]";
/** /**
* @plexus.requirement role="org.apache.archiva.metadata.model.MetadataFacetFactory" * @plexus.requirement role="org.apache.archiva.metadata.model.MetadataFacetFactory"
*/ */
@ -301,8 +304,7 @@ public class JcrMetadataRepository
public void updateProjectReference( String repositoryId, String namespace, String projectId, String projectVersion, public void updateProjectReference( String repositoryId, String namespace, String projectId, String projectVersion,
ProjectVersionReference reference ) ProjectVersionReference reference )
{ {
// TODO: try weak reference? // not using weak references, since they still need to exist upfront to be referred to
// TODO: is this tree the right way up? It differs from the content model
try try
{ {
Node node = getOrAddRepositoryContentNode( repositoryId ); Node node = getOrAddRepositoryContentNode( repositoryId );
@ -326,7 +328,6 @@ public class JcrMetadataRepository
{ {
try try
{ {
// TODO: currently flat
Node node = getOrAddNamespaceNode( repositoryId, namespace ); Node node = getOrAddNamespaceNode( repositoryId, namespace );
node.setProperty( "namespace", namespace ); node.setProperty( "namespace", namespace );
} }
@ -347,8 +348,8 @@ public class JcrMetadataRepository
// are paths themselves // are paths themselves
Node node = session.getRootNode().getNode( getFacetPath( repositoryId, facetId ) ); Node node = session.getRootNode().getNode( getFacetPath( repositoryId, facetId ) );
// TODO: could we simply query all nodes with no children? Or perhaps a specific nodetype? // TODO: this is a bit awkward. Might be better to review the purpose of this function - why is the list of
// Might be better to review the purpose of this function - why is the list of paths helpful? // paths helpful?
recurse( facets, "", node ); recurse( facets, "", node );
} }
catch ( PathNotFoundException e ) catch ( PathNotFoundException e )
@ -427,7 +428,7 @@ public class JcrMetadataRepository
String id = metadataFacet.getFacetId(); String id = metadataFacet.getFacetId();
Node facetNode = JcrUtils.getOrAddNode( facets, id ); Node facetNode = JcrUtils.getOrAddNode( facets, id );
Node node = getOrCreatePath( facetNode, metadataFacet.getName() ); Node node = getOrAddNodeByPath( facetNode, metadataFacet.getName() );
for ( Map.Entry<String, String> entry : metadataFacet.toProperties().entrySet() ) for ( Map.Entry<String, String> entry : metadataFacet.toProperties().entrySet() )
{ {
@ -441,24 +442,12 @@ public class JcrMetadataRepository
} }
} }
private Node getOrCreatePath( Node baseNode, String name )
throws RepositoryException
{
Node node = baseNode;
for ( String n : name.split( "/" ) )
{
node = JcrUtils.getOrAddNode( node, n );
}
return node;
}
public void removeMetadataFacets( String repositoryId, String facetId ) public void removeMetadataFacets( String repositoryId, String facetId )
{ {
try try
{ {
Node root = session.getRootNode(); Node root = session.getRootNode();
String path = getFacetPath( repositoryId, facetId ); String path = getFacetPath( repositoryId, facetId );
// TODO: exception if missing?
if ( root.hasNode( path ) ) if ( root.hasNode( path ) )
{ {
root.getNode( path ).remove(); root.getNode( path ).remove();
@ -477,12 +466,12 @@ public class JcrMetadataRepository
{ {
Node root = session.getRootNode(); Node root = session.getRootNode();
String path = getFacetPath( repositoryId, facetId, name ); String path = getFacetPath( repositoryId, facetId, name );
// TODO: exception if missing?
if ( root.hasNode( path ) ) if ( root.hasNode( path ) )
{ {
Node node = root.getNode( path ); Node node = root.getNode( path );
do do
{ {
// also remove empty container nodes
Node parent = node.getParent(); Node parent = node.getParent();
node.remove(); node.remove();
node = parent; node = parent;
@ -501,7 +490,7 @@ public class JcrMetadataRepository
{ {
List<ArtifactMetadata> artifacts; List<ArtifactMetadata> artifacts;
String q = "SELECT * FROM [archiva:artifact]"; String q = QUERY_ARTIFACTS;
String clause = " WHERE"; String clause = " WHERE";
if ( startTime != null ) if ( startTime != null )
@ -576,42 +565,31 @@ public class JcrMetadataRepository
public List<ArtifactMetadata> getArtifactsByChecksum( String repositoryId, String checksum ) public List<ArtifactMetadata> getArtifactsByChecksum( String repositoryId, String checksum )
{ {
// TODO: this is quite slow - if we are to persist with this repository implementation we should build an index List<ArtifactMetadata> artifacts;
// of this information (eg. in Lucene, as before)
// alternatively, we could build a referential tree in the content repository, however it would need some levels
// of depth to avoid being too broad to be useful (eg. /repository/checksums/a/ab/abcdef1234567)
List<ArtifactMetadata> artifacts = new ArrayList<ArtifactMetadata>(); String q = QUERY_ARTIFACTS + " WHERE [sha1] = $checksum OR [md5] = $checksum";
for ( String ns : getRootNamespaces( repositoryId ) )
try
{ {
getArtifactsByChecksum( artifacts, repositoryId, ns, checksum ); Query query = session.getWorkspace().getQueryManager().createQuery( q, Query.JCR_SQL2 );
ValueFactory valueFactory = session.getValueFactory();
query.bindValue( "checksum", valueFactory.createValue( checksum ) );
QueryResult result = query.execute();
artifacts = new ArrayList<ArtifactMetadata>();
for ( Node n : JcrUtils.getNodes( result ) )
{
artifacts.add( getArtifactFromNode( repositoryId, n ) );
}
}
catch ( RepositoryException e )
{
// TODO
throw new RuntimeException( e );
} }
return artifacts; return artifacts;
} }
private void getArtifactsByChecksum( List<ArtifactMetadata> artifacts, String repositoryId, String ns,
String checksum )
{
for ( String namespace : getNamespaces( repositoryId, ns ) )
{
getArtifactsByChecksum( artifacts, repositoryId, ns + "." + namespace, checksum );
}
for ( String project : getProjects( repositoryId, ns ) )
{
for ( String version : getProjectVersions( repositoryId, ns, project ) )
{
for ( ArtifactMetadata artifact : getArtifacts( repositoryId, ns, project, version ) )
{
if ( checksum.equals( artifact.getMd5() ) || checksum.equals( artifact.getSha1() ) )
{
artifacts.add( artifact );
}
}
}
}
}
public void deleteArtifact( String repositoryId, String namespace, String projectId, String projectVersion, public void deleteArtifact( String repositoryId, String namespace, String projectId, String projectVersion,
String id ) String id )
{ {
@ -655,34 +633,29 @@ public class JcrMetadataRepository
public List<ArtifactMetadata> getArtifacts( String repositoryId ) public List<ArtifactMetadata> getArtifacts( String repositoryId )
{ {
// TODO: query faster? List<ArtifactMetadata> artifacts;
List<ArtifactMetadata> artifacts = new ArrayList<ArtifactMetadata>();
for ( String ns : getRootNamespaces( repositoryId ) ) String q = QUERY_ARTIFACTS;
try
{ {
getArtifacts( artifacts, repositoryId, ns ); Query query = session.getWorkspace().getQueryManager().createQuery( q, Query.JCR_SQL2 );
QueryResult result = query.execute();
artifacts = new ArrayList<ArtifactMetadata>();
for ( Node n : JcrUtils.getNodes( result ) )
{
artifacts.add( getArtifactFromNode( repositoryId, n ) );
}
}
catch ( RepositoryException e )
{
// TODO
throw new RuntimeException( e );
} }
return artifacts; return artifacts;
} }
private void getArtifacts( List<ArtifactMetadata> artifacts, String repoId, String ns )
{
for ( String namespace : getNamespaces( repoId, ns ) )
{
getArtifacts( artifacts, repoId, ns + "." + namespace );
}
for ( String project : getProjects( repoId, ns ) )
{
for ( String version : getProjectVersions( repoId, ns, project ) )
{
for ( ArtifactMetadata artifact : getArtifacts( repoId, ns, project, version ) )
{
artifacts.add( artifact );
}
}
}
}
public ProjectMetadata getProject( String repositoryId, String namespace, String projectId ) public ProjectMetadata getProject( String repositoryId, String namespace, String projectId )
{ {
ProjectMetadata metadata = null; ProjectMetadata metadata = null;
@ -1026,27 +999,26 @@ public class JcrMetadataRepository
public Collection<String> getNamespaces( String repositoryId, String baseNamespace ) public Collection<String> getNamespaces( String repositoryId, String baseNamespace )
{ {
// TODO: could be simpler with pathed namespaces, rely on namespace property List<String> namespaces = new ArrayList<String>();
Collection<String> allNamespaces = getNodeNames( "repositories/" + repositoryId + "/content" ); try
{
Node node = getOrAddRepositoryContentNode( repositoryId );
if ( baseNamespace != null )
{
node = getOrAddNodeByPath( node, baseNamespace.replace( '.', '/' ) );
}
Set<String> namespaces = new LinkedHashSet<String>(); for ( Node n : JcrUtils.getChildNodes( node ) )
int fromIndex = baseNamespace != null ? baseNamespace.length() + 1 : 0;
for ( String namespace : allNamespaces )
{ {
if ( baseNamespace == null || namespace.startsWith( baseNamespace + "." ) ) namespaces.add( n.getName() );
{
int i = namespace.indexOf( '.', fromIndex );
if ( i >= 0 )
{
namespaces.add( namespace.substring( fromIndex, i ) );
}
else
{
namespaces.add( namespace.substring( fromIndex ) );
} }
} }
catch ( RepositoryException e )
{
// TODO
throw new RuntimeException( e );
} }
return new ArrayList<String>( namespaces ); return namespaces;
} }
public Collection<String> getProjects( String repositoryId, String namespace ) public Collection<String> getProjects( String repositoryId, String namespace )
@ -1203,6 +1175,17 @@ public class JcrMetadataRepository
return "repositories/" + repositoryId + "/facets/" + facetId; return "repositories/" + repositoryId + "/facets/" + facetId;
} }
private Node getOrAddNodeByPath( Node baseNode, String name )
throws RepositoryException
{
Node node = baseNode;
for ( String n : name.split( "/" ) )
{
node = JcrUtils.getOrAddNode( node, n );
}
return node;
}
private static String getFacetPath( String repositoryId, String facetId, String name ) private static String getFacetPath( String repositoryId, String facetId, String name )
{ {
return getFacetPath( repositoryId, facetId ) + "/" + name; return getFacetPath( repositoryId, facetId ) + "/" + name;
@ -1228,7 +1211,7 @@ public class JcrMetadataRepository
throws RepositoryException throws RepositoryException
{ {
Node repo = getOrAddRepositoryContentNode( repositoryId ); Node repo = getOrAddRepositoryContentNode( repositoryId );
return JcrUtils.getOrAddNode( repo, namespace ); return getOrAddNodeByPath( repo, namespace.replace( '.', '/' ) );
} }
private Node getOrAddProjectNode( String repositoryId, String namespace, String projectId ) private Node getOrAddProjectNode( String repositoryId, String namespace, String projectId )