You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ca...@codespot.com on 2012/04/24 17:23:10 UTC

[cassandra-jdbc] 2 new revisions pushed by wfs...@gmail.com on 2012-04-24 15:23 GMT

2 new revisions:

Revision: 497635f81f9f
Author:   Rick Shaw <wf...@gmail.com>
Date:     Tue Apr 24 07:29:47 2012
Log:      Resolve issue #28. Call the end() method of Deflator in a  
finally...
http://code.google.com/a/apache-extras.org/p/cassandra-jdbc/source/detail?r=497635f81f9f

Revision: 06dee616c996
Author:   Rick Shaw <wf...@gmail.com>
Date:     Tue Apr 24 08:22:17 2012
Log:      Update POM to use 1.1-RC1 release of C* dependencies.
http://code.google.com/a/apache-extras.org/p/cassandra-jdbc/source/detail?r=06dee616c996

==============================================================================
Revision: 497635f81f9f
Author:   Rick Shaw <wf...@gmail.com>
Date:     Tue Apr 24 07:29:47 2012
Log:      Resolve issue #28. Call the end() method of Deflator in a finally
clause.

The deflator was allocating some system memory for the deflation process
but was never giving it back upon closing the structure. The docs say it
will be cleaned up by the finalizer but that did not seem to be the
case. It needed to be closed explicitly

http://code.google.com/a/apache-extras.org/p/cassandra-jdbc/source/detail?r=497635f81f9f

Modified:
  /src/main/java/org/apache/cassandra/cql/jdbc/Utils.java

=======================================
--- /src/main/java/org/apache/cassandra/cql/jdbc/Utils.java	Fri Feb  3  
12:43:22 2012
+++ /src/main/java/org/apache/cassandra/cql/jdbc/Utils.java	Tue Apr 24  
07:29:47 2012
@@ -119,10 +119,17 @@
          ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
          byte[] buffer = new byte[1024];

-        while (!compressor.finished())
-        {
-            int size = compressor.deflate(buffer);
-            byteArray.write(buffer, 0, size);
+        try
+        {
+            while (!compressor.finished())
+            {
+                int size = compressor.deflate(buffer);
+                byteArray.write(buffer, 0, size);
+            }
+        }
+        finally
+        {
+            compressor.end(); //clean up after the Deflater
          }

          logger.trace("Compressed query statement {} bytes in length to {}  
bytes", data.length, byteArray.size());

==============================================================================
Revision: 06dee616c996
Author:   Rick Shaw <wf...@gmail.com>
Date:     Tue Apr 24 08:22:17 2012
Log:      Update POM to use 1.1-RC1 release of C* dependencies.
http://code.google.com/a/apache-extras.org/p/cassandra-jdbc/source/detail?r=06dee616c996

Modified:
  /pom.xml

=======================================
--- /pom.xml	Sat Mar 24 18:58:09 2012
+++ /pom.xml	Tue Apr 24 08:22:17 2012
@@ -105,12 +105,12 @@
      <dependency>
        <groupId>org.apache.cassandra</groupId>
        <artifactId>cassandra-clientutil</artifactId>
-      <version>1.1.0-beta1</version>
+      <version>1.1.0-rc1</version>
      </dependency>
      <dependency>
        <groupId>org.apache.cassandra</groupId>
        <artifactId>cassandra-thrift</artifactId>
-      <version>1.1.0-beta1</version>
+      <version>1.1.0-rc1</version>
        <exclusions>
          <exclusion>
            <groupId>javax.servlet</groupId>