fix facets add/update

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1580687 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 212 insertions, 105 deletions

diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
index 6eff50569..7bf6a362d 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
@@ -19,6 +19,8 @@ package org.apache.archiva.metadata.repository.cassandra;
  * under the License.
  */
 
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
 import me.prettyprint.cassandra.serializers.LongSerializer;
 import me.prettyprint.cassandra.serializers.StringSerializer;
 import me.prettyprint.cassandra.service.template.ColumnFamilyResult;
@@ -65,6 +67,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -1125,39 +1128,17 @@ public class CassandraMetadataRepository
             String cf = this.cassandraArchivaManager.getArtifactMetadataModelFamilyName();
             // create
             this.artifactMetadataTemplate.createMutator() //
-                .addInsertion( key, //
-                               cf, //
-                               column( "id", artifactMeta.getId() ) )//
-                .addInsertion( key, //
-                               cf, //
-                               column( "repositoryName", repositoryId ) ) //
-                .addInsertion( key, //
-                               cf, //
-                               column( "namespaceId", namespaceId ) ) //
-                .addInsertion( key, //
-                               cf, //
-                               column( "project", artifactMeta.getProject() ) ) //
-                .addInsertion( key, //
-                               cf, //
-                               column( "projectVersion", artifactMeta.getProjectVersion() ) ) //
-                .addInsertion( key, //
-                               cf, //
-                               column( "version", artifactMeta.getVersion() ) ) //
-                .addInsertion( key, //
-                               cf, //
-                               column( "fileLastModified", artifactMeta.getFileLastModified().getTime() ) ) //
-                .addInsertion( key, //
-                               cf, //
-                               column( "size", artifactMeta.getSize() ) ) //
-                .addInsertion( key, //
-                               cf, //
-                               column( "md5", artifactMeta.getMd5() ) ) //
-                .addInsertion( key, //
-                               cf, //
-                               column( "sha1", artifactMeta.getSha1() ) ) //
-                .addInsertion( key, //
-                               cf, //
-                               column( "whenGathered", artifactMeta.getWhenGathered().getTime() ) )//
+                .addInsertion( key, cf, column( "id", artifactMeta.getId() ) )//
+                .addInsertion( key, cf, column( "repositoryName", repositoryId ) ) //
+                .addInsertion( key, cf, column( "namespaceId", namespaceId ) ) //
+                .addInsertion( key, cf, column( "project", artifactMeta.getProject() ) ) //
+                .addInsertion( key, cf, column( "projectVersion", artifactMeta.getProjectVersion() ) ) //
+                .addInsertion( key, cf, column( "version", artifactMeta.getVersion() ) ) //
+                .addInsertion( key, cf, column( "fileLastModified", artifactMeta.getFileLastModified().getTime() ) ) //
+                .addInsertion( key, cf, column( "size", artifactMeta.getSize() ) ) //
+                .addInsertion( key, cf, column( "md5", artifactMeta.getMd5() ) ) //
+                .addInsertion( key, cf, column( "sha1", artifactMeta.getSha1() ) ) //
+                .addInsertion( key, cf, column( "whenGathered", artifactMeta.getWhenGathered().getTime() ) )//
                 .execute();
         }
 
@@ -1184,8 +1165,43 @@ public class CassandraMetadataRepository
 
         }
 
+        key = new ArtifactMetadataModel.KeyBuilder().withNamespace( namespace ).withProject( projectId ).withId(
+            artifactMeta.getId() ).withProjectVersion( projectVersion ).build();
         ArtifactMetadataModel artifactMetadataModel = new ArtifactMetadataModel();
-        // FIXME
+
+        exists = this.artifactMetadataTemplate.isColumnsExist( key );
+
+        if ( exists )
+        {
+            // updater
+            ColumnFamilyUpdater<String, String> updater = this.artifactMetadataTemplate.createUpdater( key );
+            updater.setLong( "fileLastModified", artifactMeta.getFileLastModified().getTime() );
+            updater.setLong( "whenGathered", artifactMeta.getWhenGathered().getTime() );
+            updater.setLong( "size", artifactMeta.getSize() );
+            updater.setString( "md5", artifactMeta.getMd5() );
+            updater.setString( "sha1", artifactMeta.getSha1() );
+            updater.setString( "version", artifactMeta.getVersion() );
+            this.artifactMetadataTemplate.update( updater );
+        }
+        else
+        {
+            String cf = this.cassandraArchivaManager.getArtifactMetadataModelFamilyName();
+            // create
+            this.artifactMetadataTemplate.createMutator() //
+                .addInsertion( key, cf, column( "id", artifactMeta.getId() ) )//
+                .addInsertion( key, cf, column( "repositoryName", repositoryId ) ) //
+                .addInsertion( key, cf, column( "namespaceId", namespaceId ) ) //
+                .addInsertion( key, cf, column( "project", artifactMeta.getProject() ) ) //
+                .addInsertion( key, cf, column( "projectVersion", artifactMeta.getProjectVersion() ) ) //
+                .addInsertion( key, cf, column( "version", artifactMeta.getVersion() ) ) //
+                .addInsertion( key, cf, column( "fileLastModified", artifactMeta.getFileLastModified().getTime() ) ) //
+                .addInsertion( key, cf, column( "size", artifactMeta.getSize() ) ) //
+                .addInsertion( key, cf, column( "md5", artifactMeta.getMd5() ) ) //
+                .addInsertion( key, cf, column( "sha1", artifactMeta.getSha1() ) ) //
+                .addInsertion( key, cf, column( "whenGathered", artifactMeta.getWhenGathered().getTime() ) )//
+                .execute();
+        }
+
         /*artifactMetadataModel.setArtifactMetadataModelId(
             new ArtifactMetadataModel.KeyBuilder().withId( versionMetadata.getId() ).withRepositoryId(
                 repositoryId ).withNamespace( namespaceId ).withProjectVersion(
@@ -1196,6 +1212,12 @@ public class CassandraMetadataRepository
         artifactMetadataModel.setProject( projectId );
         artifactMetadataModel.setProjectVersion( artifactMeta.getVersion() );
         artifactMetadataModel.setVersion( artifactMeta.getVersion() );
+        artifactMetadataModel.setFileLastModified( artifactMeta.getFileLastModified() == null
+                                                       ? new Date().getTime()
+                                                       : artifactMeta.getFileLastModified().getTime() );
+
+        //
+
         // now facets
         updateFacets( artifactMeta, artifactMetadataModel );
 
@@ -1344,7 +1366,55 @@ public class CassandraMetadataRepository
     private void updateFacets( final FacetedMetadata facetedMetadata,
                                final ArtifactMetadataModel artifactMetadataModel )
     {
+        Keyspace keyspace = cassandraArchivaManager.getKeyspace();
+        StringSerializer ss = StringSerializer.get();
+        String cf = cassandraArchivaManager.getMetadataFacetModelFamilyName();
+
+        for ( final String facetId : metadataFacetFactories.keySet() )
+        {
+            MetadataFacet metadataFacet = facetedMetadata.getFacet( facetId );
+            if ( metadataFacet == null )
+            {
+                continue;
+            }
+            // clean first
+
+            QueryResult<OrderedRows<String, String, String>> result =
+                HFactory.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
+                    .setColumnFamily( cf ) //
+                    .setColumnNames( "repositoryName" ) //
+                    .addEqualsExpression( "repositoryName", artifactMetadataModel.getRepositoryId() ) //
+                    .addEqualsExpression( "namespaceId", artifactMetadataModel.getNamespace() ) //
+                    .addEqualsExpression( "projectId", artifactMetadataModel.getProject() ) //
+                    .addEqualsExpression( "projectVersion",
+                                          artifactMetadataModel.getProjectVersion() ).addEqualsExpression( "facetId",
+                                                                                                           facetId ) //
+                    .execute();
+
+            for ( Row<String, String, String> row : result.get().getList() )
+            {
+                this.metadataFacetTemplate.deleteRow( row.getKey() );
+            }
 
+            Map<String, String> properties = metadataFacet.toProperties();
+
+            for ( Map.Entry<String, String> entry : properties.entrySet() )
+            {
+                String key = new MetadataFacetModel.KeyBuilder().withKey( entry.getKey() ).withArtifactMetadataModel(
+                    artifactMetadataModel ).withFacetId( facetId ).withName( metadataFacet.getName() ).build();
+                metadataFacetTemplate.createMutator() //
+                    .addInsertion( key, cf, column( "repositoryName", artifactMetadataModel.getRepositoryId() ) ) //
+                    .addInsertion( key, cf, column( "namespaceId", artifactMetadataModel.getNamespace() ) ) //
+                    .addInsertion( key, cf, column( "projectId", artifactMetadataModel.getProject() ) ) //
+                    .addInsertion( key, cf, column( "projectVersion", artifactMetadataModel.getProjectVersion() ) ) //
+                    .addInsertion( key, cf, column( "facetId", facetId ) ) //
+                    .addInsertion( key, cf, column( "key", entry.getKey() ) ) //
+                    .addInsertion( key, cf, column( "value", entry.getValue() ) ) //
+                    .addInsertion( key, cf, column( "name", metadataFacet.getName() ) ) //
+                    .execute();
+            }
+
+        }
 /*        for ( final String facetId : metadataFacetFactories.keySet() )
         {
             MetadataFacet metadataFacet = facetedMetadata.getFacet( facetId );
@@ -1695,6 +1765,7 @@ public class CassandraMetadataRepository
         return artifactMetadatas;
     }
 
+
     protected void populateFacets( final ArtifactMetadata artifactMetadata )
     {
 /*        final List<MetadataFacetModel> metadataFacetModels = new ArrayList<MetadataFacetModel>();
@@ -1975,60 +2046,82 @@ public class CassandraMetadataRepository
                                                       final String projectId, final String projectVersion )
         throws MetadataResolutionException
     {
-        final List<ArtifactMetadataModel> artifactMetadataModels = new ArrayList<ArtifactMetadataModel>();
-        /*
-        // FIXME use cql query !
-        getArtifactMetadataModelEntityManager().visitAll( new Function<ArtifactMetadataModel, Boolean>()
-        {
-            @Override
-            public Boolean apply( ArtifactMetadataModel artifactMetadataModel )
-            {
-                if ( artifactMetadataModel != null )
-                {
-                    if ( StringUtils.equals( repoId, artifactMetadataModel.getRepositoryId() ) && StringUtils.equals(
-                        namespace, artifactMetadataModel.getNamespace() ) && StringUtils.equals( projectId,
-                                                                                                 artifactMetadataModel.getProject() )
-                        && StringUtils.equals( projectVersion, artifactMetadataModel.getProjectVersion() ) )
-                    {
-                        artifactMetadataModels.add( artifactMetadataModel );
-                    }
-                }
 
-                return Boolean.TRUE;
-            }
-        } );
-        */
-        List<ArtifactMetadata> artifactMetadatas = new ArrayList<ArtifactMetadata>( artifactMetadataModels.size() );
-        /*
-        for ( ArtifactMetadataModel model : artifactMetadataModels )
+        Keyspace keyspace = cassandraArchivaManager.getKeyspace();
+
+        StringSerializer ss = StringSerializer.get();
+
+        QueryResult<OrderedRows<String, String, String>> result =
+            HFactory.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
+                .setColumnFamily( cassandraArchivaManager.getArtifactMetadataModelFamilyName() ) //
+                .setColumnNames( "id", "repositoryName", "namespaceId", "project", "projectVersion", "version",
+                                 "fileLastModified", "size", "md5", "sha1", "whenGathered" )//
+                .setRowCount( Integer.MAX_VALUE ) //
+                .addEqualsExpression( "repositoryName", repoId ) //
+                .addEqualsExpression( "namespaceId", namespace ) //
+                .addEqualsExpression( "project", projectId ) //
+                .addEqualsExpression( "projectVersion", projectVersion ) //
+                .execute();
+
+        List<ArtifactMetadata> artifactMetadatas = new ArrayList<ArtifactMetadata>( result.get().getCount() );
+
+        LongSerializer ls = LongSerializer.get();
+
+        for ( Row<String, String, String> row : result.get() )
         {
-            ArtifactMetadata artifactMetadata = getModelMapper().map( model, ArtifactMetadata.class );
-            populateFacets( artifactMetadata );
+            ColumnSlice<String, String> columnSlice = row.getColumnSlice();
+            ArtifactMetadata artifactMetadata = new ArtifactMetadata();
+            artifactMetadata.setNamespace(
+                ss.fromByteBuffer( columnSlice.getColumnByName( "namespaceId" ).getValueBytes() ) );
+            artifactMetadata.setSize( ls.fromByteBuffer( columnSlice.getColumnByName( "size" ).getValueBytes() ) );
+            artifactMetadata.setId( ss.fromByteBuffer( columnSlice.getColumnByName( "id" ).getValueBytes() ) );
+            artifactMetadata.setFileLastModified(
+                ls.fromByteBuffer( columnSlice.getColumnByName( "fileLastModified" ).getValueBytes() ) );
+            artifactMetadata.setMd5( ss.fromByteBuffer( columnSlice.getColumnByName( "md5" ).getValueBytes() ) );
+            artifactMetadata.setProject(
+                ss.fromByteBuffer( columnSlice.getColumnByName( "project" ).getValueBytes() ) );
+            artifactMetadata.setProjectVersion(
+                ss.fromByteBuffer( columnSlice.getColumnByName( "projectVersion" ).getValueBytes() ) );
+            artifactMetadata.setRepositoryId( repoId );
+            artifactMetadata.setSha1( ss.fromByteBuffer( columnSlice.getColumnByName( "sha1" ).getValueBytes() ) );
+            artifactMetadata.setVersion(
+                ss.fromByteBuffer( columnSlice.getColumnByName( "version" ).getValueBytes() ) );
+            artifactMetadata.setWhenGathered(
+                new Date( ls.fromByteBuffer( columnSlice.getColumnByName( "whenGathered" ).getValueBytes() ) ) );
             artifactMetadatas.add( artifactMetadata );
         }
 
-        // retrieve facets
-        final List<MetadataFacetModel> metadataFacetModels = new ArrayList<MetadataFacetModel>();
-        getMetadataFacetModelEntityManager().visitAll( new Function<MetadataFacetModel, Boolean>()
+        result = HFactory.createRangeSlicesQuery( keyspace, ss, ss, ss ) //
+            .setColumnFamily( cassandraArchivaManager.getMetadataFacetModelFamilyName() ) //
+            .setColumnNames( "facetId", "name", "value", "key", "projectVersion" ) //
+            .setRowCount( Integer.MAX_VALUE ) //
+            .addEqualsExpression( "repositoryName", repoId ) //
+            .addEqualsExpression( "namespaceId", namespace ) //
+            .addEqualsExpression( "projectId", projectId ) //
+            .addEqualsExpression( "projectVersion", projectVersion ) //
+            .execute();
+
+        if ( result.get() == null || result.get().getCount() < 1 )
         {
-            @Override
-            public Boolean apply( MetadataFacetModel metadataFacetModel )
-            {
-                if ( metadataFacetModel != null )
-                {
-                    if ( StringUtils.equals( repoId, metadataFacetModel.getArtifactMetadataModel().getRepositoryId() )
-                        && StringUtils.equals( namespace, metadataFacetModel.getArtifactMetadataModel().getNamespace() )
-                        && StringUtils.equals( projectId, metadataFacetModel.getArtifactMetadataModel().getProject() )
-                        && StringUtils.equals( projectVersion,
-                                               metadataFacetModel.getArtifactMetadataModel().getProjectVersion() ) )
-                    {
-                        metadataFacetModels.add( metadataFacetModel );
-                    }
+            return artifactMetadatas;
+        }
 
-                }
-                return Boolean.TRUE;
-            }
-        } );
+        final List<MetadataFacetModel> metadataFacetModels =
+            new ArrayList<MetadataFacetModel>( result.get().getCount() );
+
+        for ( Row<String, String, String> row : result.get() )
+        {
+            ColumnSlice<String, String> columnSlice = row.getColumnSlice();
+            MetadataFacetModel metadataFacetModel = new MetadataFacetModel();
+            metadataFacetModel.setFacetId(
+                ss.fromByteBuffer( columnSlice.getColumnByName( "facetId" ).getValueBytes() ) );
+            metadataFacetModel.setName( ss.fromByteBuffer( columnSlice.getColumnByName( "name" ).getValueBytes() ) );
+            metadataFacetModel.setValue( ss.fromByteBuffer( columnSlice.getColumnByName( "value" ).getValueBytes() ) );
+            metadataFacetModel.setKey( ss.fromByteBuffer( columnSlice.getColumnByName( "key" ).getValueBytes() ) );
+            metadataFacetModel.setProjectVersion(
+                ss.fromByteBuffer( columnSlice.getColumnByName( "projectVersion" ).getValueBytes() ) );
+            metadataFacetModels.add( metadataFacetModel );
+        }
 
         // rebuild MetadataFacet for artifacts
 
@@ -2043,7 +2136,7 @@ public class CassandraMetadataRepository
                         if ( metadataFacetModel != null )
                         {
                             return StringUtils.equals( artifactMetadata.getVersion(),
-                                                       metadataFacetModel.getArtifactMetadataModel().getVersion() );
+                                                       metadataFacetModel.getProjectVersion() );
                         }
                         return false;
                     }
@@ -2087,7 +2180,7 @@ public class CassandraMetadataRepository
 
 
         }
-        */
+
         return artifactMetadatas;
     }
 
diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
index fd9c1c686..c993284d2 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
@@ -302,13 +302,6 @@ public class DefaultCassandraArchivaManager
 
             // creating indexes for cql query
 
-            BasicColumnDefinition artifactMetadataModelColumn = new BasicColumnDefinition();
-            artifactMetadataModelColumn.setName( StringSerializer.get().toByteBuffer( "artifactMetadataModel" ) );
-            artifactMetadataModelColumn.setIndexName( "artifactMetadataModel" );
-            artifactMetadataModelColumn.setIndexType( ColumnIndexType.KEYS );
-            artifactMetadataModelColumn.setValidationClass( ComparatorType.UTF8TYPE.getClassName() );
-            metadataFacetModel.addColumnDefinition( artifactMetadataModelColumn );
-
             BasicColumnDefinition facetIdColumn = new BasicColumnDefinition();
             facetIdColumn.setName( StringSerializer.get().toByteBuffer( "facetId" ) );
             facetIdColumn.setIndexName( "facetId" );
@@ -330,6 +323,27 @@ public class DefaultCassandraArchivaManager
             nameColumn.setValidationClass( ComparatorType.UTF8TYPE.getClassName() );
             metadataFacetModel.addColumnDefinition( nameColumn );
 
+            BasicColumnDefinition namespaceColumn = new BasicColumnDefinition();
+            namespaceColumn.setName( StringSerializer.get().toByteBuffer( "namespaceId" ) );
+            namespaceColumn.setIndexName( "namespaceId" );
+            namespaceColumn.setIndexType( ColumnIndexType.KEYS );
+            namespaceColumn.setValidationClass( ComparatorType.UTF8TYPE.getClassName() );
+            metadataFacetModel.addColumnDefinition( namespaceColumn );
+
+            BasicColumnDefinition projectIdColumn = new BasicColumnDefinition();
+            projectIdColumn.setName( StringSerializer.get().toByteBuffer( "projectId" ) );
+            projectIdColumn.setIndexName( "projectId" );
+            projectIdColumn.setIndexType( ColumnIndexType.KEYS );
+            projectIdColumn.setValidationClass( ComparatorType.UTF8TYPE.getClassName() );
+            metadataFacetModel.addColumnDefinition( projectIdColumn );
+
+            BasicColumnDefinition projectVersionColumn = new BasicColumnDefinition();
+            projectVersionColumn.setName( StringSerializer.get().toByteBuffer( "projectVersion" ) );
+            projectVersionColumn.setIndexName( "projectVersion" );
+            projectVersionColumn.setIndexType( ColumnIndexType.KEYS );
+            projectVersionColumn.setValidationClass( ComparatorType.UTF8TYPE.getClassName() );
+            metadataFacetModel.addColumnDefinition( projectVersionColumn );
+
         }
 
 
diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/MetadataFacetModel.java b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/MetadataFacetModel.java
index 7f7fc5903..3346e8ecd 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/MetadataFacetModel.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/MetadataFacetModel.java
@@ -33,8 +33,8 @@ public class MetadataFacetModel
 {
     // id is repositoryId + namespaceId + projectId + facetId + name + mapKey
 
-    @Column(name = "artifactMetadataModel")
-    private ArtifactMetadataModel artifactMetadataModel;
+    //@Column(name = "artifactMetadataModel")
+    //private ArtifactMetadataModel artifactMetadataModel;
 
     @Column(name = "facetId")
     private String facetId;
@@ -48,19 +48,20 @@ public class MetadataFacetModel
     @Column(name = "value")
     private String value;
 
+    private String projectVersion;
+
     public MetadataFacetModel()
     {
         // no op
     }
 
-    public MetadataFacetModel( ArtifactMetadataModel artifactMetadataModel, String facetId, String key, String value,
-                               String name )
+    public MetadataFacetModel( String facetId, String key, String value, String name, String projectVersion )
     {
-        this.artifactMetadataModel = artifactMetadataModel;
         this.key = key;
         this.value = value;
         this.name = name;
         this.facetId = facetId;
+        this.projectVersion = projectVersion;
     }
 
     public String getFacetId()
@@ -73,15 +74,6 @@ public class MetadataFacetModel
         this.facetId = facetId;
     }
 
-    public ArtifactMetadataModel getArtifactMetadataModel()
-    {
-        return artifactMetadataModel;
-    }
-
-    public void setArtifactMetadataModel( ArtifactMetadataModel artifactMetadataModel )
-    {
-        this.artifactMetadataModel = artifactMetadataModel;
-    }
 
     public String getName()
     {
@@ -113,12 +105,20 @@ public class MetadataFacetModel
         this.value = value;
     }
 
+    public String getProjectVersion()
+    {
+        return projectVersion;
+    }
+
+    public void setProjectVersion( String projectVersion )
+    {
+        this.projectVersion = projectVersion;
+    }
 
     @Override
     public String toString()
     {
         final StringBuilder sb = new StringBuilder( "MetadataFacetModel{" );
-        sb.append( ", artifactMetadataModel=" ).append( artifactMetadataModel );
         sb.append( ", key='" ).append( key ).append( '\'' );
         sb.append( ", value='" ).append( value ).append( '\'' );
         sb.append( '}' );