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 2013/11/18 06:48:39 UTC
svn commit: r1542902 -
/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/
Author: olamy
Date: Mon Nov 18 05:48:39 2013
New Revision: 1542902
URL: http://svn.apache.org/r1542902
Log:
use a better name for this class
Added:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/DeflateStringSerializer.java (contents, props changed)
- copied, changed from r1542900, archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/HugeStringSerializer.java
Removed:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/HugeStringSerializer.java
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/MetadataFacetModel.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Repository.java
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java?rev=1542902&r1=1542901&r2=1542902&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java Mon Nov 18 05:48:39 2013
@@ -41,31 +41,31 @@ public class ArtifactMetadataModel
// repositoryId + namespaceId + project + projectVersion + id
@Id
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String artifactMetadataModelId;
@Column( name = "id" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String id;
@Column( name = "repositoryId" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String repositoryId;
@Column( name = "namespace" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String namespace;
@Column( name = "project" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String project;
@Column( name = "projectVersion" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String projectVersion;
@Column( name = "version" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String version;
@Column( name = "fileLastModified" )
@@ -77,11 +77,11 @@ public class ArtifactMetadataModel
private long size;
@Column( name = "md5" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String md5;
@Column( name = "sha1" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String sha1;
@Column( name = "whenGathered" )
Copied: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/DeflateStringSerializer.java (from r1542900, archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/HugeStringSerializer.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/DeflateStringSerializer.java?p2=archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/DeflateStringSerializer.java&p1=archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/HugeStringSerializer.java&r1=1542900&r2=1542902&rev=1542902&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/HugeStringSerializer.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/DeflateStringSerializer.java Mon Nov 18 05:48:39 2013
@@ -22,7 +22,6 @@ package org.apache.archiva.metadata.repo
import com.netflix.astyanax.serializers.AbstractSerializer;
import com.netflix.astyanax.serializers.ComparatorType;
-import org.apache.cassandra.db.marshal.UTF8Type;
import org.apache.commons.codec.binary.StringUtils;
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
@@ -34,16 +33,16 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.util.zip.Deflater;
-import java.util.zip.DeflaterInputStream;
import java.util.zip.DeflaterOutputStream;
import java.util.zip.InflaterInputStream;
/**
- * For Huge String we use a compression
+ * For Huge String we use a deflate compression
* @author Olivier Lamy
+ * @since 2.0.0
*/
-public class HugeStringSerializer
+public class DeflateStringSerializer
extends AbstractSerializer<String>
{
@@ -51,11 +50,11 @@ public class HugeStringSerializer
private static final String UTF_8 = "UTF-8";
- private static final HugeStringSerializer instance = new HugeStringSerializer();
+ private static final DeflateStringSerializer instance = new DeflateStringSerializer();
private static final Charset charset = Charset.forName( UTF_8 );
- public static HugeStringSerializer get()
+ public static DeflateStringSerializer get()
{
return instance;
}
@@ -147,45 +146,4 @@ public class HugeStringSerializer
return instance.getString( byteBuffer );
}
- /*
- private static final String UTF_8 = "UTF-8";
- private static final HugeStringSerializer instance = new HugeStringSerializer();
- private static final Charset charset = Charset.forName(UTF_8);
-
- public static HugeStringSerializer get() {
- return instance;
- }
-
- @Override
- public ByteBuffer toByteBuffer(String obj) {
- if (obj == null) {
- return null;
- }
- return ByteBuffer.wrap(obj.getBytes(charset));
- }
-
- @Override
- public String fromByteBuffer(ByteBuffer byteBuffer) {
- if (byteBuffer == null) {
- return null;
- }
- final ByteBuffer dup = byteBuffer.duplicate();
- return charset.decode(dup).toString();
- }
-
- @Override
- public ComparatorType getComparatorType() {
- return ComparatorType.UTF8TYPE;
- }
-
- @Override
- public ByteBuffer fromString(String str) {
- return UTF8Type.instance.fromString(str);
- }
-
- @Override
- public String getString(ByteBuffer byteBuffer) {
- return UTF8Type.instance.getString(byteBuffer);
- }
- */
}
Propchange: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/DeflateStringSerializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/DeflateStringSerializer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/MetadataFacetModel.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/MetadataFacetModel.java?rev=1542902&r1=1542901&r2=1542902&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/MetadataFacetModel.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/MetadataFacetModel.java Mon Nov 18 05:48:39 2013
@@ -20,7 +20,6 @@ package org.apache.archiva.metadata.repo
*/
import com.netflix.astyanax.entitystore.Serializer;
-import com.netflix.astyanax.serializers.GzipStringSerializer;
import org.apache.archiva.metadata.repository.cassandra.CassandraUtils;
import javax.persistence.Column;
@@ -38,26 +37,26 @@ public class MetadataFacetModel
// id is repositoryId + namespaceId + projectId + facetId + name + mapKey
@Id
@Column( name = "id" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String id;
@Column( name = "artifactMetadataModel" )
private ArtifactMetadataModel artifactMetadataModel;
@Column( name = "facetId" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String facetId;
@Column( name = "key" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String key;
@Column( name = "name" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String name;
@Column( name = "value" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String value;
public MetadataFacetModel()
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java?rev=1542902&r1=1542901&r2=1542902&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java Mon Nov 18 05:48:39 2013
@@ -39,11 +39,11 @@ public class Namespace
@Id
@Column( name = "id" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String id;
@Column( name = "name" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String name;
@Column( name = "repository" )
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.java?rev=1542902&r1=1542901&r2=1542902&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.java Mon Nov 18 05:48:39 2013
@@ -36,11 +36,11 @@ public class Project
{
@Id
@Column( name = "projectKey" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String projectKey;
@Column( name = "projectId" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String projectId;
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java?rev=1542902&r1=1542901&r2=1542902&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java Mon Nov 18 05:48:39 2013
@@ -43,7 +43,7 @@ public class ProjectVersionMetadataModel
{
// repositoryId + namespace + projectId + id (version)
@Id
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String rowId;
@Column( name = "namespace" )
@@ -53,23 +53,23 @@ public class ProjectVersionMetadataModel
* id is the version
*/
@Column( name = "id" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String id;
@Column( name = "projectId" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String projectId;
@Column( name = "url" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String url;
@Column( name = "name" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String name;
@Column( name = "description" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String description;
@Column( name = "organization" )
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Repository.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Repository.java?rev=1542902&r1=1542901&r2=1542902&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Repository.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Repository.java Mon Nov 18 05:48:39 2013
@@ -26,8 +26,6 @@ import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
/**
@@ -41,11 +39,11 @@ public class Repository
@Id
@Column( name = "id" )
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String id;
@Column(name = "name")
- @Serializer( HugeStringSerializer.class )
+ @Serializer( DeflateStringSerializer.class )
private String name;
//private transient List<Namespace> namespaces = new ArrayList<Namespace>();