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/11/01 00:11:27 UTC
[1/2] git commit: 1.7 diamond
Repository: archiva
Updated Branches:
refs/heads/master 7c5f1a0ac -> ae9b10930
1.7 diamond
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/fc29009d
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/fc29009d
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/fc29009d
Branch: refs/heads/master
Commit: fc29009d8ef6b083f69fa025f734b56f8473acdc
Parents: 7c5f1a0
Author: Olivier Lamy <ol...@apache.org>
Authored: Sat Nov 1 10:09:59 2014 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Nov 1 10:09:59 2014 +1100
----------------------------------------------------------------------
.../cassandra/CassandraMetadataRepository.java | 84 ++++++++++----------
1 file changed, 40 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/fc29009d/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
----------------------------------------------------------------------
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 ce28c48..d102cfe 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
@@ -125,50 +125,45 @@ public class CassandraMetadataRepository
this.keyspace = cassandraArchivaManager.getKeyspace();
this.projectVersionMetadataTemplate =
- new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
- cassandraArchivaManager.getProjectVersionMetadataFamilyName(),
- StringSerializer.get(), //
- StringSerializer.get() );
-
- this.projectTemplate = new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
- cassandraArchivaManager.getProjectFamilyName(),
- //
- StringSerializer.get(), //
- StringSerializer.get() );
-
- this.artifactMetadataTemplate =
- new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
- cassandraArchivaManager.getArtifactMetadataFamilyName(),
- //
- StringSerializer.get(), //
- StringSerializer.get() );
-
- this.metadataFacetTemplate =
- new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
- cassandraArchivaManager.getMetadataFacetFamilyName(),
- //
- StringSerializer.get(), //
- StringSerializer.get() );
-
- this.mailingListTemplate =
- new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
- cassandraArchivaManager.getMailingListFamilyName(),
- //
- StringSerializer.get(), //
- StringSerializer.get() );
-
- this.licenseTemplate = new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
- cassandraArchivaManager.getLicenseFamilyName(),
- //
- StringSerializer.get(), //
- StringSerializer.get() );
-
- this.dependencyTemplate =
- new ThriftColumnFamilyTemplate<String, String>( cassandraArchivaManager.getKeyspace(), //
- cassandraArchivaManager.getDependencyFamilyName(),
- //
- StringSerializer.get(), //
- StringSerializer.get() );
+ new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+ cassandraArchivaManager.getProjectVersionMetadataFamilyName(), //
+ StringSerializer.get(), //
+ StringSerializer.get() );
+
+ this.projectTemplate = new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+ cassandraArchivaManager.getProjectFamilyName(), //
+ //
+ StringSerializer.get(), //
+ StringSerializer.get() );
+
+ this.artifactMetadataTemplate = new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+ cassandraArchivaManager.getArtifactMetadataFamilyName(),
+ StringSerializer.get(), //
+ StringSerializer.get() );
+
+ this.metadataFacetTemplate = new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+ cassandraArchivaManager.getMetadataFacetFamilyName(),
+ //
+ StringSerializer.get(), //
+ StringSerializer.get() );
+
+ this.mailingListTemplate = new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+ cassandraArchivaManager.getMailingListFamilyName(),
+ //
+ StringSerializer.get(), //
+ StringSerializer.get() );
+
+ this.licenseTemplate = new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+ cassandraArchivaManager.getLicenseFamilyName(),
+ //
+ StringSerializer.get(), //
+ StringSerializer.get() );
+
+ this.dependencyTemplate = new ThriftColumnFamilyTemplate<>( cassandraArchivaManager.getKeyspace(), //
+ cassandraArchivaManager.getDependencyFamilyName(),
+ //
+ StringSerializer.get(), //
+ StringSerializer.get() );
}
@@ -202,6 +197,7 @@ public class CassandraMetadataRepository
.addInsertion( repositoryId, cf,
CassandraUtils.column( "repositoryName", repository.getName() ) ) //
.execute();
+ logger.debug( "time to insert repository: {}", mutationResult.getExecutionTimeMicro() );
return repository;
}
catch ( HInvalidRequestException e )
[2/2] git commit: upgrade cassandra to 2.0.9
Posted by ol...@apache.org.
upgrade cassandra to 2.0.9
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/ae9b1093
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/ae9b1093
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/ae9b1093
Branch: refs/heads/master
Commit: ae9b10930639f230ebbc017d0a78d7e95b5a42ae
Parents: fc29009
Author: Olivier Lamy <ol...@apache.org>
Authored: Sat Nov 1 10:11:17 2014 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Nov 1 10:11:17 2014 +1100
----------------------------------------------------------------------
archiva-modules/plugins/metadata-store-cassandra/pom.xml | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/ae9b1093/archiva-modules/plugins/metadata-store-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
index c786ba1..6a8072c 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
@@ -31,14 +31,8 @@
<properties>
- <cassandraVersion>1.2.11</cassandraVersion>
- <!--
- 2.x has 1.7 required
- <cassandraVersion>2.0.2</cassandraVersion>
- -->
- <!--
- <astyanax.version>1.56.48</astyanax.version>
- -->
+ <cassandraVersion>2.0.9</cassandraVersion>
+
</properties>
<dependencies>