github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

#7318 stop creating a new RubyTimestamp on every timestamp get

Browse source 
Fixes #8334
This commit is contained in:
Armin 2017-09-20 13:26:45 +02:00 • committed by Armin Braun
parent a6bd3164a0
commit 3ba73f418c
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
logstash-core/src/main/java/org/logstash/Event.java
View file

@ -47,7 +47,7 @@ public final class Event implements Cloneable, Queueable {
this.data = new ConvertedMap(10);
this.data.putInterned(VERSION, VERSION_ONE);
this.cancelled = false;
this.data.putInterned(TIMESTAMP, new Timestamp());
setTimestamp(Timestamp.now());
}
/**
@ -82,7 +82,7 @@ public final class Event implements Cloneable, Queueable {
Object providedTimestamp = data.get(TIMESTAMP);
// keep reference to the parsedTimestamp for tagging below
Timestamp parsedTimestamp = initTimestamp(providedTimestamp);
data.putInterned(TIMESTAMP, parsedTimestamp == null ? Timestamp.now() : parsedTimestamp);
setTimestamp(parsedTimestamp == null ? Timestamp.now() : parsedTimestamp);
// the tag() method has to be called after the Accessors initialization
if (parsedTimestamp == null) {
tag(TIMESTAMP_FAILURE_TAG);
@ -111,16 +111,19 @@ public final class Event implements Cloneable, Queueable {
}
public Timestamp getTimestamp() throws IOException {
final Timestamp timestamp = (Timestamp) data.get(TIMESTAMP);
final JrubyTimestampExtLibrary.RubyTimestamp timestamp =
(JrubyTimestampExtLibrary.RubyTimestamp) data.get(TIMESTAMP);
if (timestamp != null) {
return timestamp;
return timestamp.getTimestamp();
} else {
throw new IOException("fails");
}
}
public void setTimestamp(Timestamp t) {
this.data.putInterned(TIMESTAMP, t);
this.data.putInterned(
TIMESTAMP, JrubyTimestampExtLibrary.RubyTimestamp.newRubyTimestamp(RubyUtil.RUBY, t)
);
}
public Object getField(final String reference) {

6
logstash-core/src/main/java/org/logstash/ext/JrubyEventExtLibrary.java
View file

@ -288,8 +288,10 @@ public final class JrubyEventExtLibrary implements Library {
}
@JRubyMethod(name = "timestamp")
public IRubyObject ruby_timestamp(ThreadContext context) throws IOException {
return new JrubyTimestampExtLibrary.RubyTimestamp(context.getRuntime(), this.event.getTimestamp());
public IRubyObject ruby_timestamp(ThreadContext context) {
// We can just cast to IRubyObject here, because we know that Event stores a
// RubyTimestamp internally.
return (IRubyObject) event.getUnconvertedField(FieldReference.TIMESTAMP_REFERENCE);
}
@JRubyMethod(name = "timestamp=", required = 1)