Projects >> hector >>4d8c96fca2f4955d04ab97859012ea7c66a535c5

Chunk
Conflicting content 
    return pendingMutations;
  }

<<<<<<< HEAD
  @Override
  public  Mutator addSubDelete(K key, String cf, SN sColumnName,
      N columnName, Serializer sNameSerializer, Serializer nameSerializer) {
    return addSubDelete(key, cf, sColumnName, columnName, sNameSerializer, nameSerializer, keyspace.createClock());
  }
  
  @Override
  public  Mutator addSubDelete(K key, String cf, SN sColumnName,
      N columnName, Serializer sNameSerializer, Serializer nameSerializer, long clock) {
    Deletion d = new Deletion(clock);            
    SlicePredicate predicate = new SlicePredicate();
    predicate.addToColumn_names(nameSerializer.toByteBuffer(columnName));
    d.setPredicate(predicate);
    d.setSuper_column(sNameSerializer.toByteBuffer(sColumnName));
    getPendingMutations().addDeletion(key, Arrays.asList(cf), d);
    return this;
  }


  
  @Override
  public  Mutator addSuperDelete(K key, String cf, SN sColumnName,
      Serializer sNameSerializer) {    
    Deletion d = new Deletion();            
    d.setSuper_column(sNameSerializer.toByteBuffer(sColumnName));
    getPendingMutations().addDeletion(key, Arrays.asList(cf), d);   
    return this;
  }
=======
>>>>>>> c85bb564040f60b32e5c5477d368649c792bf6fb

}
Solution content 
    return pendingMutations;
  }


  @Override
  public  Mutator addSubDelete(K key, String cf, SN sColumnName,
      N columnName, Serializer sNameSerializer, Serializer nameSerializer) {
    return addSubDelete(key, cf, sColumnName, columnName, sNameSerializer, nameSerializer, keyspace.createClock());
  }
  
  @Override
  public  Mutator addSubDelete(K key, String cf, SN sColumnName,
      N columnName, Serializer sNameSerializer, Serializer nameSerializer, long clock) {
    Deletion d = new Deletion(clock);            
    SlicePredicate predicate = new SlicePredicate();
    predicate.addToColumn_names(nameSerializer.toByteBuffer(columnName));
    d.setPredicate(predicate);
    d.setSuper_column(sNameSerializer.toByteBuffer(sColumnName));
    getPendingMutations().addDeletion(key, Arrays.asList(cf), d);
    return this;
  }


  
  @Override
  public  Mutator addSuperDelete(K key, String cf, SN sColumnName,
      Serializer sNameSerializer) {    
    Deletion d = new Deletion();            
    d.setSuper_column(sNameSerializer.toByteBuffer(sColumnName));
    getPendingMutations().addDeletion(key, Arrays.asList(cf), d);   
    return this;
  }

}
File
MutatorImpl.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
      final N columnName, final Serializer sNameSerializer, final Serializer nameSerializer);
  
  /**
<<<<<<< HEAD
   * Deletes a supercolumn immediately
   * @param  super column type
   */
   MutationResult superDelete(K key, String cf, SN supercolumnName,
      Serializer sNameSerializer);
  
  /**
   * batches a super column for deletion
   * 
   */
   Mutator addSuperDelete(K key, String cf, SN sColumnName, Serializer sNameSerializer);
  
=======
   * Deletes a supercolumn
   * @param  super column type
   */
   MutationResult superDelete(final K key, final String cf, final SN supercolumnName,
      final Serializer sNameSerializer);

>>>>>>> c85bb564040f60b32e5c5477d368649c792bf6fb

  // schedule an insertion to be executed in batch by the execute method
  // CAVEAT: a large number of calls with a typo in one of them will leave things in an
Solution content 
      final N columnName, final Serializer sNameSerializer, final Serializer nameSerializer);
  
  /**
   * Deletes a supercolumn immediately
   * @param  super column type
   */
   MutationResult superDelete(K key, String cf, SN supercolumnName,
      Serializer sNameSerializer);
  
  /**
   * batches a super column for deletion
   * 
   */
   Mutator addSuperDelete(K key, String cf, SN sColumnName, Serializer sNameSerializer);
  

  // schedule an insertion to be executed in batch by the execute method
  // CAVEAT: a large number of calls with a typo in one of them will leave things in an
File
Mutator.java
Developer's decision
Version 1
Kind of conflict
Comment
Method interface