Skip to content

Commit

Permalink
(Java) Using primitive arrays instead of Object with map/builder
Browse files Browse the repository at this point in the history 
also simplify and consolidate the builder generic value write handling
fixes elastic#3279
  • Loading branch information
@kimchy
kimchy committed Jul 1, 2013
1 parent 3403d72 commit c25ea8e
Show file tree
Hide file tree
Showing 3 changed files with 219 additions and 355 deletions.
282 changes: 133 additions & 149 deletions src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java
View file
Expand Up @@ -28,7 +28,6 @@
import org.elasticsearch.common.io.BytesStream;
import org.elasticsearch.common.io.FastByteArrayOutputStream;
import org.elasticsearch.common.text.Text;
import org.elasticsearch.common.xcontent.support.XContentMapConverter;
import org.joda.time.DateTimeZone;
import org.joda.time.ReadableInstant;
import org.joda.time.format.DateTimeFormatter;
Expand Down Expand Up @@ -648,6 +647,16 @@ public XContentBuilder field(String name, int... value) throws IOException {
return this;
}

public XContentBuilder field(XContentBuilderString name, int offset, int length, int... value) throws IOException {
assert ((offset >= 0) && (value.length > length));
startArray(name);
for (int i = offset; i < length; i++) {
value(value[i]);
}
endArray();
return this;
}

public XContentBuilder field(XContentBuilderString name, int... value) throws IOException {
startArray(name);
for (Object o : value) {
Expand Down Expand Up @@ -712,163 +721,22 @@ public XContentBuilder field(XContentBuilderString name, double... value) throws
}

public XContentBuilder field(String name, Object value) throws IOException {
if (value == null) {
nullField(name);
return this;
}
Class type = value.getClass();
if (type == String.class) {
field(name, (String) value);
} else if (type == Float.class) {
field(name, ((Float) value).floatValue());
} else if (type == Double.class) {
field(name, ((Double) value).doubleValue());
} else if (type == Integer.class) {
field(name, ((Integer) value).intValue());
} else if (type == Long.class) {
field(name, ((Long) value).longValue());
} else if (type == Short.class) {
field(name, ((Short) value).shortValue());
} else if (type == Byte.class) {
field(name, ((Byte) value).byteValue());
} else if (type == Boolean.class) {
field(name, ((Boolean) value).booleanValue());
} else if (value instanceof Date) {
field(name, (Date) value);
} else if (value instanceof Calendar) {
field(name, convertCalendar((Calendar) value));
} else if (type == byte[].class) {
field(name, (byte[]) value);
} else if (value instanceof ReadableInstant) {
field(name, (ReadableInstant) value);
} else if (value instanceof Map) {
//noinspection unchecked
field(name, (Map<String, Object>) value);
} else if (value instanceof Iterable) {
field(name, (Iterable) value);
} else if (value instanceof Object[]) {
field(name, (Object[]) value);
} else if (value instanceof int[]) {
field(name, (int[]) value);
} else if (value instanceof long[]) {
field(name, (long[]) value);
} else if (value instanceof float[]) {
field(name, (float[]) value);
} else if (value instanceof double[]) {
field(name, (double[]) value);
} else if (value instanceof BytesReference) {
field(name, (BytesReference) value);
} else if (value instanceof Text) {
field(name, (Text) value);
} else if (value instanceof ToXContent) {
field(name, (ToXContent) value);
} else {
field(name, value.toString());
}
field(name);
writeValue(value);
return this;
}

public XContentBuilder field(XContentBuilderString name, Object value) throws IOException {
if (value == null) {
nullField(name);
return this;
}
Class type = value.getClass();
if (type == String.class) {
field(name, (String) value);
} else if (type == Float.class) {
field(name, ((Float) value).floatValue());
} else if (type == Double.class) {
field(name, ((Double) value).doubleValue());
} else if (type == Integer.class) {
field(name, ((Integer) value).intValue());
} else if (type == Long.class) {
field(name, ((Long) value).longValue());
} else if (type == Short.class) {
field(name, ((Short) value).shortValue());
} else if (type == Byte.class) {
field(name, ((Byte) value).byteValue());
} else if (type == Boolean.class) {
field(name, ((Boolean) value).booleanValue());
} else if (value instanceof Date) {
field(name, (Date) value);
} else if (type == byte[].class) {
field(name, (byte[]) value);
} else if (value instanceof ReadableInstant) {
field(name, (ReadableInstant) value);
} else if (value instanceof Map) {
//noinspection unchecked
field(name, (Map<String, Object>) value);
} else if (value instanceof Iterable) {
field(name, (Iterable) value);
} else if (value instanceof Object[]) {
field(name, (Object[]) value);
} else if (value instanceof int[]) {
field(name, (int[]) value);
} else if (value instanceof long[]) {
field(name, (long[]) value);
} else if (value instanceof float[]) {
field(name, (float[]) value);
} else if (value instanceof double[]) {
field(name, (double[]) value);
} else if (value instanceof BytesReference) {
field(name, (BytesReference) value);
} else if (value instanceof Text) {
field(name, (Text) value);
} else {
field(name, value.toString());
}
field(name);
writeValue(value);
return this;
}

public XContentBuilder value(Object value) throws IOException {
if (value == null) {
return nullValue();
}
Class type = value.getClass();
if (type == String.class) {
value((String) value);
} else if (type == Float.class) {
value(((Float) value).floatValue());
} else if (type == Double.class) {
value(((Double) value).doubleValue());
} else if (type == Integer.class) {
value(((Integer) value).intValue());
} else if (type == Long.class) {
value(((Long) value).longValue());
} else if (type == Short.class) {
value(((Short) value).shortValue());
} else if (type == Byte.class) {
value(((Byte) value).byteValue());
} else if (type == Boolean.class) {
value((Boolean) value);
} else if (type == byte[].class) {
value((byte[]) value);
} else if (value instanceof Date) {
value((Date) value);
} else if (value instanceof Calendar) {
value(convertCalendar((Calendar) value));
} else if (value instanceof ReadableInstant) {
value((ReadableInstant) value);
} else if (value instanceof BytesReference) {
value((BytesReference) value);
} else if (value instanceof Text) {
value((Text) value);
} else if (value instanceof Map) {
//noinspection unchecked
value((Map<String, Object>) value);
} else if (value instanceof Iterable) {
value((Iterable) value);
} else {
throw new IOException("Type not allowed [" + type + "]");
}
writeValue(value);
return this;
}

private Date convertCalendar(Calendar value) {
return value.getTime();
}

public XContentBuilder field(String name, boolean value) throws IOException {
field(name);
generator.writeBoolean(value);
Expand Down Expand Up @@ -1110,15 +978,15 @@ public XContentBuilder map(Map<String, Object> map) throws IOException {
if (map == null) {
return nullValue();
}
XContentMapConverter.writeMap(generator, map);
writeMap(map);
return this;
}

public XContentBuilder value(Map<String, Object> map) throws IOException {
if (map == null) {
return nullValue();
}
XContentMapConverter.writeMap(generator, map);
writeMap(map);
return this;
}

Expand Down Expand Up @@ -1152,6 +1020,10 @@ public void close() {
}
}

public XContentGenerator generator() {
return this.generator;
}

@Nullable
public Object payload() {
return this.payload;
Expand Down Expand Up @@ -1185,4 +1057,116 @@ public String string() throws IOException {
BytesArray bytesArray = bytes().toBytesArray();
return new String(bytesArray.array(), bytesArray.arrayOffset(), bytesArray.length(), Charsets.UTF_8);
}


private void writeMap(Map<String, Object> map) throws IOException {
generator.writeStartObject();

for (Map.Entry<String, Object> entry : map.entrySet()) {
field(entry.getKey());
Object value = entry.getValue();
if (value == null) {
generator.writeNull();
} else {
writeValue(value);
}
}
generator.writeEndObject();
}

private void writeValue(Object value) throws IOException {
if (value == null) {
generator.writeNull();
return;
}
Class type = value.getClass();
if (type == String.class) {
generator.writeString((String) value);
} else if (type == Integer.class) {
generator.writeNumber(((Integer) value).intValue());
} else if (type == Long.class) {
generator.writeNumber(((Long) value).longValue());
} else if (type == Float.class) {
generator.writeNumber(((Float) value).floatValue());
} else if (type == Double.class) {
generator.writeNumber(((Double) value).doubleValue());
} else if (type == Short.class) {
generator.writeNumber(((Short) value).shortValue());
} else if (type == Boolean.class) {
generator.writeBoolean(((Boolean) value).booleanValue());
} else if (value instanceof Map) {
writeMap((Map) value);
} else if (value instanceof Iterable) {
generator.writeStartArray();
for (Object v : (Iterable) value) {
writeValue(v);
}
generator.writeEndArray();
} else if (value instanceof Object[]) {
generator.writeStartArray();
for (Object v : (Object[]) value) {
writeValue(v);
}
generator.writeEndArray();
} else if (type == byte[].class) {
generator.writeBinary((byte[]) value);
} else if (value instanceof Date) {
generator.writeString(XContentBuilder.defaultDatePrinter.print(((Date) value).getTime()));
} else if (value instanceof Calendar) {
generator.writeString(XContentBuilder.defaultDatePrinter.print((((Calendar) value)).getTimeInMillis()));
} else if (value instanceof BytesReference) {
BytesReference bytes = (BytesReference) value;
if (!bytes.hasArray()) {
bytes = bytes.toBytesArray();
}
generator.writeBinary(bytes.array(), bytes.arrayOffset(), bytes.length());
} else if (value instanceof Text) {
Text text = (Text) value;
if (text.hasBytes() && text.bytes().hasArray()) {
generator.writeUTF8String(text.bytes().array(), text.bytes().arrayOffset(), text.bytes().length());
} else if (text.hasString()) {
generator.writeString(text.string());
} else {
BytesArray bytesArray = text.bytes().toBytesArray();
generator.writeUTF8String(bytesArray.array(), bytesArray.arrayOffset(), bytesArray.length());
}
} else if (value instanceof ToXContent) {
((ToXContent) value).toXContent(this, ToXContent.EMPTY_PARAMS);
} else if (value instanceof double[]) {
generator.writeStartArray();
for (double v : (double[]) value) {
generator.writeNumber(v);
}
generator.writeEndArray();
} else if (value instanceof long[]) {
generator.writeStartArray();
for (long v : (long[]) value) {
generator.writeNumber(v);
}
generator.writeEndArray();
} else if (value instanceof int[]) {
generator.writeStartArray();
for (int v : (int[]) value) {
generator.writeNumber(v);
}
generator.writeEndArray();
} else if (value instanceof float[]) {
generator.writeStartArray();
for (float v : (float[]) value) {
generator.writeNumber(v);
}
generator.writeEndArray();
} else if (value instanceof short[]) {
generator.writeStartArray();
for (float v : (short[]) value) {
generator.writeNumber(v);
}
generator.writeEndArray();
} else {
// if this is a "value" object, like enum, DistanceUnit, ..., just toString it
// yea, it can be misleading when toString a Java class, but really, jackson should be used in that case
generator.writeString(value.toString());
//throw new ElasticSearchIllegalArgumentException("type not supported for generic value conversion: " + type);
}
}
}

0 comments on commit c25ea8e

Please sign in to comment.