Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions src/main/java/net/spy/memcached/AddrUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,21 @@ private AddrUtil() {
*
* Note that colon-delimited IPv6 is also supported.
* For example: ::1:11211
* @param s The {@link java.util.List} of {@link java.lang.String}
* @param hosts The {@link java.util.List} of {@link java.lang.String}
* containing {@code host:port}
* @return The {@link java.util.List} of {@link java.net.InetSocketAddress}
*/
public static List<InetSocketAddress> getAddresses(List<String> s) {
if (s == null) {
throw new NullPointerException("Null host list");
public static List<InetSocketAddress> getAddresses(List<String> hosts) {
if (hosts == null) {
throw new IllegalArgumentException("Hosts must not be null");
}
ArrayList<InetSocketAddress> addrs =
new ArrayList<>();

if (s.isEmpty()) {
return addrs;
}

for (String hoststuff : s) {
hoststuff = hoststuff.trim();
if (hoststuff.equals("")) {
continue;
ArrayList<InetSocketAddress> addrs = new ArrayList<>();
for (String host : hosts) {
if (!host.trim().isEmpty()) {
addrs.add(getAddress(host));
}
addrs.add(getAddress(hoststuff));
}
assert !addrs.isEmpty() : "No addrs found";
return Collections.unmodifiableList(addrs);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,12 @@ public void handleLine(String line) {
*/
if (line.startsWith("VALUE ")) {
String[] stuff = line.split(" ");
assert stuff.length == 5;
Comment thread
oliviarla marked this conversation as resolved.

position = Integer.parseInt(stuff[1]);
flags = Integer.parseInt(stuff[2]);
count = Integer.parseInt(stuff[3]);
index = Integer.parseInt(stuff[4]);

assert count > 0;
// position counter
pos = position - index;
posDiff = 1;
Expand Down Expand Up @@ -171,13 +169,6 @@ public void handleRead(ByteBuffer bb) {
return;
}

// Read data
assert key != null;
assert data != null;
// This will be the case, because we'll clear them when it's not.
assert readOffset <= data.length
: "readOffset is " + readOffset + " data.length is " + data.length;

getLogger().debug("readOffset: %d, length: %d", readOffset, data.length);

if (lookingFor == '\0') {
Expand Down Expand Up @@ -205,19 +196,14 @@ public void handleRead(ByteBuffer bb) {
if (lookingFor != '\0' && bb.hasRemaining()) {
do {
byte tmp = bb.get();
assert tmp == lookingFor : "Expecting " + lookingFor + ", got "
+ (char) tmp;
if (tmp != lookingFor) {
throw new IllegalStateException("Expecting " + lookingFor + ", got " + (char) tmp);
}

switch (lookingFor) {
case '\r':
lookingFor = '\n';
break;
case '\n':
lookingFor = '\0';
break;
default:
assert false : "Looking for unexpected char: "
+ (char) lookingFor;
if (lookingFor == '\r') {
lookingFor = '\n';
} else { // lookingFor == '\n';
lookingFor = '\0';
}
} while (lookingFor != '\0' && bb.hasRemaining());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,6 @@ public void handleRead(ByteBuffer bb) {
return;
}

// Read data
// assert key != null;
assert data != null;

// This will be the case, because we'll clear them when it's not.
assert readOffset <= data.length : "readOffset is " + readOffset
+ " data.length is " + data.length;

getLogger().debug("readOffset: %d, length: %d", readOffset, data.length);

if (lookingFor == '\0') {
Expand All @@ -191,19 +183,14 @@ public void handleRead(ByteBuffer bb) {
if (lookingFor != '\0' && bb.hasRemaining()) {
do {
byte tmp = bb.get();
assert tmp == lookingFor : "Expecting " + lookingFor + ", got "
+ (char) tmp;
if (tmp != lookingFor) {
throw new IllegalStateException("Expecting " + lookingFor + ", got " + (char) tmp);
}

switch (lookingFor) {
case '\r':
lookingFor = '\n';
break;
case '\n':
lookingFor = '\0';
break;
default:
assert false : "Looking for unexpected char: "
+ (char) lookingFor;
if (lookingFor == '\r') {
lookingFor = '\n';
} else { // lookingFor == '\n';
lookingFor = '\0';
}
} while (lookingFor != '\0' && bb.hasRemaining());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ public void handleLine(String line) {
*/
if (line.startsWith("VALUE ")) {
String[] stuff = line.split(" ");
assert stuff.length == 3;
assert "VALUE".equals(stuff[0]);

flags = Integer.parseInt(stuff[1]);
count = Integer.parseInt(stuff[2]);
Expand Down Expand Up @@ -173,13 +171,6 @@ public void handleRead(ByteBuffer bb) {
return;
}

// Read data
assert key != null;
assert data != null;
// This will be the case, because we'll clear them when it's not.
assert readOffset <= data.length
: "readOffset is " + readOffset + " data.length is " + data.length;

getLogger().debug("readOffset: %d, length: %d", readOffset, data.length);

if (lookingFor == '\0') {
Expand Down Expand Up @@ -207,19 +198,14 @@ public void handleRead(ByteBuffer bb) {
if (lookingFor != '\0' && bb.hasRemaining()) {
do {
byte tmp = bb.get();
assert tmp == lookingFor : "Expecting " + lookingFor + ", got "
+ (char) tmp;
if (tmp != lookingFor) {
throw new IllegalStateException("Expecting " + lookingFor + ", got " + (char) tmp);
}

switch (lookingFor) {
case '\r':
lookingFor = '\n';
break;
case '\n':
lookingFor = '\0';
break;
default:
assert false : "Looking for unexpected char: "
+ (char) lookingFor;
if (lookingFor == '\r') {
lookingFor = '\n';
} else { // lookingFor == '\n';
lookingFor = '\0';
}
} while (lookingFor != '\0' && bb.hasRemaining());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,6 @@ public void handleLine(String line) {
*/
if (line.startsWith("VALUE ")) {
String[] stuff = line.split(" ");
assert stuff.length == 3;
assert "VALUE".equals(stuff[0]);

flags = Integer.parseInt(stuff[1]);
count = Integer.parseInt(stuff[2]);
Expand Down Expand Up @@ -200,13 +198,6 @@ public void handleRead(ByteBuffer bb) {
return;
}

// Read data
assert key != null;
assert data != null;
// This will be the case, because we'll clear them when it's not.
assert readOffset <= data.length
: "readOffset is " + readOffset + " data.length is " + data.length;

getLogger().debug("readOffset: %d, length: %d", readOffset, data.length);

if (lookingFor == '\0') {
Expand All @@ -231,19 +222,14 @@ public void handleRead(ByteBuffer bb) {
if (lookingFor != '\0' && bb.hasRemaining()) {
do {
byte tmp = bb.get();
assert tmp == lookingFor : "Expecting " + lookingFor + ", got "
+ (char) tmp;
if (tmp != lookingFor) {
throw new IllegalStateException("Expecting " + lookingFor + ", got " + (char) tmp);
}

switch (lookingFor) {
case '\r':
lookingFor = '\n';
break;
case '\n':
lookingFor = '\0';
break;
default:
assert false : "Looking for unexpected char: "
+ (char) lookingFor;
if (lookingFor == '\r') {
lookingFor = '\n';
} else { // lookingFor == '\n';
lookingFor = '\0';
}
} while (lookingFor != '\0' && bb.hasRemaining());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ public void handleLine(String line) {
readState = ReadState.ELEMENTS;

String[] stuff = line.split(" ");
assert "ELEMENTS".equals(stuff[0]) || "VALUE".equals(stuff[0]);

lineCount = Integer.parseInt(stuff[1]);
if (lineCount > 0) {
Expand All @@ -125,8 +124,6 @@ public void handleLine(String line) {
readState = ReadState.TRIMMED_KEYS;

String[] stuff = line.split(" ");
assert "TRIMMED_KEYS".equals(stuff[0]);

lineCount = Integer.parseInt(stuff[1]);
if (lineCount > 0) {
setReadType(OperationReadType.DATA);
Expand Down Expand Up @@ -220,14 +217,6 @@ private void readElements(ByteBuffer bb) {
return;
}

// Read data
// assert key != null;
assert data != null;

// This will be the case, because we'll clear them when it's not.
assert readOffset <= data.length : "readOffset is " + readOffset
+ " data.length is " + data.length;

getLogger()
.debug("readOffset: %d, length: %d", readOffset, data.length);

Expand All @@ -251,19 +240,14 @@ private void readElements(ByteBuffer bb) {
if (lookingFor != '\0' && bb.hasRemaining()) {
do {
byte tmp = bb.get();
assert tmp == lookingFor : "Expecting " + lookingFor + ", got "
+ (char) tmp;
if (tmp != lookingFor) {
throw new IllegalStateException("Expecting " + lookingFor + ", got " + (char) tmp);
}

switch (lookingFor) {
case '\r':
lookingFor = '\n';
break;
case '\n':
lookingFor = '\0';
break;
default:
assert false : "Looking for unexpected char: "
+ (char) lookingFor;
if (lookingFor == '\r') {
lookingFor = '\n';
} else { // lookingFor == '\n';
lookingFor = '\0';
}
} while (lookingFor != '\0' && bb.hasRemaining());

Expand Down
Loading
Loading