Skip to content

Commit 090da95

Browse files
Mike Wiederholdingenthr
authored andcommitted
Changed all binary command opcode values to hexadecimal.
We intermixed hexidecimal and base 10 values throughout the code for any given binary operation. This commit changes all the base 10 values to hexadecimal. This way the opcode definitions match up better with the code in the memcached project. Change-Id: Ida6d144411c5c9257358a92fb2eaadc2527a94f7 Reviewed-on: http://review.couchbase.org/6950 Tested-by: Michael Wiederhold <[email protected]> Reviewed-by: Matt Ingenthron <[email protected]>
1 parent 0e5c16c commit 090da95

10 files changed

+18
-18
lines changed

src/main/java/net/spy/memcached/protocol/binary/DeleteOperationImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
class DeleteOperationImpl extends OperationImpl implements
1111
DeleteOperation {
1212

13-
private static final int CMD=4;
13+
private static final int CMD=0x04;
1414

1515
private final String key;
1616
private final long cas;

src/main/java/net/spy/memcached/protocol/binary/FlushOperationImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
class FlushOperationImpl extends OperationImpl implements FlushOperation {
77

8-
private static final int CMD=8;
8+
private static final int CMD=0x08;
99
private final int delay;
1010

1111
public FlushOperationImpl(OperationCallback cb) {

src/main/java/net/spy/memcached/protocol/binary/GetOperationImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class GetOperationImpl extends OperationImpl
1414
implements GetOperation, GetsOperation, GetlOperation,
1515
GetAndTouchOperation {
1616

17-
static final int GET_CMD=0;
17+
static final int GET_CMD=0x00;
1818
static final int GETL_CMD=0x94;
1919
static final int GAT_CMD=0x1d;
2020

src/main/java/net/spy/memcached/protocol/binary/MultiGetOperationImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class MultiGetOperationImpl extends OperationImpl implements GetOperation {
1818

19-
private static final int CMD_GETQ=9;
19+
private static final int CMD_GETQ=0x09;
2020

2121
private final Map<Integer, String> keys=new HashMap<Integer, String>();
2222
private final Map<Integer, byte[]> bkeys=new HashMap<Integer, byte[]>();

src/main/java/net/spy/memcached/protocol/binary/MutatorOperationImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
class MutatorOperationImpl extends OperationImpl implements
1212
MutatorOperation {
1313

14-
private static final int CMD_INCR=5;
15-
private static final int CMD_DECR=6;
14+
private static final int CMD_INCR=0x05;
15+
private static final int CMD_DECR=0x06;
1616

1717
private final Mutator mutator;
1818
private final String key;

src/main/java/net/spy/memcached/protocol/binary/NoopOperationImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
class NoopOperationImpl extends OperationImpl implements NoopOperation {
1010

11-
static final int CMD=10;
11+
static final int CMD=0x0a;
1212

1313
public NoopOperationImpl(OperationCallback cb) {
1414
super(CMD, generateOpaque(), cb);

src/main/java/net/spy/memcached/protocol/binary/OperationImpl.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ abstract class OperationImpl extends BaseOperationImpl implements Operation {
2727
/**
2828
* Error code for items that were not found.
2929
*/
30-
protected static final int ERR_NOT_FOUND = 1;
31-
protected static final int ERR_EXISTS = 2;
32-
protected static final int ERR_EINVAL = 4;
33-
protected static final int ERR_NOT_STORED = 5;
34-
protected static final int ERR_NOT_MY_VBUCKET = 7;
35-
protected static final int ERR_TEMP_FAIL = 134;
30+
protected static final int ERR_NOT_FOUND = 0x01;
31+
protected static final int ERR_EXISTS = 0x02;
32+
protected static final int ERR_EINVAL = 0x04;
33+
protected static final int ERR_NOT_STORED = 0x05;
34+
protected static final int ERR_NOT_MY_VBUCKET = 0x07;
35+
protected static final int ERR_TEMP_FAIL = 0x86;
3636

3737
protected static final OperationStatus NOT_FOUND_STATUS =
3838
new CASOperationStatus(false, "Not Found", CASResponse.NOT_FOUND);

src/main/java/net/spy/memcached/protocol/binary/StoreOperationImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
class StoreOperationImpl extends OperationImpl
1313
implements StoreOperation, CASOperation {
1414

15-
private static final int SET=1;
16-
private static final int ADD=2;
17-
private static final int REPLACE=3;
15+
private static final int SET=0x01;
16+
private static final int ADD=0x02;
17+
private static final int REPLACE=0x03;
1818

1919
static final int SETQ=0x11;
2020
static final int ADDQ=0x12;

src/main/java/net/spy/memcached/protocol/binary/TouchOperationImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public class TouchOperationImpl extends OperationImpl
1414
implements KeyedOperation {
1515

16-
static final int CMD=28;
16+
static final int CMD=0x1c;
1717

1818
private final String key;
1919
private final int exp;

src/main/java/net/spy/memcached/protocol/binary/VersionOperationImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
class VersionOperationImpl extends OperationImpl implements VersionOperation {
88

9-
private static final int CMD = 11;
9+
private static final int CMD = 0x0b;
1010

1111
public VersionOperationImpl(OperationCallback cb) {
1212
super(CMD, generateOpaque(), cb);

0 commit comments

Comments
 (0)