Skip to content
This repository has been archived by the owner on Aug 4, 2020. It is now read-only.

Commit

Permalink
cleaned up pom file, added main directory, timeuuid and cassandra-thr…
Browse files Browse the repository at this point in the history 
…ift jar to pom
  • Loading branch information
zznate committed Jan 13, 2012
1 parent e83822b commit 3f6cdc2
Show file tree
Hide file tree
Showing 5 changed files with 87 additions and 72 deletions.
144 changes: 83 additions & 61 deletions pom.xml
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,74 +1,96 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>


<groupId>org.apache.flume</groupId> <groupId>org.apache.flume</groupId>
<artifactId>flume-cassandra-plugin</artifactId> <artifactId>flume-cassandra-plugin</artifactId>
<version>1.0.0</version> <version>1.0.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>


<name>Flume Cassandra Plugin</name> <name>Flume Cassandra Plugin</name>
<url>http://maven.apache.org</url> <url>http://github.com/thobbs/flume-cassandra-plugin</url>
<licenses>
<license>
<name>MIT License</name>
<distribution>repo</distribution>
<url>https://github.com/thobbs/flume-cassandra-plugin/blob/master/LICENSE</url>
</license>
</licenses>
<scm>
<connection>scm:git:git://github.com/thobbs/flume-cassandra-plugin.git</connection>
<developerConnection>scm:git:git@github.com:thobbs/flume-cassandra-plugin.git</developerConnection>
<url>http://github.com/thobbs/flume-cassandra-plugin/tree/master/</url>
</scm>


<properties> <issueManagement>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <system>github</system>
</properties> <url>http://github.com/thobbs/flume-cassandra-plugin/issues</url>
</issueManagement>


<build> <distributionManagement>
<directory>target</directory> <site>
<outputDirectory>target/classes</outputDirectory> <id>github.com</id>
<url>gitsite:git@github.com/thobbs/flume-cassandra-plugin.git</url>
</site>
</distributionManagement>


<sourceDirectory>src/java</sourceDirectory> <properties>
<plugins> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<plugin> </properties>
<groupId>org.apache.maven.plugins</groupId> <build>
<artifactId>maven-compiler-plugin</artifactId> <plugins>
<version>2.3.2</version> <plugin>
<configuration> <groupId>org.apache.maven.plugins</groupId>
<source>1.6</source> <artifactId>maven-compiler-plugin</artifactId>
<target>1.6</target> <version>2.3.2</version>
</configuration> <configuration>
</plugin> <source>1.6</source>
</plugins> <target>1.6</target>
</build> </configuration>
</plugin>
</plugins>
</build>


<dependencies>


<dependency> <dependencies>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
<version>1.0.6</version>
</dependency>


<dependency> <dependency>
<groupId>com.cloudera.flume</groupId> <groupId>org.apache.cassandra</groupId>
<artifactId>flume</artifactId> <artifactId>cassandra-all</artifactId>
<version>0.9.3-CDH3B4</version> <version>1.0.6</version>
</dependency> </dependency>


<dependency> <dependency>
<groupId>com.eaio.uuid</groupId> <groupId>org.apache.cassandra</groupId>
<artifactId>uuid</artifactId> <artifactId>cassandra-thrift</artifactId>
<version>3.2</version> <version>1.0.6</version>
</dependency> </dependency>


<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>com.cloudera.flume</groupId>
<artifactId>testng</artifactId> <artifactId>flume</artifactId>
<version>6.3.1</version> <version>0.9.3-CDH3B4</version>
<scope>test</scope> </dependency>
</dependency>
</dependencies>


<repositories> <dependency>
<repository> <groupId>com.github.stephenc.eaio-uuid</groupId>
<id>cdh repository</id> <artifactId>uuid</artifactId>
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url> <version>3.2.0</version>
</repository> </dependency>


<repository> <dependency>
<id>eaio.com</id> <groupId>org.testng</groupId>
<url>http://eaio.com/maven2</url> <artifactId>testng</artifactId>
</repository> <version>6.3.1</version>
</repositories> <scope>test</scope>
</dependency>
</dependencies>


<repositories>
<repository>
<id>cdh repository</id>
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
</repository>
</repositories>
</project> </project>
0 ...a/plugins/flume/sink/CassandraClient.java → ...a/plugins/flume/sink/CassandraClient.java
View file
File renamed without changes.
15 changes: 4 additions & 11 deletions ...ugins/flume/sink/LogsandraSyslogSink.java → ...ugins/flume/sink/LogsandraSyslogSink.java
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,15 +1,10 @@
package org.apache.cassandra.plugins.flume.sink; package org.apache.cassandra.plugins.flume.sink;


import java.io.IOException; import java.io.IOException;
import java.util.Calendar; import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.TimeZone;


import org.apache.cassandra.thrift.Column; import org.apache.cassandra.thrift.Column;
import org.apache.cassandra.thrift.ConsistencyLevel; import org.apache.cassandra.thrift.ConsistencyLevel;
import org.safehaus.uuid.UUID;
import org.safehaus.uuid.UUIDGenerator;


import com.cloudera.flume.conf.Context; import com.cloudera.flume.conf.Context;
import com.cloudera.flume.conf.SinkFactory.SinkBuilder; import com.cloudera.flume.conf.SinkFactory.SinkBuilder;
Expand Down Expand Up @@ -45,8 +40,6 @@ public class LogsandraSyslogSink extends EventSink.Base {


private CassandraClient cClient; private CassandraClient cClient;


private static final UUIDGenerator uuidGen = UUIDGenerator.getInstance();

private static final long MILLI_TO_MICRO = 1000; // 1ms = 1000us private static final long MILLI_TO_MICRO = 1000; // 1ms = 1000us


public LogsandraSyslogSink(String[] servers) { public LogsandraSyslogSink(String[] servers) {
Expand All @@ -68,7 +61,7 @@ public void append(Event event) throws IOException, InterruptedException {


long timestamp = System.currentTimeMillis() * MILLI_TO_MICRO; long timestamp = System.currentTimeMillis() * MILLI_TO_MICRO;


UUID uuid = uuidGen.generateTimeBasedUUID(); UUID uuid = TimeUUIDUtils.getTimeUUID(timestamp);


String date = getDate(); String date = getDate();
String host = event.getHost(); String host = event.getHost();
Expand Down Expand Up @@ -119,9 +112,9 @@ public void append(Event event) throws IOException, InterruptedException {


Column[] entryColumns = {identColumn, sourceColumn, dateColumn, entryColumn}; Column[] entryColumns = {identColumn, sourceColumn, dateColumn, entryColumn};


Long time = System.currentTimeMillis() * MILLI_TO_MICRO;
Column timeColumn = new Column(); Column timeColumn = new Column();
timeColumn.setName(toBytes(time)); timeColumn.setName(toBytes(timestamp));
timeColumn.setValue(uuid.toString().getBytes()); timeColumn.setValue(uuid.toString().getBytes());
timeColumn.setTimestamp(timestamp); timeColumn.setTimestamp(timestamp);


Expand Down
0 ...ugins/flume/sink/SimpleCassandraSink.java → ...ugins/flume/sink/SimpleCassandraSink.java
View file
File renamed without changes.
0 ...dra/plugins/flume/sink/TimeUUIDUtils.java → ...dra/plugins/flume/sink/TimeUUIDUtils.java
View file
File renamed without changes.

0 comments on commit 3f6cdc2

Please sign in to comment.