Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix incorrect assumptions about BytesReference in StateToProcessWriterHelper #103929

Merged
merged 1 commit into from
Jan 4, 2024
Merged

Fix incorrect assumptions about BytesReference in StateToProcessWriterHelper #103929

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions ...lugin/ml/src/main/java/org/elasticsearch/xpack/ml/process/StateToProcessWriterHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
*/
package org.elasticsearch.xpack.ml.process;

import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefIterator;
import org.elasticsearch.common.bytes.BytesReference;

import java.io.IOException;
Expand All @@ -23,17 +21,12 @@ private StateToProcessWriterHelper() {}
public static void writeStateToStream(BytesReference source, OutputStream stream) throws IOException {
// The source bytes are already UTF-8. The C++ process wants UTF-8, so we
// can avoid converting to a Java String only to convert back again.
BytesRefIterator iterator = source.iterator();
for (BytesRef ref = iterator.next(); ref != null; ref = iterator.next()) {
// There's a complication that the source can already have trailing 0 bytes
int length = ref.bytes.length;
while (length > 0 && ref.bytes[length - 1] == 0) {
--length;
}
if (length > 0) {
stream.write(ref.bytes, 0, length);
}
int length = source.length();
// There's a complication that the source can already have trailing 0 bytes
while (length > 0 && source.get(length - 1) == 0) {
--length;
}
source.slice(0, length).writeTo(stream);
// This is dictated by RapidJSON on the C++ side; it treats a '\0' as end-of-file
// even when it's not really end-of-file, and this is what we need because we're
// sending multiple JSON documents via the same named pipe.
Expand Down