You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by es...@apache.org on 2011/08/23 01:06:59 UTC
svn commit: r1160491 - in
/incubator/flume/branches/flume-728/flume-ng-core/src:
main/java/org/apache/flume/durability/
main/java/org/apache/flume/durability/file/
test/java/org/apache/flume/durability/
test/java/org/apache/flume/durability/file/
Author: esammer
Date: Mon Aug 22 23:06:59 2011
New Revision: 1160491
URL: http://svn.apache.org/viewvc?rev=1160491&view=rev
Log:
- Back-filled WAL related interfaces.
- Moved FileBasedWAL* classes to org.apache.flume.durability.file.
Added:
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WAL.java
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WALManager.java
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WALWriter.java
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWAL.java
- copied, changed from r1160490, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWAL.java
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALManager.java
- copied, changed from r1160490, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWALManager.java
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALWriter.java
- copied, changed from r1160490, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWALWriter.java
incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/
incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWAL.java
- copied, changed from r1160490, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWAL.java
incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALManager.java
- copied, changed from r1160490, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWALManager.java
incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALWriter.java
- copied, changed from r1160490, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWALWriter.java
Removed:
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWAL.java
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWALManager.java
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWALWriter.java
incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWAL.java
incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWALManager.java
incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWALWriter.java
Added: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WAL.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WAL.java?rev=1160491&view=auto
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WAL.java (added)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WAL.java Mon Aug 22 23:06:59 2011
@@ -0,0 +1,9 @@
+package org.apache.flume.durability;
+
+import java.io.IOException;
+
+public interface WAL {
+
+ public WALWriter getWriter() throws IOException;
+
+}
Added: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WALManager.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WALManager.java?rev=1160491&view=auto
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WALManager.java (added)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WALManager.java Mon Aug 22 23:06:59 2011
@@ -0,0 +1,7 @@
+package org.apache.flume.durability;
+
+public interface WALManager {
+
+ public WAL getWAL(String name);
+
+}
Added: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WALWriter.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WALWriter.java?rev=1160491&view=auto
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WALWriter.java (added)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/WALWriter.java Mon Aug 22 23:06:59 2011
@@ -0,0 +1,17 @@
+package org.apache.flume.durability;
+
+import java.io.IOException;
+
+import org.apache.flume.Event;
+
+public interface WALWriter {
+
+ public void open() throws IOException;
+
+ public void close() throws IOException;
+
+ public void flush() throws IOException;
+
+ public void write(Event event) throws IOException;
+
+}
Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWAL.java (from r1160490, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWAL.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWAL.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWAL.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWAL.java&r1=1160490&r2=1160491&rev=1160491&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWAL.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWAL.java Mon Aug 22 23:06:59 2011
@@ -1,8 +1,9 @@
-package org.apache.flume.durability;
+package org.apache.flume.durability.file;
import java.io.File;
import java.io.IOException;
+import org.apache.flume.durability.WAL;
import org.apache.flume.formatter.output.EventFormatter;
import org.apache.flume.formatter.output.TextDelimitedOutputFormatter;
import org.slf4j.Logger;
@@ -10,7 +11,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-public class FileBasedWAL {
+public class FileBasedWAL implements WAL {
private static final Logger logger = LoggerFactory
.getLogger(FileBasedWAL.class);
Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALManager.java (from r1160490, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWALManager.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALManager.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALManager.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWALManager.java&r1=1160490&r2=1160491&rev=1160491&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWALManager.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALManager.java Mon Aug 22 23:06:59 2011
@@ -1,8 +1,10 @@
-package org.apache.flume.durability;
+package org.apache.flume.durability.file;
import java.io.File;
-public class FileBasedWALManager {
+import org.apache.flume.durability.WALManager;
+
+public class FileBasedWALManager implements WALManager {
private File directory;
Copied: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALWriter.java (from r1160490, incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWALWriter.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALWriter.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALWriter.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWALWriter.java&r1=1160490&r2=1160491&rev=1160491&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/FileBasedWALWriter.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/durability/file/FileBasedWALWriter.java Mon Aug 22 23:06:59 2011
@@ -1,4 +1,4 @@
-package org.apache.flume.durability;
+package org.apache.flume.durability.file;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -7,26 +7,31 @@ import java.io.FileOutputStream;
import java.io.IOException;
import org.apache.flume.Event;
+import org.apache.flume.durability.WALWriter;
import org.apache.flume.formatter.output.EventFormatter;
-public class FileBasedWALWriter {
+public class FileBasedWALWriter implements WALWriter {
private File file;
private BufferedOutputStream outputStream;
private EventFormatter formatter;
+ @Override
public void open() throws FileNotFoundException {
outputStream = new BufferedOutputStream(new FileOutputStream(file));
}
+ @Override
public void write(Event event) throws IOException {
outputStream.write(formatter.format(event));
}
+ @Override
public void close() throws IOException {
outputStream.close();
}
+ @Override
public void flush() throws IOException {
outputStream.flush();
}
Copied: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWAL.java (from r1160490, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWAL.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWAL.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWAL.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWAL.java&r1=1160490&r2=1160491&rev=1160491&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWAL.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWAL.java Mon Aug 22 23:06:59 2011
@@ -1,8 +1,9 @@
-package org.apache.flume.durability;
+package org.apache.flume.durability.file;
import java.io.File;
import java.io.IOException;
+import org.apache.flume.durability.file.FileBasedWAL;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Copied: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALManager.java (from r1160490, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWALManager.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALManager.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALManager.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWALManager.java&r1=1160490&r2=1160491&rev=1160491&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWALManager.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALManager.java Mon Aug 22 23:06:59 2011
@@ -1,9 +1,11 @@
-package org.apache.flume.durability;
+package org.apache.flume.durability.file;
import java.io.File;
import junit.framework.Assert;
+import org.apache.flume.durability.file.FileBasedWAL;
+import org.apache.flume.durability.file.FileBasedWALManager;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Copied: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALWriter.java (from r1160490, incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWALWriter.java)
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALWriter.java?p2=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALWriter.java&p1=incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWALWriter.java&r1=1160490&r2=1160491&rev=1160491&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/TestFileBasedWALWriter.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/durability/file/TestFileBasedWALWriter.java Mon Aug 22 23:06:59 2011
@@ -1,4 +1,4 @@
-package org.apache.flume.durability;
+package org.apache.flume.durability.file;
import java.io.File;
import java.io.IOException;
@@ -6,6 +6,7 @@ import java.io.IOException;
import junit.framework.Assert;
import org.apache.flume.Event;
+import org.apache.flume.durability.file.FileBasedWALWriter;
import org.apache.flume.event.SimpleEvent;
import org.apache.flume.formatter.output.TextDelimitedOutputFormatter;
import org.junit.After;