You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by jm...@apache.org on 2011/08/15 15:48:32 UTC
svn commit: r1157846 - in /incubator/flume/trunk:
flume-core/src/main/java/com/cloudera/flume/core/Event.java
flume-core/src/test/java/com/cloudera/flume/core/TestEvent.java
flume-docs/src/docs/UserGuide/UsingOutput
Author: jmhsieh
Date: Mon Aug 15 13:48:31 2011
New Revision: 1157846
URL: http://svn.apache.org/viewvc?rev=1157846&view=rev
Log:
FLUME-688: Add %{timestamp} to escapable tags (Alex Baranau)
Modified:
incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/core/Event.java
incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/core/TestEvent.java
incubator/flume/trunk/flume-docs/src/docs/UserGuide/UsingOutput
Modified: incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/core/Event.java
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/core/Event.java?rev=1157846&r1=1157845&r2=1157846&view=diff
==============================================================================
--- incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/core/Event.java (original)
+++ incubator/flume/trunk/flume-core/src/main/java/com/cloudera/flume/core/Event.java Mon Aug 15 13:48:31 2011
@@ -275,7 +275,10 @@ abstract public class Event {
return getHost();
}
if (tag.equals("nanos")) {
- return "" + getNanos();
+ return String.valueOf(getNanos());
+ }
+ if (tag.equals("timestamp")) {
+ return String.valueOf(getTimestamp());
}
if (tag.equals("priority")) {
return getPriority().toString();
Modified: incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/core/TestEvent.java
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/core/TestEvent.java?rev=1157846&r1=1157845&r2=1157846&view=diff
==============================================================================
--- incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/core/TestEvent.java (original)
+++ incubator/flume/trunk/flume-core/src/test/java/com/cloudera/flume/core/TestEvent.java Mon Aug 15 13:48:31 2011
@@ -46,6 +46,26 @@ public class TestEvent {
}
/**
+ * Test full escaping - the replacement of %{...} strings by their
+ * corresponding attributes.
+ */
+ @Test
+ public void testEscapingOfEventProperties() {
+ String body = "abcde";
+ Event e = new EventImpl(body.getBytes());
+ String test = "/one/%{nanos}/two/%{timestamp}/three/%{body}/four/%{hostname}/five/%{host}/six/%{priority}";
+
+ assertEquals("Tag replacement of tag(s) failed!",
+ "/one/" + e.getNanos() +
+ "/two/" + e.getTimestamp() +
+ "/three/" + body +
+ "/four/" + e.getHost() +
+ "/five/" + e.getHost() +
+ "/six/" + e.getPriority(),
+ e.escapeString(test));
+ }
+
+ /**
* Test replacement of %{...} strings with dots or dashes (FLUME-160)
*/
@Test
Modified: incubator/flume/trunk/flume-docs/src/docs/UserGuide/UsingOutput
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-docs/src/docs/UserGuide/UsingOutput?rev=1157846&r1=1157845&r2=1157846&view=diff
==============================================================================
--- incubator/flume/trunk/flume-docs/src/docs/UserGuide/UsingOutput (original)
+++ incubator/flume/trunk/flume-docs/src/docs/UserGuide/UsingOutput Mon Aug 15 13:48:31 2011
@@ -111,6 +111,7 @@ was during the 18:00 hour, the event wou
.Event data escape sequences
[horizontal] %\{host\} :: host
%\{nanos\} :: nanos
+%\{timestamp\} :: timestamp
%\{priority\} :: priority string
%\{body\} :: body
%% :: a '%' character.