steveloughran commented on code in PR #3745:
URL: https://github.com/apache/avro/pull/3745#discussion_r3161172974
##########
lang/java/avro/src/main/java/org/apache/avro/util/NonCopyingByteArrayOutputStream.java:
##########
@@ -21,21 +21,78 @@
import java.io.ByteArrayOutputStream;
import java.nio.ByteBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.avro.SystemLimitException;
+
/**
* Utility to make data written to an {@link ByteArrayOutputStream} directly
- * available as a {@link ByteBuffer}.
+ * available as a {@link ByteBuffer}. Optional limit to amount of data which
may
+ * be written.
*/
public class NonCopyingByteArrayOutputStream extends ByteArrayOutputStream {
+ private static final Logger LOG =
LoggerFactory.getLogger(NonCopyingByteArrayOutputStream.class);
+
+ /**
+ * System property declaring max size of any decompression stream: {@value}.
+ */
+ private static final String MAX_DECOMPRESS_LENGTH_PROPERTY =
"org.apache.avro.limits.decompress.maxLength";
+
+ /**
+ * Default limit: {@value}.
+ */
+ private static final long DEFAULT_MAX_DECOMPRESS_LENGTH = 200L * 1024 * 1024;
+
+ private static final long MAX_DECOMPRESS_LENGTH;
+
+ static {
+ String prop = System.getProperty(MAX_DECOMPRESS_LENGTH_PROPERTY);
Review Comment:
could move to SystemLimitException, as that's where the int equivalent lives.
##########
lang/java/avro/src/main/java/org/apache/avro/util/NonCopyingByteArrayOutputStream.java:
##########
@@ -21,21 +21,78 @@
import java.io.ByteArrayOutputStream;
import java.nio.ByteBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.avro.SystemLimitException;
+
/**
* Utility to make data written to an {@link ByteArrayOutputStream} directly
- * available as a {@link ByteBuffer}.
+ * available as a {@link ByteBuffer}. Optional limit to amount of data which
may
+ * be written.
*/
public class NonCopyingByteArrayOutputStream extends ByteArrayOutputStream {
+ private static final Logger LOG =
LoggerFactory.getLogger(NonCopyingByteArrayOutputStream.class);
+
+ /**
+ * System property declaring max size of any decompression stream: {@value}.
+ */
+ private static final String MAX_DECOMPRESS_LENGTH_PROPERTY =
"org.apache.avro.limits.decompress.maxLength";
+
+ /**
+ * Default limit: {@value}.
+ */
+ private static final long DEFAULT_MAX_DECOMPRESS_LENGTH = 200L * 1024 * 1024;
+
+ private static final long MAX_DECOMPRESS_LENGTH;
+
+ static {
+ String prop = System.getProperty(MAX_DECOMPRESS_LENGTH_PROPERTY);
+ long limit = DEFAULT_MAX_DECOMPRESS_LENGTH;
+ if (prop != null) {
+ try {
+ long parsed = Long.parseLong(prop);
+ if (parsed <= 0) {
+ LOG.warn("Invalid value '{}' for property '{}': must be positive.
Using default: {}", prop,
+ MAX_DECOMPRESS_LENGTH_PROPERTY, DEFAULT_MAX_DECOMPRESS_LENGTH);
+ } else {
+ limit = parsed;
+ }
+ } catch (NumberFormatException e) {
+ LOG.warn("Could not parse property '{}' value '{}'. Using default:
{}", MAX_DECOMPRESS_LENGTH_PROPERTY, prop,
+ DEFAULT_MAX_DECOMPRESS_LENGTH);
+ }
+ }
+ MAX_DECOMPRESS_LENGTH = limit;
+ }
+
+ /**
+ * Size limit, -1 for no limits.
+ */
+ private final long limit;
+
/**
* Creates a new byte array output stream, with a buffer capacity of the
- * specified size, in bytes.
+ * specified size, in bytes, size limit {@link #MAX_DECOMPRESS_LENGTH}
*
* @param size the initial size
* @throws IllegalArgumentException if size is negative
*/
public NonCopyingByteArrayOutputStream(int size) {
+ this(size, MAX_DECOMPRESS_LENGTH);
Review Comment:
this does change the default operation. Apart from DataFileWriter, it is
only ever used in decompressors.
Options
* change the default (here)
* change the code uses to take a limit
* private two arg ctor and a public static creator method
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
