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

fix checksum search cassandra search 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1580691 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2014-03-24 01:36:39 +00:00
parent fddb0ca9cf
commit 6b7feec1f1
5 changed files with 86 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
View File

@ -98,7 +98,7 @@ public interface MetadataRepository
Collection<String> getRepositories()
throws MetadataRepositoryException;
List<ArtifactMetadata> getArtifactsByChecksum( String repositoryId, String checksum )
Collection<ArtifactMetadata> getArtifactsByChecksum( String repositoryId, String checksum )
throws MetadataRepositoryException;
void removeArtifact( String repositoryId, String namespace, String project, String version, String id )

2
archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
View File

@ -1164,7 +1164,7 @@ public abstract class AbstractMetadataRepositoryTest
ArtifactMetadata artifact = createArtifact();
repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
List<ArtifactMetadata> artifactsByChecksum = repository.getArtifactsByChecksum( TEST_REPO_ID, "not checksum" );
Collection<ArtifactMetadata> artifactsByChecksum = repository.getArtifactsByChecksum( TEST_REPO_ID, "not checksum" );
assertEquals( Collections.<ArtifactMetadata>emptyList(), artifactsByChecksum );
}

106
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
View File

@ -723,7 +723,7 @@ public class CassandraMetadataRepository
return projectMetadata;
}
protected ProjectVersionMetadataModel map( ColumnSlice<String, String> columnSlice )
protected ProjectVersionMetadataModel mapProjectVersionMetadataModel( ColumnSlice<String, String> columnSlice )
{
ProjectVersionMetadataModel projectVersionMetadataModel = new ProjectVersionMetadataModel();
projectVersionMetadataModel.setId( getStringValue( columnSlice, "id" ) );
@ -786,7 +786,8 @@ public class CassandraMetadataRepository
boolean creation = true;
if ( result.get().getCount() > 0 )
{
projectVersionMetadataModel = map( result.get().getList().get( 0 ).getColumnSlice() );
projectVersionMetadataModel =
mapProjectVersionMetadataModel( result.get().getList().get( 0 ).getColumnSlice() );
creation = false;
}
else
@ -1675,9 +1676,19 @@ public class CassandraMetadataRepository
for ( Row<String, String, Long> row : result.get() )
{
ColumnSlice<String, Long> columnSlice = row.getColumnSlice();
String repositoryName =
ss.fromByteBuffer( columnSlice.getColumnByName( "repositoryName" ).getValueBytes() );
String repositoryName = getAsStringValue( columnSlice, "repositoryName" );
if ( StringUtils.equals( repositoryName, repositoryId ) )
{
artifactMetadatas.add( mapArtifactMetadataLongColumnSlice( columnSlice ) );
}
}
return artifactMetadatas;
}
protected ArtifactMetadata mapArtifactMetadataLongColumnSlice( ColumnSlice columnSlice )
{
ArtifactMetadata artifactMetadata = new ArtifactMetadata();
artifactMetadata.setNamespace( getAsStringValue( columnSlice, "namespaceId" ) );
@ -1687,7 +1698,7 @@ public class CassandraMetadataRepository
artifactMetadata.setMd5( getAsStringValue( columnSlice, "md5" ) );
artifactMetadata.setProject( getAsStringValue( columnSlice, "project" ) );
artifactMetadata.setProjectVersion( getAsStringValue( columnSlice, "projectVersion" ) );
artifactMetadata.setRepositoryId( repositoryName );
artifactMetadata.setRepositoryId( getStringValue( columnSlice, "repositoryName" ) );
artifactMetadata.setSha1( getAsStringValue( columnSlice, "sha1" ) );
artifactMetadata.setVersion( getAsStringValue( columnSlice, "version" ) );
Long whenGathered = getLongValue( columnSlice, "whenGathered" );
@ -1695,13 +1706,8 @@ public class CassandraMetadataRepository
{
artifactMetadata.setWhenGathered( new Date( whenGathered ) );
}
artifactMetadatas.add( artifactMetadata );
return artifactMetadata;
}
}
return artifactMetadatas;
}
protected void populateFacets( final ArtifactMetadata artifactMetadata )
{
@ -1760,55 +1766,61 @@ public class CassandraMetadataRepository
}
@Override
public List<ArtifactMetadata> getArtifactsByChecksum( final String repositoryId, final String checksum )
public Collection<ArtifactMetadata> getArtifactsByChecksum( final String repositoryId, final String checksum )
throws MetadataRepositoryException
{
/* final List<ArtifactMetadataModel> artifactMetadataModels = new ArrayList<ArtifactMetadataModel>();
Keyspace keyspace = cassandraArchivaManager.getKeyspace();
StringSerializer ss = StringSerializer.get();
if ( logger.isDebugEnabled() )
{
logger.debug( "all ArtifactMetadataModel: {}", getArtifactMetadataModelEntityManager().getAll() );
}
// cql cannot run or in queries so running twice the query
Map<String, ArtifactMetadata> artifactMetadataMap = new HashMap<String, ArtifactMetadata>();
// FIXME cql query
getArtifactMetadataModelEntityManager().visitAll( new Function<ArtifactMetadataModel, Boolean>()
RangeSlicesQuery<String, String, String> query = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
.setColumnFamily( cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //
.setColumnNames( "namespaceId", "size", "id", "fileLastModified", "md5", "project", "projectVersion",
"repositoryName", "version", "whenGathered", "sha1" ); //
query = query.addEqualsExpression( "sha1", checksum );
QueryResult<OrderedRows<String, String, String>> result = query.execute();
for ( Row<String, String, String> row : result.get() )
{
@Override
public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
{
if ( artifactMetadataModel != null )
{
if ( StringUtils.equals( artifactMetadataModel.getRepositoryId(), repositoryId )
&& artifactMetadataModel.getNamespace() != null &&
artifactMetadataModel.getProject() != null && artifactMetadataModel.getId() != null )
ColumnSlice<String, String> columnSlice = row.getColumnSlice();
String repositoryName = getStringValue( columnSlice, "repositoryName" );
if ( StringUtils.equals( repositoryName, repositoryId ) )
{
if ( StringUtils.equals( checksum, artifactMetadataModel.getMd5() ) || StringUtils.equals(
checksum, artifactMetadataModel.getSha1() ) )
artifactMetadataMap.put( row.getKey(), mapArtifactMetadataLongColumnSlice( columnSlice ) );
}
}
query = HFactory //
.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
.setColumnFamily( cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //
.setColumnNames( "namespaceId", "size", "id", "fileLastModified", "md5", "project", "projectVersion",
"repositoryName", "version", "whenGathered", "sha1" ); //
query = query.addEqualsExpression( "md5", checksum );
result = query.execute();
for ( Row<String, String, String> row : result.get() )
{
artifactMetadataModels.add( artifactMetadataModel );
}
}
}
return Boolean.TRUE;
}
} );
List<ArtifactMetadata> artifactMetadatas = new ArrayList<ArtifactMetadata>( artifactMetadataModels.size() );
for ( ArtifactMetadataModel model : artifactMetadataModels )
ColumnSlice<String, String> columnSlice = row.getColumnSlice();
String repositoryName = getStringValue( columnSlice, "repositoryName" );
if ( StringUtils.equals( repositoryName, repositoryId ) )
{
ArtifactMetadata artifactMetadata = getModelMapper().map( model, ArtifactMetadata.class );
populateFacets( artifactMetadata );
artifactMetadatas.add( artifactMetadata );
artifactMetadataMap.put( row.getKey(), mapArtifactMetadataLongColumnSlice( columnSlice ) );
}
}
logger.debug( "getArtifactsByChecksum repositoryId: {}, checksum: {}, artifactMetadatas: {}", repositoryId,
checksum, artifactMetadatas );
return artifactMetadatas;*/
return Collections.emptyList();
return artifactMetadataMap.values();
}
@Override
public void removeArtifact( final String repositoryId, final String namespace, final String project,
final String version, final String id )

13
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
View File

@ -288,6 +288,19 @@ public class DefaultCassandraArchivaManager
whenGatheredColumn.setValidationClass( ComparatorType.LONGTYPE.getClassName() );
artifactMetadataModel.addColumnDefinition( whenGatheredColumn );
BasicColumnDefinition sha1Column = new BasicColumnDefinition();
sha1Column.setName( StringSerializer.get().toByteBuffer( "sha1" ) );
sha1Column.setIndexName( "sha1" );
sha1Column.setIndexType( ColumnIndexType.KEYS );
sha1Column.setValidationClass( ComparatorType.UTF8TYPE.getClassName() );
artifactMetadataModel.addColumnDefinition( sha1Column );
BasicColumnDefinition md5Column = new BasicColumnDefinition();
md5Column.setName( StringSerializer.get().toByteBuffer( "md5" ) );
md5Column.setIndexName( "md5" );
md5Column.setIndexType( ColumnIndexType.KEYS );
md5Column.setValidationClass( ComparatorType.UTF8TYPE.getClassName() );
artifactMetadataModel.addColumnDefinition( md5Column );
}

3
archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
View File

@ -49,6 +49,7 @@ import javax.inject.Named;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@ -158,7 +159,7 @@ public class DuplicateArtifactsConsumer
MetadataRepository metadataRepository = repositorySession.getRepository();
List<ArtifactMetadata> results;
Collection<ArtifactMetadata> results;
try
{
results = metadataRepository.getArtifactsByChecksum( repoId, checksumSha1 );