Projects >> hector >>562af4e520c38566d5724d2042fec0ebabb0c017

Chunk
Conflicting content 
    super(ko, keySerializer, nameSerializer, valueSerializer);
  }

<<<<<<< HEAD
  public AbstractColumnQuery setKey(K key) {
=======
  @Override
  public ColumnQuery setKey(String key) {
>>>>>>> 5cf23febe9b3221963fb3bd325319831ddd083bf
    this.key = key;
    return this;
  }
Solution content 
    super(ko, keySerializer, nameSerializer, valueSerializer);
  }

  @Override
  public ColumnQuery setKey(K key) {
    this.key = key;
    return this;
  }
File
AbstractColumnQuery.java
Developer's decision
Manual
Kind of conflict
Annotation
Method signature
Chunk
Conflicting content 
  @Override
<<<<<<< HEAD
  }

  public AbstractColumnQuery setName(N name) {
=======
  public ColumnQuery setName(N name) {
>>>>>>> 5cf23febe9b3221963fb3bd325319831ddd083bf
    this.name = name;
    return this;
  }
Solution content 
  }

  @Override
  public ColumnQuery setName(N name) {
    this.name = name;
    return this;
  }
File
AbstractColumnQuery.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
  @SuppressWarnings("unchecked")
  @Override
<<<<<<< HEAD
  public AbstractColumnQuery setColumnFamily(String cf) {
    return (AbstractColumnQuery) super.setColumnFamily(cf);
=======
  public ColumnQuery setColumnFamily(String cf) {
    return (ColumnQuery) super.setColumnFamily(cf);
>>>>>>> 5cf23febe9b3221963fb3bd325319831ddd083bf
  }

  @Override
Solution content 
  @SuppressWarnings("unchecked")
  @Override
  public ColumnQuery setColumnFamily(String cf) {
    return (ColumnQuery) super.setColumnFamily(cf);
  }

  @Override
File
AbstractColumnQuery.java
Developer's decision
Manual
Kind of conflict
Cast expression
Method signature
Return statement
Chunk
Conflicting content 
    this.valueSerializer = valueSerializer;
  }

<<<<<<< HEAD
  public AbstractQuery setColumnFamily(String cf) {
=======
  public Query setColumnFamily(String cf) {
>>>>>>> 5cf23febe9b3221963fb3bd325319831ddd083bf
    this.columnFamilyName = cf;
    return this;
  }
Solution content 
    this.valueSerializer = valueSerializer;
  }

  public Query setColumnFamily(String cf) {
    this.columnFamilyName = cf;
    return this;
  }
File
AbstractQuery.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
import org.apache.cassandra.thrift.ColumnPath;
import org.apache.cassandra.thrift.SuperColumn;

<<<<<<< HEAD:src/main/java/me/prettyprint/cassandra/model/SuperColumnQuery.java
public class SuperColumnQuery extends AbstractQuery>
    implements Query> {

  private final Serializer sNameSerializer;
  private K key;
  private SN superName;

  /*package*/ public SuperColumnQuery(KeyspaceOperator keyspaceOperator,
      Serializer keySerializer, Serializer sNameSerializer, Serializer nameSerializer, Serializer valueSerializer) {
    super(keyspaceOperator, keySerializer, nameSerializer, valueSerializer);
    noneNull(sNameSerializer, nameSerializer, valueSerializer);
    this.sNameSerializer = sNameSerializer;
  }

  public SuperColumnQuery setKey(K key, Serializer keySerializer) {
    this.key = key;
    return this;
  }

  public SuperColumnQuery setSuperName(SN superName) {
    this.superName = superName;
    return this;
=======
/**
 * Thrift implementation of the SuperColumnQuery
 *
 * @author Ran Tavory
 *
 * @param 
 * @param 
 * @param 
 */
public final class ThriftSuperColumnQuery extends AbstractSuperColumnQuery
    implements SuperColumnQuery {

  /*package*/ public ThriftSuperColumnQuery(KeyspaceOperator keyspaceOperator,
      Serializer sNameSerializer, Serializer nameSerializer, Serializer valueSerializer) {
    super(keyspaceOperator, sNameSerializer, nameSerializer, valueSerializer);
>>>>>>> 5cf23febe9b3221963fb3bd325319831ddd083bf:src/main/java/me/prettyprint/cassandra/model/ThriftSuperColumnQuery.java
  }

  @Override
Solution content 
import org.apache.cassandra.thrift.ColumnPath;
import org.apache.cassandra.thrift.SuperColumn;

/**
 * Thrift implementation of the SuperColumnQuery
 *
 * @author Ran Tavory
 *
 * @param 
 * @param 
 * @param 
 */
public final class ThriftSuperColumnQuery extends AbstractSuperColumnQuery
    implements SuperColumnQuery {

  /*package*/ public ThriftSuperColumnQuery(KeyspaceOperator keyspaceOperator,
      Serializer keySerializer,
      Serializer sNameSerializer,
      Serializer nameSerializer,
      Serializer valueSerializer) {
    super(keyspaceOperator, keySerializer, sNameSerializer, nameSerializer, valueSerializer);
  }

  @Override
File
ThriftSuperColumnQuery.java
Developer's decision
Manual
Kind of conflict
Attribute
Class signature
Comment
Method declaration
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
<<<<<<< HEAD

import me.prettyprint.cassandra.service.CassandraHostConfigurator;
import me.prettyprint.cassandra.service.Cluster;
import me.prettyprint.hector.api.query.ColumnQuery;
import org.apache.cassandra.thrift.Clock;
=======
import me.prettyprint.hector.api.query.SuperColumnQuery;
>>>>>>> 5cf23febe9b3221963fb3bd325319831ddd083bf
/**
 * A convenience class with bunch of factory static methods to help create a mutator,
 * queries etc.
Solution content 
import me.prettyprint.cassandra.service.CassandraHostConfigurator;
import me.prettyprint.cassandra.service.Cluster;
import me.prettyprint.hector.api.query.ColumnQuery;
import me.prettyprint.hector.api.query.SuperColumnQuery;

import org.apache.cassandra.thrift.Clock;

/**
 * A convenience class with bunch of factory static methods to help create a mutator,
 * queries etc.
File
HFactory.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
    return new SuperColumnQuery(ko, keySerializer, sNameSerializer, nameSerializer, valueSerializer);
  }

<<<<<<< HEAD
  public static  MultigetSliceQuery createMultigetSliceQuery(
      KeyspaceOperator ko, Serializer keySerializer, Serializer nameSerializer, Serializer valueSerializer) {
    return new MultigetSliceQuery(ko, keySerializer, nameSerializer, valueSerializer);
=======
  public static  SuperColumnQuery createSuperColumnQuery(KeyspaceOperator ko,
      Serializer sNameSerializer, Serializer nameSerializer, Serializer valueSerializer) {
    return new ThriftSuperColumnQuery(ko, sNameSerializer, nameSerializer, valueSerializer);
>>>>>>> 5cf23febe9b3221963fb3bd325319831ddd083bf
  }

  public static  SubColumnQuery createSubColumnQuery(KeyspaceOperator ko,
Solution content 
  }

  public static  MultigetSliceQuery createMultigetSliceQuery(
      KeyspaceOperator ko, Serializer keySerializer, Serializer nameSerializer, Serializer valueSerializer) {
    return new MultigetSliceQuery(ko, keySerializer, nameSerializer, valueSerializer);
  }

  public static  SubColumnQuery createSubColumnQuery(KeyspaceOperator ko,
File
HFactory.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Return statement