You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/03/03 00:02:29 UTC
svn commit: r1573399 - in /incubator/sirona/trunk:
agent/store/cube/src/main/java/org/apache/sirona/cube/ server/collector/
server/store/cassandra/src/main/java/org/apache/sirona/cassandra/pathtracking/
Author: olamy
Date: Sun Mar 2 23:02:28 2014
New Revision: 1573399
URL: http://svn.apache.org/r1573399
Log:
using compression must be configurable and off per default
Modified:
incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java
incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java
incubator/sirona/trunk/server/collector/pom.xml
incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/pathtracking/CassandraPathTrackingDataStore.java
Modified: incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java?rev=1573399&r1=1573398&r2=1573399&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java (original)
+++ incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/Cube.java Sun Mar 2 23:02:28 2014
@@ -146,11 +146,16 @@ public class Cube {
connection.setRequestProperty("Authorization", auth);
}
- byte[] bytes = gzipCompression( payload.getBytes() );
+
+ boolean useCompression = config.isUseCompression();
+
+ byte[] bytes = useCompression ? gzipCompression( payload.getBytes() ) : payload.getBytes();
connection.setRequestMethod(POST);
connection.setRequestProperty(CONTENT_TYPE, APPLICATION_JSON);
- connection.setRequestProperty( CONTENT_ENCODING, GZIP_CONTENT_ENCODING );
+ if (useCompression) {
+ connection.setRequestProperty( CONTENT_ENCODING, GZIP_CONTENT_ENCODING );
+ }
connection.setRequestProperty(CONTENT_LENGTH, Long.toString(bytes.length));
connection.setUseCaches(false);
connection.setDoInput(true);
Modified: incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java?rev=1573399&r1=1573398&r2=1573399&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java (original)
+++ incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java Sun Mar 2 23:02:28 2014
@@ -48,6 +48,7 @@ public class CubeBuilder {
private String sslKeyStorePassword;
private String sslKeyStoreProvider;
private String basicHeader; // user:pwd
+ private boolean useCompression = false;
public synchronized Cube build() {
if (marker == null) {
@@ -99,6 +100,16 @@ public class CubeBuilder {
return basicHeader;
}
+ public boolean isUseCompression()
+ {
+ return useCompression;
+ }
+
+ public void setUseCompression( boolean useCompression )
+ {
+ this.useCompression = useCompression;
+ }
+
private TrustManager[] createTrustManager() {
if (sslTrustStore == null) {
return null;
Modified: incubator/sirona/trunk/server/collector/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/collector/pom.xml?rev=1573399&r1=1573398&r2=1573399&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/pom.xml (original)
+++ incubator/sirona/trunk/server/collector/pom.xml Sun Mar 2 23:02:28 2014
@@ -74,6 +74,12 @@
<groupId>com.jcraft</groupId>
<artifactId>jzlib</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.sirona</groupId>
+ <artifactId>sirona-cassandra</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -102,22 +108,11 @@
<configuration>
<port>${tomcatRunPort}</port>
<path>${tomcatRunPath}</path>
+ <useTestClasspath>true</useTestClasspath>
<systemProperties>
<org.apache.sirona.configuration.sirona.properties>${basedir}/src/test/sirona.properties</org.apache.sirona.configuration.sirona.properties>
</systemProperties>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.sirona</groupId>
- <artifactId>sirona-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sirona</groupId>
- <artifactId>sirona-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
<pluginManagement>
Modified: incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/pathtracking/CassandraPathTrackingDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/pathtracking/CassandraPathTrackingDataStore.java?rev=1573399&r1=1573398&r2=1573399&view=diff
==============================================================================
--- incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/pathtracking/CassandraPathTrackingDataStore.java (original)
+++ incubator/sirona/trunk/server/store/cassandra/src/main/java/org/apache/sirona/cassandra/pathtracking/CassandraPathTrackingDataStore.java Sun Mar 2 23:02:28 2014
@@ -25,7 +25,6 @@ import me.prettyprint.hector.api.beans.C
import me.prettyprint.hector.api.beans.OrderedRows;
import me.prettyprint.hector.api.beans.Row;
import me.prettyprint.hector.api.factory.HFactory;
-import me.prettyprint.hector.api.mutation.Mutator;
import me.prettyprint.hector.api.query.QueryResult;
import org.apache.sirona.cassandra.DynamicDelegatedSerializer;
import org.apache.sirona.cassandra.collector.CassandraSirona;