You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/03/24 04:18:01 UTC
svn commit: r1580721 -
/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Author: olamy
Date: Mon Mar 24 03:18:00 2014
New Revision: 1580721
URL: http://svn.apache.org/r1580721
Log:
small optim as no need to continue querying here
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1580721&r1=1580720&r2=1580721&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java Mon Mar 24 03:18:00 2014
@@ -1847,9 +1847,6 @@ public class CassandraMetadataRepository
new ArtifactMetadataModel.KeyBuilder().withRepositoryId( repositoryId ).withNamespace( namespace ).withId(
id ).withProjectVersion( version ).withProject( project ).build();
-
- Keyspace keyspace = cassandraArchivaManager.getKeyspace();
-
this.artifactMetadataTemplate.deleteRow( key );
key =
@@ -1858,6 +1855,7 @@ public class CassandraMetadataRepository
this.projectVersionMetadataModelTemplate.deleteRow( key );
+
}
@Override
@@ -2019,9 +2017,14 @@ public class CassandraMetadataRepository
.addEqualsExpression( "projectVersion", projectVersion ) //
.execute();
+ if (result.get() == null || result.get().getCount() < 1)
+ {
+ return Collections.emptyList();
+ }
+
List<ArtifactMetadata> artifactMetadatas = new ArrayList<ArtifactMetadata>( result.get().getCount() );
- LongSerializer ls = LongSerializer.get();
+
for ( Row<String, String, String> row : result.get() )
{