Projects >> storm-cassandra >>ba322d8eae18f924df04e7f9e3b224dd222c1282

Chunk
Conflicting content 
import com.hmsonline.storm.cassandra.bolt.mapper.TridentColumnMapper;
import com.hmsonline.storm.cassandra.bolt.mapper.TridentTupleMapper;
import com.hmsonline.storm.cassandra.client.AstyanaxClient;
<<<<<<< HEAD
=======
import com.hmsonline.storm.cassandra.client.CassandraClient;
import java.util.ArrayList;
import storm.trident.operation.Filter;
>>>>>>> 4ebcb502076a03e359333b98df1b2b26ef62897b

public class TridentCassandraLookupFunction implements Function {
    private static final long serialVersionUID = 12132012L;
Solution content 
import com.hmsonline.storm.cassandra.bolt.mapper.TridentColumnMapper;
import com.hmsonline.storm.cassandra.bolt.mapper.TridentTupleMapper;
import com.hmsonline.storm.cassandra.client.AstyanaxClient;
<<<<<<< HEAD
=======
import com.hmsonline.storm.cassandra.client.CassandraClient;
import java.util.ArrayList;
import storm.trident.operation.Filter;
>>>>>>> 4ebcb502076a03e359333b98df1b2b26ef62897b

public class TridentCassandraLookupFunction implements Function {
    private static final long serialVersionUID = 12132012L;
File
TridentCassandraLookupFunction.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
    private AstyanaxClient client;
    private String clientConfigKey;

<<<<<<< HEAD
    public TridentCassandraLookupFunction(String clientConfigKey, TridentTupleMapper tupleMapper,
            TridentColumnMapper columnMapper) {
=======
    private Filter tupleFilter = null;      // used to prevent processing for tuples that should be skipped by the lookup
    private int numberOfOutputFields = 1;   // used to emit when the incoming tuple doesn't pass the filter check
    private boolean emitEmptyOnFailure = false;

    public TridentCassandraLookupFunction(String clientConfigKey, TridentTupleMapper tupleMapper,
            TridentColumnMapper columnMapper, Class columnNameClass, Class columnValueClass) {
        this.columnNameClass = columnNameClass;
        this.columnValueClass = columnValueClass;
>>>>>>> 4ebcb502076a03e359333b98df1b2b26ef62897b
        this.columnsMapper = columnMapper;
        this.tupleMapper = tupleMapper;
        this.clientConfigKey = clientConfigKey;
Solution content 
    private AstyanaxClient client;
    private String clientConfigKey;

<<<<<<< HEAD
    public TridentCassandraLookupFunction(String clientConfigKey, TridentTupleMapper tupleMapper,
            TridentColumnMapper columnMapper) {
=======
    private Filter tupleFilter = null;      // used to prevent processing for tuples that should be skipped by the lookup
    private int numberOfOutputFields = 1;   // used to emit when the incoming tuple doesn't pass the filter check
    private boolean emitEmptyOnFailure = false;

    public TridentCassandraLookupFunction(String clientConfigKey, TridentTupleMapper tupleMapper,
            TridentColumnMapper columnMapper, Class columnNameClass, Class columnValueClass) {
        this.columnNameClass = columnNameClass;
        this.columnValueClass = columnValueClass;
>>>>>>> 4ebcb502076a03e359333b98df1b2b26ef62897b
        this.columnsMapper = columnMapper;
        this.tupleMapper = tupleMapper;
        this.clientConfigKey = clientConfigKey;
File
TridentCassandraLookupFunction.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment
Method signature
Chunk
Conflicting content 
    @Override
    public void execute(TridentTuple input, TridentCollector collector) {
        String columnFamily = tupleMapper.mapToColumnFamily(input);
<<<<<<< HEAD
        K rowKey = tupleMapper.mapToRowKey(input);
        C start = tupleMapper.mapToStartKey(input);
        C end = tupleMapper.mapToEndKey(input);
=======
        String rowKey = tupleMapper.mapToRowKey(input);
        if (tupleFilter != null && !tupleFilter.isKeep(input)) {
            collector.emit(createEmptyValues());
            return;
        }
        Object start = tupleMapper.mapToStartKey(input);
        Object end = tupleMapper.mapToEndKey(input);
>>>>>>> 4ebcb502076a03e359333b98df1b2b26ef62897b

        try {
            Map colMap = null;
Solution content 
    @Override
    public void execute(TridentTuple input, TridentCollector collector) {
        String columnFamily = tupleMapper.mapToColumnFamily(input);
<<<<<<< HEAD
        K rowKey = tupleMapper.mapToRowKey(input);
        C start = tupleMapper.mapToStartKey(input);
        C end = tupleMapper.mapToEndKey(input);
=======
        String rowKey = tupleMapper.mapToRowKey(input);
        if (tupleFilter != null && !tupleFilter.isKeep(input)) {
            collector.emit(createEmptyValues());
            return;
        }
        Object start = tupleMapper.mapToStartKey(input);
        Object end = tupleMapper.mapToEndKey(input);
>>>>>>> 4ebcb502076a03e359333b98df1b2b26ef62897b

        try {
            Map colMap = null;
File
TridentCassandraLookupFunction.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Variable