Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade to storm 1.0.1 / cassandra 3.0.0 #65

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

upgrade to storm 1.0.1 / cassandra 3.0.0 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</repositories>

<properties>
<storm.version>0.9.1-incubating</storm.version>
<storm.version>1.0.1</storm.version>
<cassandra.version>1.2.5</cassandra.version>
</properties>

Expand Down Expand Up @@ -88,19 +88,19 @@
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
<version>2.0.2.2</version>
<version>3.0.0.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>16.0.1</version>
<version>18.0</version>
</dependency>
<dependency>
<groupId>net.jpountz.lz4</groupId>
<artifactId>lz4</artifactId>
<version>1.2.0</version>
</dependency>
</dependencies>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
</dependencies>
<build>

<plugins>
Expand Down Expand Up @@ -139,10 +139,24 @@
</plugins>
</build>
<profiles>
<profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/com/hmsonline/trident/cql/CassandraCqlMapState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import storm.trident.state.OpaqueValue;
import storm.trident.state.StateFactory;
import storm.trident.state.StateType;
import storm.trident.state.TransactionalValue;
import storm.trident.state.map.IBackingMap;
import backtype.storm.Config;
import backtype.storm.metric.api.CountMetric;
import backtype.storm.task.IMetricsContext;
import backtype.storm.topology.ReportedFailedException;
import org.apache.storm.trident.state.OpaqueValue;
import org.apache.storm.trident.state.StateFactory;
import org.apache.storm.trident.state.StateType;
import org.apache.storm.trident.state.TransactionalValue;
import org.apache.storm.trident.state.map.IBackingMap;
import org.apache.storm.Config;
import org.apache.storm.metric.api.CountMetric;
import org.apache.storm.task.IMetricsContext;
import org.apache.storm.topology.ReportedFailedException;

import com.datastax.driver.core.BatchStatement;
import com.datastax.driver.core.BatchStatement.Type;
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/com/hmsonline/trident/cql/CassandraCqlMapStateFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
import java.util.Map;

import com.datastax.driver.core.Session;
import storm.trident.state.State;
import storm.trident.state.StateFactory;
import storm.trident.state.StateType;
import storm.trident.state.map.CachedMap;
import storm.trident.state.map.MapState;
import storm.trident.state.map.NonTransactionalMap;
import storm.trident.state.map.OpaqueMap;
import storm.trident.state.map.SnapshottableMap;
import storm.trident.state.map.TransactionalMap;
import backtype.storm.task.IMetricsContext;
import backtype.storm.tuple.Values;
import org.apache.storm.trident.state.State;
import org.apache.storm.trident.state.StateFactory;
import org.apache.storm.trident.state.StateType;
import org.apache.storm.trident.state.map.CachedMap;
import org.apache.storm.trident.state.map.MapState;
import org.apache.storm.trident.state.map.NonTransactionalMap;
import org.apache.storm.trident.state.map.OpaqueMap;
import org.apache.storm.trident.state.map.SnapshottableMap;
import org.apache.storm.trident.state.map.TransactionalMap;
import org.apache.storm.task.IMetricsContext;
import org.apache.storm.tuple.Values;

import com.hmsonline.trident.cql.CassandraCqlMapState.Options;
import com.hmsonline.trident.cql.mappers.CqlRowMapper;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/hmsonline/trident/cql/CassandraCqlState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import storm.trident.state.State;
import org.apache.storm.trident.state.State;

import com.datastax.driver.core.BatchStatement;
import com.datastax.driver.core.BatchStatement.Type;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/hmsonline/trident/cql/CassandraCqlStateFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import storm.trident.state.State;
import storm.trident.state.StateFactory;
import backtype.storm.task.IMetricsContext;
import org.apache.storm.trident.state.State;
import org.apache.storm.trident.state.StateFactory;
import org.apache.storm.task.IMetricsContext;

import com.datastax.driver.core.ConsistencyLevel;

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/hmsonline/trident/cql/CassandraCqlStateUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import storm.trident.operation.TridentCollector;
import storm.trident.operation.TridentOperationContext;
import storm.trident.state.StateUpdater;
import storm.trident.tuple.TridentTuple;
import org.apache.storm.trident.operation.TridentCollector;
import org.apache.storm.trident.operation.TridentOperationContext;
import org.apache.storm.trident.state.StateUpdater;
import org.apache.storm.trident.tuple.TridentTuple;

import java.util.List;
import java.util.Map;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/hmsonline/trident/cql/incremental/CassandraCqlIncrementalState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import storm.trident.operation.CombinerAggregator;
import storm.trident.state.State;
import storm.trident.tuple.TridentTuple;
import org.apache.storm.trident.operation.CombinerAggregator;
import org.apache.storm.trident.state.State;
import org.apache.storm.trident.tuple.TridentTuple;

import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/hmsonline/trident/cql/incremental/CassandraCqlIncrementalStateFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import storm.trident.operation.CombinerAggregator;
import storm.trident.state.State;
import storm.trident.state.StateFactory;
import backtype.storm.task.IMetricsContext;
import org.apache.storm.trident.operation.CombinerAggregator;
import org.apache.storm.trident.state.State;
import org.apache.storm.trident.state.StateFactory;
import org.apache.storm.task.IMetricsContext;

import com.hmsonline.trident.cql.CqlClientFactory;
import com.hmsonline.trident.cql.MapConfiguredCqlClientFactory;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/hmsonline/trident/cql/incremental/CassandraCqlIncrementalStateUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import storm.trident.operation.TridentCollector;
import storm.trident.operation.TridentOperationContext;
import storm.trident.state.StateUpdater;
import storm.trident.tuple.TridentTuple;
import org.apache.storm.trident.operation.TridentCollector;
import org.apache.storm.trident.operation.TridentOperationContext;
import org.apache.storm.trident.state.StateUpdater;
import org.apache.storm.trident.tuple.TridentTuple;

import java.util.List;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/hmsonline/trident/cql/incremental/CqlIncrementMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.List;

import storm.trident.tuple.TridentTuple;
import org.apache.storm.trident.tuple.TridentTuple;

import com.datastax.driver.core.Row;
import com.datastax.driver.core.Statement;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/hmsonline/trident/cql/mappers/CqlTupleMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.hmsonline.trident.cql.mappers;

import storm.trident.tuple.TridentTuple;
import org.apache.storm.trident.tuple.TridentTuple;

import com.datastax.driver.core.Statement;

Expand Down
11 changes: 5 additions & 6 deletions src/test/java/com/hmsonline/trident/cql/CassandraCqlStateUpdaterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
import com.datastax.driver.core.Statement;
import com.hmsonline.trident.cql.mappers.CqlTupleMapper;
import junit.framework.TestCase;
import org.apache.storm.trident.operation.TridentCollector;
import org.apache.storm.trident.tuple.TridentTuple;
import org.apache.storm.trident.tuple.TridentTupleView;
import org.apache.storm.tuple.Fields;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import storm.trident.operation.TridentCollector;
import storm.trident.testing.MockTridentTuple;
import storm.trident.tuple.TridentTuple;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -34,9 +35,7 @@ public void testTuplesPropagation() throws Exception {

private List<TridentTuple> getTridentTuples() {
List<TridentTuple> tuples = new ArrayList<TridentTuple>();
List<String> mockFieldList = new ArrayList<String>();
mockFieldList.add("testField");
TridentTuple tuple = new MockTridentTuple(mockFieldList, "testValue");
TridentTuple tuple = TridentTupleView.createFreshTuple(new Fields("testField"), "testValue");
tuples.add(tuple);
return tuples;
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/hmsonline/trident/cql/example/sales/SalesEmitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.hmsonline.trident.cql.example.sales;

import storm.trident.operation.TridentCollector;
import storm.trident.spout.ITridentSpout.Emitter;
import storm.trident.topology.TransactionAttempt;
import org.apache.storm.trident.operation.TridentCollector;
import org.apache.storm.trident.spout.ITridentSpout.Emitter;
import org.apache.storm.trident.topology.TransactionAttempt;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/hmsonline/trident/cql/example/sales/SalesMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.io.Serializable;
import java.util.List;

import storm.trident.tuple.TridentTuple;
import org.apache.storm.trident.tuple.TridentTuple;

import com.datastax.driver.core.Row;
import com.datastax.driver.core.Statement;
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/hmsonline/trident/cql/example/sales/SalesSpout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.hmsonline.trident.cql.example.sales;

import backtype.storm.spout.SpoutOutputCollector;
import backtype.storm.task.TopologyContext;
import backtype.storm.tuple.Fields;
import org.apache.storm.spout.SpoutOutputCollector;
import org.apache.storm.task.TopologyContext;
import org.apache.storm.tuple.Fields;

import com.hmsonline.trident.cql.example.simpleupdate.DefaultCoordinator;

import storm.trident.spout.ITridentSpout;
import org.apache.storm.trident.spout.ITridentSpout;

import java.util.Map;

Expand Down
14 changes: 7 additions & 7 deletions src/test/java/com/hmsonline/trident/cql/example/sales/SalesTopology.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import storm.trident.Stream;
import storm.trident.TridentTopology;
import storm.trident.operation.builtin.Sum;
import backtype.storm.Config;
import backtype.storm.LocalCluster;
import backtype.storm.generated.StormTopology;
import backtype.storm.tuple.Fields;
import org.apache.storm.trident.Stream;
import org.apache.storm.trident.TridentTopology;
import org.apache.storm.trident.operation.builtin.Sum;
import org.apache.storm.Config;
import org.apache.storm.LocalCluster;
import org.apache.storm.generated.StormTopology;
import org.apache.storm.tuple.Fields;

import com.hmsonline.trident.cql.MapConfiguredCqlClientFactory;
import com.hmsonline.trident.cql.incremental.CassandraCqlIncrementalStateFactory;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/hmsonline/trident/cql/example/simpleupdate/DefaultCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import storm.trident.spout.ITridentSpout.BatchCoordinator;
import org.apache.storm.trident.spout.ITridentSpout.BatchCoordinator;

import java.io.Serializable;

Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/hmsonline/trident/cql/example/simpleupdate/SimpleUpdateEmitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.hmsonline.trident.cql.example.simpleupdate;

import storm.trident.operation.TridentCollector;
import storm.trident.spout.ITridentSpout.Emitter;
import storm.trident.topology.TransactionAttempt;
import org.apache.storm.trident.operation.TridentCollector;
import org.apache.storm.trident.spout.ITridentSpout.Emitter;
import org.apache.storm.trident.topology.TransactionAttempt;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/hmsonline/trident/cql/example/simpleupdate/SimpleUpdateMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import java.io.Serializable;

import storm.trident.tuple.TridentTuple;
import org.apache.storm.trident.tuple.TridentTuple;

import com.datastax.driver.core.Row;
import com.datastax.driver.core.Statement;
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/hmsonline/trident/cql/example/simpleupdate/SimpleUpdateSpout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.hmsonline.trident.cql.example.simpleupdate;

import backtype.storm.spout.SpoutOutputCollector;
import backtype.storm.task.TopologyContext;
import backtype.storm.tuple.Fields;
import storm.trident.spout.ITridentSpout;
import org.apache.storm.spout.SpoutOutputCollector;
import org.apache.storm.task.TopologyContext;
import org.apache.storm.tuple.Fields;
import org.apache.storm.trident.spout.ITridentSpout;

import java.util.Map;

Expand Down
12 changes: 6 additions & 6 deletions src/test/java/com/hmsonline/trident/cql/example/simpleupdate/SimpleUpdateTopology.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import storm.trident.Stream;
import storm.trident.TridentTopology;
import backtype.storm.Config;
import backtype.storm.LocalCluster;
import backtype.storm.generated.StormTopology;
import backtype.storm.tuple.Fields;
import org.apache.storm.trident.Stream;
import org.apache.storm.trident.TridentTopology;
import org.apache.storm.Config;
import org.apache.storm.LocalCluster;
import org.apache.storm.generated.StormTopology;
import org.apache.storm.tuple.Fields;

import com.datastax.driver.core.ConsistencyLevel;
import com.hmsonline.trident.cql.CassandraCqlStateFactory;
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/hmsonline/trident/cql/example/wordcount/IntegerCount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.hmsonline.trident.cql.example.wordcount;

import storm.trident.operation.CombinerAggregator;
import storm.trident.tuple.TridentTuple;
import org.apache.storm.trident.operation.CombinerAggregator;
import org.apache.storm.trident.tuple.TridentTuple;


public class IntegerCount implements CombinerAggregator<Integer> {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/hmsonline/trident/cql/example/wordcount/WordCountAndSourceMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.io.Serializable;
import java.util.List;

import storm.trident.tuple.TridentTuple;
import org.apache.storm.trident.tuple.TridentTuple;

import com.datastax.driver.core.Row;
import com.datastax.driver.core.Statement;
Expand Down
Loading