mirror of
https://github.com/elastic/logstash.git
synced 2025-04-25 07:07:54 -04:00
Refactor: avoid array in case of single event
while also making the array case cleaner & effective (JRuby uses specialized array holder for 1 / 2 values) + Refactor: minor - use true/false constants directly + Refactor: do not allocate empty array Fixes #11732
This commit is contained in:
parent
85f0f87a31
commit
d56a0739dc
2 changed files with 12 additions and 12 deletions
|
@ -247,13 +247,15 @@ public final class Event implements Cloneable, Queueable, co.elastic.logstash.ap
|
||||||
return JSON_MAPPER.writeValueAsString(this.data);
|
return JSON_MAPPER.writeValueAsString(this.data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final Event[] NULL_ARRAY = new Event[0];
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public static Event[] fromJson(String json)
|
public static Event[] fromJson(String json)
|
||||||
throws IOException
|
throws IOException
|
||||||
{
|
{
|
||||||
// empty/blank json string does not generate an event
|
// empty/blank json string does not generate an event
|
||||||
if (json == null || json.trim().isEmpty()) {
|
if (json == null || json.trim().isEmpty()) {
|
||||||
return new Event[]{ };
|
return NULL_ARRAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
Event[] result;
|
Event[] result;
|
||||||
|
|
|
@ -127,14 +127,14 @@ public final class JrubyEventExtLibrary {
|
||||||
public IRubyObject ruby_cancel(ThreadContext context)
|
public IRubyObject ruby_cancel(ThreadContext context)
|
||||||
{
|
{
|
||||||
this.event.cancel();
|
this.event.cancel();
|
||||||
return context.runtime.getTrue();
|
return context.tru;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JRubyMethod(name = "uncancel")
|
@JRubyMethod(name = "uncancel")
|
||||||
public IRubyObject ruby_uncancel(ThreadContext context)
|
public IRubyObject ruby_uncancel(ThreadContext context)
|
||||||
{
|
{
|
||||||
this.event.uncancel();
|
this.event.uncancel();
|
||||||
return context.runtime.getFalse();
|
return context.fals;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JRubyMethod(name = "cancelled?")
|
@JRubyMethod(name = "cancelled?")
|
||||||
|
@ -251,18 +251,16 @@ public final class JrubyEventExtLibrary {
|
||||||
throw RaiseException.from(context.runtime, RubyUtil.PARSER_ERROR, e.getMessage());
|
throw RaiseException.from(context.runtime, RubyUtil.PARSER_ERROR, e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
RubyArray result = RubyArray.newArray(context.runtime, events.length);
|
|
||||||
|
|
||||||
if (events.length == 1) {
|
if (events.length == 1) {
|
||||||
// micro optimization for the 1 event more common use-case.
|
// micro optimization for the 1 event more common use-case.
|
||||||
result.set(0, RubyEvent.newRubyEvent(context.runtime, events[0]));
|
return context.runtime.newArray(RubyEvent.newRubyEvent(context.runtime, events[0]));
|
||||||
} else {
|
|
||||||
for (int i = 0; i < events.length; i++) {
|
|
||||||
result.set(i, RubyEvent.newRubyEvent(context.runtime, events[i]));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return result;
|
|
||||||
|
IRubyObject[] rubyEvents = new IRubyObject[events.length];
|
||||||
|
for (int i = 0; i < events.length; i++) {
|
||||||
|
rubyEvents[i] = RubyEvent.newRubyEvent(context.runtime, events[i]);
|
||||||
|
}
|
||||||
|
return context.runtime.newArrayNoCopy(rubyEvents);
|
||||||
}
|
}
|
||||||
|
|
||||||
@JRubyMethod(name = "validate_value", required = 1, meta = true)
|
@JRubyMethod(name = "validate_value", required = 1, meta = true)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue