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

Went a little apesh*t on the pom #6

Merged
merged 2 commits into from Jan 13, 2012
Merged

Went a little apesh*t on the pom #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f6cdc2
cleaned up pom file, added main directory, timeuuid and cassandra-thr…
Jan 13, 2012
10df977
removed cassandra-all ref, fixed version
Jan 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
138 changes: 77 additions & 61 deletions pom.xml
View file
Open in desktop
@@ -1,74 +1,90 @@
<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">
<modelVersion>4.0.0</modelVersion>
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>

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

<name>Flume Cassandra Plugin</name>
<url>http://maven.apache.org</url>
<name>Flume Cassandra Plugin</name>
<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>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<issueManagement>
<system>github</system>
<url>http://github.com/thobbs/flume-cassandra-plugin/issues</url>
</issueManagement>

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

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

<dependencies>

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

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

<dependency>
<groupId>com.eaio.uuid</groupId>
<artifactId>uuid</artifactId>
<version>3.2</version>
</dependency>
<dependency>
<groupId>com.cloudera.flume</groupId>
<artifactId>flume</artifactId>
<version>0.9.3-CDH3B4</version>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.3.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependency>
<groupId>com.github.stephenc.eaio-uuid</groupId>
<artifactId>uuid</artifactId>
<version>3.2.0</version>
</dependency>

<repositories>
<repository>
<id>cdh repository</id>
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
</repository>

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


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

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

import org.apache.cassandra.thrift.Column;
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.SinkFactory.SinkBuilder;
Expand Down Expand Up @@ -45,8 +40,6 @@ public class LogsandraSyslogSink extends EventSink.Base {

private CassandraClient cClient;

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

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

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;

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

String date = getDate();
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};

Long time = System.currentTimeMillis() * MILLI_TO_MICRO;

Column timeColumn = new Column();
timeColumn.setName(toBytes(time));
timeColumn.setName(toBytes(timestamp));
timeColumn.setValue(uuid.toString().getBytes());
timeColumn.setTimestamp(timestamp);

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