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/01/31 14:40:04 UTC
svn commit: r1852601 -
/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Author: reschke
Date: Thu Jan 31 14:40:04 2019
New Revision: 1852601
URL: http://svn.apache.org/viewvc?rev=1852601&view=rev
Log:
OAK-8016: RDBDocumentStore: minor improvements to GZIP compression of BLOB contents
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1852601&r1=1852600&r2=1852601&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Thu Jan 31 14:40:04 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;
@@ -2171,17 +2172,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");
@@ -2189,6 +2189,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) {