Skip to content

Commit

Permalink
Fix really terrible misspelling of mutator.
Browse files Browse the repository at this point in the history
This is not a backwards-compatible change, but I doubt anyone is
implementing MutatorOperations -- at least, anyone who wouldn't prefer
them to be spelled correctly.
  • Loading branch information
dustin committed Feb 13, 2009
1 parent e3a676c commit dc36730
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions src/main/java/net/spy/memcached/OperationFactory.java
Expand Up @@ -10,7 +10,7 @@
import net.spy.memcached.ops.GetOperation;
import net.spy.memcached.ops.GetsOperation;
import net.spy.memcached.ops.KeyedOperation;
import net.spy.memcached.ops.MutatatorOperation;
import net.spy.memcached.ops.MutatorOperation;
import net.spy.memcached.ops.Mutator;
import net.spy.memcached.ops.NoopOperation;
import net.spy.memcached.ops.Operation;
Expand Down Expand Up @@ -90,7 +90,7 @@ public interface OperationFactory {
* @param cb the status callback
* @return the new mutator operation
*/
MutatatorOperation mutate(Mutator m, String key, int by,
MutatorOperation mutate(Mutator m, String key, int by,
long def, int exp, OperationCallback cb);

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/spy/memcached/ops/BaseOperationFactory.java
Expand Up @@ -42,8 +42,8 @@ public Collection<Operation> clone(KeyedOperation op) {
cop.getBytes(), cop.getCallback()));
} else if(op instanceof DeleteOperation) {
rv.add(delete(first(op.getKeys()), op.getCallback()));
} else if(op instanceof MutatatorOperation) {
MutatatorOperation mo = (MutatatorOperation)op;
} else if(op instanceof MutatorOperation) {
MutatorOperation mo = (MutatorOperation)op;
rv.add(mutate(mo.getType(), first(op.getKeys()),
mo.getBy(), mo.getDefault(), mo.getExpiration(),
op.getCallback()));
Expand Down
Expand Up @@ -3,7 +3,7 @@
/**
* incr and decr operations.
*/
public interface MutatatorOperation extends KeyedOperation {
public interface MutatorOperation extends KeyedOperation {

/**
* Get the mutator type used for this operation.
Expand Down
Expand Up @@ -13,7 +13,7 @@
import net.spy.memcached.ops.GetsOperation;
import net.spy.memcached.ops.KeyedOperation;
import net.spy.memcached.ops.MultiGetOperationCallback;
import net.spy.memcached.ops.MutatatorOperation;
import net.spy.memcached.ops.MutatorOperation;
import net.spy.memcached.ops.Mutator;
import net.spy.memcached.ops.NoopOperation;
import net.spy.memcached.ops.Operation;
Expand Down Expand Up @@ -48,7 +48,7 @@ public GetsOperation gets(String key, GetsOperation.Callback cb) {
return new GetsOperationImpl(key, cb);
}

public MutatatorOperation mutate(Mutator m, String key, int by,
public MutatorOperation mutate(Mutator m, String key, int by,
long exp, int def, OperationCallback cb) {
return new MutatorOperationImpl(m, key, by, cb);
}
Expand Down
Expand Up @@ -7,7 +7,7 @@
import java.util.Collections;

import net.spy.memcached.KeyUtil;
import net.spy.memcached.ops.MutatatorOperation;
import net.spy.memcached.ops.MutatorOperation;
import net.spy.memcached.ops.Mutator;
import net.spy.memcached.ops.OperationCallback;
import net.spy.memcached.ops.OperationState;
Expand All @@ -17,7 +17,7 @@
* Operation for mutating integers inside of memcached.
*/
final class MutatorOperationImpl extends OperationImpl
implements MutatatorOperation {
implements MutatorOperation {

public static final int OVERHEAD=32;

Expand Down
Expand Up @@ -14,7 +14,7 @@
import net.spy.memcached.ops.KeyedOperation;
import net.spy.memcached.ops.MultiGetOperationCallback;
import net.spy.memcached.ops.MultiGetsOperationCallback;
import net.spy.memcached.ops.MutatatorOperation;
import net.spy.memcached.ops.MutatorOperation;
import net.spy.memcached.ops.Mutator;
import net.spy.memcached.ops.NoopOperation;
import net.spy.memcached.ops.Operation;
Expand Down Expand Up @@ -51,7 +51,7 @@ public GetsOperation gets(String key, GetsOperation.Callback cb) {
return new GetOperationImpl(key, cb);
}

public MutatatorOperation mutate(Mutator m, String key, int by,
public MutatorOperation mutate(Mutator m, String key, int by,
long def, int exp, OperationCallback cb) {
return new MutatorOperationImpl(m, key, by, def, exp, cb);
}
Expand Down
Expand Up @@ -3,13 +3,13 @@
import java.util.Collection;
import java.util.Collections;

import net.spy.memcached.ops.MutatatorOperation;
import net.spy.memcached.ops.MutatorOperation;
import net.spy.memcached.ops.Mutator;
import net.spy.memcached.ops.OperationCallback;
import net.spy.memcached.ops.OperationStatus;

class MutatorOperationImpl extends OperationImpl implements
MutatatorOperation {
MutatorOperation {

private static final int CMD_INCR=5;
private static final int CMD_DECR=6;
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/net/spy/memcached/OperationFactoryTestBase.java
Expand Up @@ -13,7 +13,7 @@
import net.spy.memcached.ops.GetOperation;
import net.spy.memcached.ops.GetsOperation;
import net.spy.memcached.ops.KeyedOperation;
import net.spy.memcached.ops.MutatatorOperation;
import net.spy.memcached.ops.MutatorOperation;
import net.spy.memcached.ops.Mutator;
import net.spy.memcached.ops.Operation;
import net.spy.memcached.ops.OperationCallback;
Expand Down Expand Up @@ -81,10 +81,10 @@ public void testMutatorOperationIncrCloning() {
int exp = 823862;
long def = 28775;
int by = 7735;
MutatatorOperation op = ofact.mutate(Mutator.incr, TEST_KEY, by, def,
MutatorOperation op = ofact.mutate(Mutator.incr, TEST_KEY, by, def,
exp, genericCallback);

MutatatorOperation op2 = cloneOne(MutatatorOperation.class, op);
MutatorOperation op2 = cloneOne(MutatorOperation.class, op);
assertKey(op2);
assertEquals(exp, op2.getExpiration());
assertEquals(def, op2.getDefault());
Expand All @@ -97,10 +97,10 @@ public void testMutatorOperationDecrCloning() {
int exp = 823862;
long def = 28775;
int by = 7735;
MutatatorOperation op = ofact.mutate(Mutator.decr, TEST_KEY, by, def,
MutatorOperation op = ofact.mutate(Mutator.decr, TEST_KEY, by, def,
exp, genericCallback);

MutatatorOperation op2 = cloneOne(MutatatorOperation.class, op);
MutatorOperation op2 = cloneOne(MutatorOperation.class, op);
assertKey(op2);
assertEquals(exp, op2.getExpiration());
assertEquals(def, op2.getDefault());
Expand Down
Expand Up @@ -2,7 +2,7 @@

import net.spy.memcached.OperationFactory;
import net.spy.memcached.OperationFactoryTestBase;
import net.spy.memcached.ops.MutatatorOperation;
import net.spy.memcached.ops.MutatorOperation;
import net.spy.memcached.ops.Mutator;

public class OperationFactoryTest extends OperationFactoryTestBase {
Expand All @@ -17,10 +17,10 @@ public void testMutatorOperationIncrCloning() {
int exp = 823862;
long def = 28775;
int by = 7735;
MutatatorOperation op = ofact.mutate(Mutator.incr, TEST_KEY, by, def,
MutatorOperation op = ofact.mutate(Mutator.incr, TEST_KEY, by, def,
exp, genericCallback);

MutatatorOperation op2 = cloneOne(MutatatorOperation.class, op);
MutatorOperation op2 = cloneOne(MutatorOperation.class, op);
assertKey(op2);
assertEquals(-1, op2.getExpiration());
assertEquals(-1, op2.getDefault());
Expand All @@ -34,10 +34,10 @@ public void testMutatorOperationDecrCloning() {
int exp = 823862;
long def = 28775;
int by = 7735;
MutatatorOperation op = ofact.mutate(Mutator.decr, TEST_KEY, by, def,
MutatorOperation op = ofact.mutate(Mutator.decr, TEST_KEY, by, def,
exp, genericCallback);

MutatatorOperation op2 = cloneOne(MutatatorOperation.class, op);
MutatorOperation op2 = cloneOne(MutatorOperation.class, op);
assertKey(op2);
assertEquals(-1, op2.getExpiration());
assertEquals(-1, op2.getDefault());
Expand Down

0 comments on commit dc36730

Please sign in to comment.