You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2019/02/21 15:44:31 UTC
svn commit: r1854060 - in /jackrabbit/oak/branches/1.10: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Author: reschke
Date: Thu Feb 21 15:44:30 2019
New Revision: 1854060
URL: http://svn.apache.org/viewvc?rev=1854060&view=rev
Log:
OAK-8016: RDBDocumentStore: minor improvements to GZIP compression of BLOB contents (ported to 1.10)
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 21 15:44:30 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852920,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997
+/jackrabbit/oak/trunk:1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1854060&r1=1854059&r2=1854060&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Thu Feb 21 15:44:30 2019
@@ -29,6 +29,7 @@ import static org.apache.jackrabbit.oak.
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
import java.io.IOException;
+import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
@@ -2172,17 +2173,16 @@ public class RDBDocumentStore implements
if (NOGZIP) {
return bytes;
} else {
- try {
- ByteArrayOutputStream bos = new ByteArrayOutputStream(data.length());
- GZIPOutputStream gos = new GZIPOutputStream(bos) {
- {
- // TODO: make this configurable
- this.def.setLevel(Deflater.BEST_SPEED);
- }
- };
+ ByteArrayOutputStream bos = new ByteArrayOutputStream(bytes.length / 2);
+ try (GZIPOutputStream gos = asGZIPOutputStream(bos, Deflater.BEST_SPEED)) {
gos.write(bytes);
gos.close();
- return bos.toByteArray();
+ byte[] compressedBytes = bos.toByteArray();
+ if (LOG.isTraceEnabled()) {
+ long ratio = (100L * compressedBytes.length) / bytes.length;
+ LOG.trace("Gzipped {} bytes to {} ({}%)", bytes.length, compressedBytes.length, ratio);
+ }
+ return compressedBytes;
} catch (IOException ex) {
LOG.error("Error while gzipping contents", ex);
throw asDocumentStoreException(ex, "Error while gzipping contents");
@@ -2190,6 +2190,13 @@ public class RDBDocumentStore implements
}
}
+ private static GZIPOutputStream asGZIPOutputStream(OutputStream os, final int level) throws IOException {
+ return new GZIPOutputStream(os) {
+ {
+ this.def.setLevel(level);
+ }
+ };
+ }
@Override
public void setReadWriteMode(String readWriteMode) {