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/12/23 00:20:46 UTC
svn commit: r1222508 - in /incubator/flume/branches/flume-728: ./
flume-ng-sinks/flume-hdfs-sink/
flume-ng-sinks/flume-hdfs-sink/src/main/java/org/apache/flume/sink/hdfs/
flume-ng-sinks/flume-hdfs-sink/src/test/java/org/apache/flume/sink/hdfs/
Author: esammer
Date: Thu Dec 22 23:20:46 2011
New Revision: 1222508
URL: http://svn.apache.org/viewvc?rev=1222508&view=rev
Log:
FLUME-901: Make Flume NG build and pass tests against Hadoop 0.23 branch
(Bruno Mahé via Eric Sammer)
Modified:
incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/pom.xml
incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/src/main/java/org/apache/flume/sink/hdfs/HDFSTextFormatter.java
incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/src/test/java/org/apache/flume/sink/hdfs/TestHDFSEventSink.java
incubator/flume/branches/flume-728/pom.xml
Modified: incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/pom.xml?rev=1222508&r1=1222507&r2=1222508&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/pom.xml (original)
+++ incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/pom.xml Thu Dec 22 23:20:46 2011
@@ -28,7 +28,7 @@ limitations under the License.
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-hdfs-sink</artifactId>
- <name>Flume NG HDFS </name>
+ <name>Flume NG HDFS Sink</name>
<build>
<plugins>
@@ -71,9 +71,41 @@ limitations under the License.
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
+ <artifactId>${hadoop.common.artifact.id}</artifactId>
</dependency>
</dependencies>
+ <profiles>
+
+ <profile>
+ <id>hadoop-0.23</id>
+ <activation>
+ <property>
+ <name>hadoop.profile</name>
+ <value>23</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ </profiles>
+
</project>
Modified: incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/src/main/java/org/apache/flume/sink/hdfs/HDFSTextFormatter.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/src/main/java/org/apache/flume/sink/hdfs/HDFSTextFormatter.java?rev=1222508&r1=1222507&r2=1222508&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/src/main/java/org/apache/flume/sink/hdfs/HDFSTextFormatter.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/src/main/java/org/apache/flume/sink/hdfs/HDFSTextFormatter.java Thu Dec 22 23:20:46 2011
@@ -19,6 +19,8 @@
package org.apache.flume.sink.hdfs;
+import java.util.Arrays;
+
import org.apache.flume.Event;
import org.apache.flume.sink.FlumeFormatter;
//import org.apache.hadoop.io.BytesWritable;
@@ -68,7 +70,8 @@ public class HDFSTextFormatter implement
public byte[] getBytes(Event e) {
Text record = makeText(e);
record.append("\n".getBytes(), 0, 1);
- return record.getBytes();
+ byte[] rawBytes = record.getBytes();
+ return Arrays.copyOf(rawBytes, record.getLength());
}
}
Modified: incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/src/test/java/org/apache/flume/sink/hdfs/TestHDFSEventSink.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/src/test/java/org/apache/flume/sink/hdfs/TestHDFSEventSink.java?rev=1222508&r1=1222507&r2=1222508&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/src/test/java/org/apache/flume/sink/hdfs/TestHDFSEventSink.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-sinks/flume-hdfs-sink/src/test/java/org/apache/flume/sink/hdfs/TestHDFSEventSink.java Thu Dec 22 23:20:46 2011
@@ -192,7 +192,7 @@ public class TestHDFSEventSink {
String line;
while ((line = d.readLine()) != null) {
- Assert.assertEquals(line, ("Test." + i + "." + j));
+ Assert.assertEquals(("Test." + i + "." + j), line);
if (++j > txnMax) {
j = 1;
i++;
Modified: incubator/flume/branches/flume-728/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/pom.xml?rev=1222508&r1=1222507&r2=1222508&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/pom.xml (original)
+++ incubator/flume/branches/flume-728/pom.xml Thu Dec 22 23:20:46 2011
@@ -38,22 +38,65 @@ limitations under the License.
<test.include.pattern>**/Test*.java</test.include.pattern>
</properties>
- <profiles>
+ <modules>
+ <module>flume-ng-core</module>
+ <module>flume-ng-sinks</module>
+ <module>flume-ng-node</module>
+ <module>flume-ng-dist</module>
+ <module>flume-ng-channels</module>
+ </modules>
+
+ <profiles>
<profile>
- <id>ng</id>
+ <id>hadoop-0.20.205.0</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>!hadoop.profile</name>
+ </property>
</activation>
- <modules>
- <module>flume-ng-core</module>
- <module>flume-ng-sinks</module>
- <module>flume-ng-node</module>
- <module>flume-ng-dist</module>
- <module>flume-ng-channels</module>
- </modules>
+ <properties>
+ <hadoop.version>0.20.205.0</hadoop.version>
+ <hadoop.common.artifact.id>hadoop-core</hadoop.common.artifact.id>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>${hadoop.common.artifact.id}</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</profile>
+ <profile>
+ <id>hadoop-0.23</id>
+ <activation>
+ <property>
+ <name>hadoop.profile</name>
+ <value>23</value>
+ </property>
+ </activation>
+ <properties>
+ <hadoop.version>0.23.1-SNAPSHOT</hadoop.version>
+ <hadoop.common.artifact.id>hadoop-common</hadoop.common.artifact.id>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>${hadoop.common.artifact.id}</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
</profiles>
<inceptionYear>2009</inceptionYear>
@@ -450,6 +493,18 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</version>
+ </dependency>
+
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>r07</version>
@@ -508,6 +563,12 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>1.5.11</version>
+ </dependency>
+
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>1.4</version>
@@ -591,8 +652,8 @@ limitations under the License.
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>0.20.2-CDH3B4</version>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>