You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2020/06/22 14:29:19 UTC
[jena] branch master updated: JENA-1919,
JENA-1920: Fixes for BufferingWriter
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/master by this push:
new dd223c5 JENA-1919, JENA-1920: Fixes for BufferingWriter
new cb16fdc Merge pull request #762 from afs/buffering-writer
dd223c5 is described below
commit dd223c5eb509b074d0570b598fd78726eba8eb93
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri Jun 19 19:35:30 2020 +0100
JENA-1919, JENA-1920: Fixes for BufferingWriter
---
.../org/apache/jena/atlas/io/BufferingWriter.java | 103 ++++++++++-----------
.../apache/jena/atlas/io/TestBufferingWriter.java | 25 +++++
2 files changed, 76 insertions(+), 52 deletions(-)
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/BufferingWriter.java b/jena-base/src/main/java/org/apache/jena/atlas/io/BufferingWriter.java
index 347707a..343c737 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/io/BufferingWriter.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/io/BufferingWriter.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.jena.atlas.io ;
+package org.apache.jena.atlas.io;
-import java.io.IOException ;
-import java.io.Writer ;
+import java.io.IOException;
+import java.io.Writer;
/**
* A buffering writer. Like BufferedWriter but with no synchronization. A
@@ -30,35 +30,34 @@ import java.io.Writer ;
* </p>
* This class is not thread safe.
*/
-
public final class BufferingWriter extends Writer {
// Default sizes
- private static final int SIZE = 8 * 1024 ; // Unit size in bytes.
- private static final int BLOB_SIZE = SIZE / 2 ; // Large object size,
- // worse case, bytes
+ private static final int SIZE = 8 * 1024; // Unit size in bytes.
+ private static final int BLOB_SIZE = SIZE / 2; // Large object size, worse case, bytes
// Sizes for this instance
- private final int blockSize ;
- private final int blobSize ;
+ private final int blockSize;
+ private final int blobSize;
- private char[] buffer = new char[SIZE] ;
- private int idx = 0 ;
- private Writer out ;
+ private final char[] buffer;
+ private int idx = 0;
+ private final Writer out;
/** Create a buffering writer */
public BufferingWriter(Writer dest) {
- this(dest, SIZE, BLOB_SIZE) ;
+ this(dest, SIZE, BLOB_SIZE);
}
/** Create a buffering writer */
public BufferingWriter(Writer dest, int size) {
- this(dest, size, size/2) ;
+ this(dest, size, size/2);
}
/** Create a buffering writer */
public BufferingWriter(Writer dest, int size, int blobSize) {
- this.out = dest ;
- this.blockSize = size ;
- this.blobSize = blobSize ;
+ this.out = dest;
+ this.buffer = new char[size];
+ this.blockSize = size;
+ this.blobSize = blobSize;
}
/**
@@ -66,113 +65,113 @@ public final class BufferingWriter extends Writer {
* @param string Characters
*/
public void output(String string) {
- output(string, 0, string.length()) ;
+ output(string, 0, string.length());
}
-
+
/**
* Output a string
- *
+ *
* @param string Characters
* @param off Starting point in the string
* @param length Length
*/
public void output(String string, int off, int length) {
- boolean largeBlob = (length > blobSize) ;
+ boolean largeBlob = (length > blobSize);
// There is no space or too big
if ( largeBlob || (blockSize - idx) < length )
- flushBuffer() ;
+ flushBuffer();
// If too big, do directly.
if ( largeBlob /* too big */) {
- try { out.write(string, off, length) ; }
- catch (IOException ex) { IO.exception(ex) ; }
- return ;
+ try { out.write(string, off, length); }
+ catch (IOException ex) { IO.exception(ex); }
+ return;
}
- int n = string.length() ;
- string.getChars(off, (n + off), buffer, idx) ;
- idx += n ;
+ int n = string.length();
+ string.getChars(off, (n + off), buffer, idx);
+ idx += n;
}
/** Output an array of characters */
public void output(char chars[]) {
- output(chars, 0, chars.length) ;
+ output(chars, 0, chars.length);
}
/**
* Output an array of characters
- *
+ *
* @param chars Characters
* @param start Start
* @param length Length
*/
public void output(char chars[], int start, int length) {
- boolean largeBlob = (length > blobSize) ;
+ boolean largeBlob = (length > blobSize);
// There is no space or too big
if ( largeBlob || (blockSize - idx) < length )
- flushBuffer() ;
+ flushBuffer();
// If too big, do directly.
if ( largeBlob /* too big */) {
- try { out.write(chars) ; }
- catch (IOException ex) { IO.exception(ex) ; }
- return ;
+ try { out.write(chars, start, length); }
+ catch (IOException ex) { IO.exception(ex); }
+ return;
}
- System.arraycopy(chars, start, buffer, idx, length) ;
- idx += length ;
+ System.arraycopy(chars, start, buffer, idx, length);
+ idx += length;
}
/** Output a single character */
public void output(char ch) {
if ( blockSize == idx )
- flushBuffer() ;
- buffer[idx++] = ch ;
+ flushBuffer();
+ buffer[idx++] = ch;
}
private void flushBuffer() {
if ( idx > 0 ) {
- try { out.write(buffer, 0, idx) ; }
- catch (IOException ex) { IO.exception(ex) ; }
- idx = 0 ;
+ try { out.write(buffer, 0, idx); }
+ catch (IOException ex) { IO.exception(ex); }
+ idx = 0;
}
}
-
+
// ---- Writer
@Override
public void close() {
- flushBuffer() ;
- IO.close(out) ;
+ flushBuffer();
+ IO.close(out);
}
@Override
public void flush() {
- flushBuffer() ;
- IO.flush(out) ;
+ flushBuffer();
+ IO.flush(out);
}
@Override
public void write(char[] cbuf, int off, int len) throws IOException {
- output(cbuf, off, len) ;
+ output(cbuf, off, len);
}
@Override
public void write(char[] cbuf) throws IOException {
- write(cbuf, 0, cbuf.length) ;
+ write(cbuf, 0, cbuf.length);
}
@Override
public void write(String string, int off, int len) throws IOException {
- output(string, off, len) ;
+ output(string, off, len);
}
@Override
public void write(String string) throws IOException {
- output(string, 0, string.length()) ;
+ output(string, 0, string.length());
}
@Override
public void write(int ch) throws IOException {
- output((char)ch) ;
+ output((char)ch);
}
}
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/TestBufferingWriter.java b/jena-base/src/test/java/org/apache/jena/atlas/io/TestBufferingWriter.java
index 08e81c6..cf55fec 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/io/TestBufferingWriter.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/io/TestBufferingWriter.java
@@ -94,4 +94,29 @@ public class TestBufferingWriter extends BaseTest {
String x = string() ;
assertEquals("test", x) ;
}
+
+ @Test // JENA-19219
+ public void write_07() {
+ create(8194, 4098);
+ for (int i = 0; i < 8194;i++) {
+ w.output('a');
+ }
+ w.close();
+ String x = string();
+ assertEquals(x.length(), 8194);
+ }
+
+ @Test // JENA-1920
+ public void write_08() {
+ create(8192, 4096);
+ char[] chars = new char[8192];
+ //define enough to make it a 'large blob'
+ for(int i = 0; i < 5000; i++){
+ chars[i] = '1';
+ }
+ w.output(chars, 0, 5000);
+ w.close();
+ String x = string();
+ assertEquals(5000, x.length());
+ }
}