honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Transport: read/writeGenericValue to support BytesRef 

Add support for BytesRef to existing StreamInput#readGenericValue and StreamOutput#writeGenericValue

Closes #10878
This commit is contained in:
javanna 2015-04-29 14:29:15 +02:00 committed by Luca Cavanna
parent 2fd387d378
commit 77ac4528fb
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/elasticsearch/common/io/stream/StreamInput.java
View File

@ -21,7 +21,6 @@ package org.elasticsearch.common.io.stream;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRefBuilder; import org.apache.lucene.util.CharsRefBuilder;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
@ -413,6 +412,8 @@ public abstract class StreamInput extends InputStream {
return readFloatArray(); return readFloatArray();
case 20: case 20:
return readDoubleArray(); return readDoubleArray();
case 21:
return readBytesRef();
default: default:
throw new IOException("Can't read unknown type [" + type + "]"); throw new IOException("Can't read unknown type [" + type + "]");
} }

3
src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java
View File

@ -385,6 +385,9 @@ public abstract class StreamOutput extends OutputStream {
} else if (type == double[].class) { } else if (type == double[].class) {
writeByte((byte) 20); writeByte((byte) 20);
writeDoubleArray((double[]) value); writeDoubleArray((double[]) value);
} else if (value instanceof BytesRef) {
writeByte((byte) 21);
writeBytesRef((BytesRef) value);
} else { } else {
throw new IOException("Can't write type [" + type + "]"); throw new IOException("Can't write type [" + type + "]");
} }

9
src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java
View File

@ -22,6 +22,7 @@ package org.elasticsearch.common.io.streams;
import org.apache.lucene.util.Constants; import org.apache.lucene.util.Constants;
import org.elasticsearch.common.io.stream.BytesStreamInput; import org.elasticsearch.common.io.stream.BytesStreamInput;
import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.elasticsearch.common.lucene.BytesRefs;
import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.BigArrays;
import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.test.ElasticsearchTestCase;
import org.junit.Ignore; import org.junit.Ignore;
@ -263,8 +264,8 @@ public class BytesStreamsTests extends ElasticsearchTestCase {
assumeTrue("requires a 64-bit JRE ... ?!", Constants.JRE_IS_64BIT); assumeTrue("requires a 64-bit JRE ... ?!", Constants.JRE_IS_64BIT);
BytesStreamOutput out = new BytesStreamOutput(); BytesStreamOutput out = new BytesStreamOutput();
out.writeBoolean(false); out.writeBoolean(false);
out.writeByte((byte)1); out.writeByte((byte) 1);
out.writeShort((short)-1); out.writeShort((short) -1);
out.writeInt(-1); out.writeInt(-1);
out.writeVInt(2); out.writeVInt(2);
out.writeLong(-3); out.writeLong(-3);
@ -281,6 +282,7 @@ public class BytesStreamsTests extends ElasticsearchTestCase {
out.writeGenericValue(doubleArray); out.writeGenericValue(doubleArray);
out.writeString("hello"); out.writeString("hello");
out.writeString("goodbye"); out.writeString("goodbye");
out.writeGenericValue(BytesRefs.toBytesRef("bytesref"));
BytesStreamInput in = new BytesStreamInput(out.bytes().toBytes()); BytesStreamInput in = new BytesStreamInput(out.bytes().toBytes());
assertThat(in.readBoolean(), equalTo(false)); assertThat(in.readBoolean(), equalTo(false));
assertThat(in.readByte(), equalTo((byte)1)); assertThat(in.readByte(), equalTo((byte)1));
@ -291,12 +293,13 @@ public class BytesStreamsTests extends ElasticsearchTestCase {
assertThat(in.readVLong(), equalTo((long)4)); assertThat(in.readVLong(), equalTo((long)4));
assertThat((double)in.readFloat(), closeTo(1.1, 0.0001)); assertThat((double)in.readFloat(), closeTo(1.1, 0.0001));
assertThat(in.readDouble(), closeTo(2.2, 0.0001)); assertThat(in.readDouble(), closeTo(2.2, 0.0001));
assertThat(in.readGenericValue(), equalTo((Object)intArray)); assertThat(in.readGenericValue(), equalTo((Object) intArray));
assertThat(in.readGenericValue(), equalTo((Object)longArray)); assertThat(in.readGenericValue(), equalTo((Object)longArray));
assertThat(in.readGenericValue(), equalTo((Object)floatArray)); assertThat(in.readGenericValue(), equalTo((Object)floatArray));
assertThat(in.readGenericValue(), equalTo((Object)doubleArray)); assertThat(in.readGenericValue(), equalTo((Object)doubleArray));
assertThat(in.readString(), equalTo("hello")); assertThat(in.readString(), equalTo("hello"));
assertThat(in.readString(), equalTo("goodbye")); assertThat(in.readString(), equalTo("goodbye"));
assertThat(in.readGenericValue(), equalTo((Object)BytesRefs.toBytesRef("bytesref")));
in.close(); in.close();
out.close(); out.close();
} }