nizhikov commented on code in PR #11518:
URL: https://github.com/apache/ignite/pull/11518#discussion_r1809215001
##########
modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java:
##########
@@ -1880,6 +1892,72 @@ public void writeFieldIdNoSchemaUpdate(int fieldId) {
fieldCnt++;
}
+ /**
+ * Write byte array from the InputStream with the specified length.
+ *
+ * @param in InputStream.
+ * @param len Length of data in the stream.
+ * @return Number of bytes written.
+ */
+ public int writeByteArrayFromInputStream(InputStream in, int len) throws
IOException {
+ out.unsafeEnsure(1 + 4 + len);
+
+ return doWriteByteArrayFromInputStream(in, len);
+ }
+
+ /**
+ * Write byte array from the InputStream with uknown length.
+ *
+ * @param in InputStream.
+ * @return Number of bytes written or -1 if stream contains more than
{@code MAX_ARRAY_SIZE} bytes.
+ */
+ public int writeByteArrayFromInputStream(InputStream in) throws
IOException {
+ out.unsafeEnsure(1 + 4);
+
+ int writtenLen = doWriteByteArrayFromInputStream(in, MAX_ARRAY_SIZE);
+
+ if (writtenLen == MAX_ARRAY_SIZE && in.read() != -1)
+ return -1;
+ else
+ return writtenLen;
+ }
+
+ /**
+ * Write byte array from the InputStream. No more than {@code limit} bytes
will be written.
+ *
+ * @param in InputStream.
+ * @param limit Max length of data to be read from the stream.
+ * @return Number of bytes written.
+ * @throws IOException If an I/O error occurs.
+ */
+ private int doWriteByteArrayFromInputStream(InputStream in, int limit)
throws IOException {
+ out.unsafeWriteByte(GridBinaryMarshaller.BYTE_ARR);
+
+ int lengthPos = out.position();
+ out.position(lengthPos + 4);
+
+ int readLen;
+ int writtenLen = 0;
+
+ byte[] buf = new byte[DEFAULT_BUFFER_SIZE];
+
+ while (-1 != (readLen = in.read(buf, 0, Math.min(buf.length, limit -
writtenLen)))
Review Comment:
we need to exchange order of checks.
First, check `writtenLen < limit` then read and check for success.
Looks like, now, you will try to read one more time (zero byte) when
`writtenLen < limit == false`.
--
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: notifications-unsubscr...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
