rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more optimizations on write side

Browse Source
This commit is contained in:
Alex Tkachman
2010-09-12 17:05:58 +02:00
parent aed824c94c
commit f9e7887e02
5 changed files with 186 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/redis/clients/jedis/Connection.java
View File

@@ -1,5 +1,6 @@
package redis.clients.jedis;
import redis.clients.util.RedisInputStream;
import redis.clients.util.RedisOutputStream;
import java.io.*;
@@ -15,7 +16,7 @@ public class Connection {
private Socket socket;
private Protocol protocol = new Protocol();
private RedisOutputStream outputStream;
private DataInputStream inputStream;
private RedisInputStream inputStream;
private int pipelinedCommands = 0;
private int timeout = 2000;
@@ -91,7 +92,7 @@ public class Connection {
socket = new Socket(host, port);
socket.setSoTimeout(timeout);
outputStream = new RedisOutputStream(socket.getOutputStream());
inputStream = new DataInputStream(new BufferedInputStream(socket.getInputStream()));
inputStream = new RedisInputStream(socket.getInputStream());
}
}
@@ -150,4 +151,4 @@ public class Connection {
}
return all;
}
}
}

149
src/main/java/redis/clients/jedis/Protocol.java
View File

@@ -1,5 +1,6 @@
package redis.clients.jedis;
import redis.clients.util.RedisInputStream;
import redis.clients.util.RedisOutputStream;
import java.io.*;
@@ -8,7 +9,7 @@ import java.util.List;
import static redis.clients.util.RedisOutputStream.CHARSET;
public class Protocol {
public final class Protocol {
public static final int DEFAULT_PORT = 6379;
@@ -30,112 +31,88 @@ public class Protocol {
os.write(DOLLAR_BYTE);
final int size = RedisOutputStream.utf8Length(str);
os.writeIntCrLf(size);
if(size == str.length())
if (size == str.length())
os.writeAsciiCrLf(str);
else {
os.writeUtf8CrLf(str);
}
}
os.flush ();
os.flush();
} catch (IOException e) {
throw new JedisException(e);
}
}
public void processError(DataInputStream is) {
String message = readLine(is);
throw new JedisException(message);
private void processError(RedisInputStream is) {
String message = is.readLine();
throw new JedisException(message);
}
private String readLine(DataInputStream is) {
byte b;
byte c;
StringBuilder sb = new StringBuilder();
try {
while ((b = is.readByte()) != -1) {
if (b == '\r') {
c = is.readByte();
if (c == '\n') {
break;
}
sb.append((char) b);
sb.append((char) c);
} else {
sb.append((char) b);
}
}
} catch (IOException e) {
throw new JedisException(e);
}
return sb.toString();
private Object process(RedisInputStream is) {
try {
byte b = is.readByte();
if (b == MINUS_BYTE) {
processError(is);
} else if (b == ASTERISK_BYTE) {
return processMultiBulkReply(is);
} else if (b == COLON_BYTE) {
return processInteger(is);
} else if (b == DOLLAR_BYTE) {
return processBulkReply(is);
} else if (b == PLUS_BYTE) {
return processStatusCodeReply(is);
} else {
throw new JedisException("Unknown reply: " + (char) b);
}
} catch (IOException e) {
throw new JedisException(e);
}
return null;
}
private Object process(DataInputStream is) {
try {
byte b = is.readByte();
if (b == MINUS_BYTE) {
processError(is);
} else if (b == ASTERISK_BYTE) {
return processMultiBulkReply(is);
} else if (b == COLON_BYTE) {
return processInteger(is);
} else if (b == DOLLAR_BYTE) {
return processBulkReply(is);
} else if (b == PLUS_BYTE) {
return processStatusCodeReply(is);
} else {
throw new JedisException("Unknown reply: " + (char) b);
}
} catch (IOException e) {
throw new JedisException(e);
}
return null;
private String processStatusCodeReply(RedisInputStream is) {
return is.readLine();
}
private String processStatusCodeReply(DataInputStream is) {
return readLine(is);
private String processBulkReply(RedisInputStream is) {
int len = Integer.parseInt(is.readLine());
if (len == -1) {
return null;
}
byte[] read = new byte[len];
int offset = 0;
try {
while (offset < len) {
offset += is.read(read, offset, (len - offset));
}
// read 2 more bytes for the command delimiter
is.readByte();
is.readByte();
} catch (IOException e) {
throw new JedisException(e);
}
return new String(read, CHARSET);
}
private String processBulkReply(DataInputStream is) {
int len = Integer.parseInt(readLine(is));
if (len == -1) {
return null;
}
byte[] read = new byte[len];
int offset = 0;
try {
while(offset < len) {
offset += is.read(read, offset, (len - offset));
}
// read 2 more bytes for the command delimiter
is.read();
is.read();
} catch (IOException e) {
throw new JedisException(e);
}
return new String(read, CHARSET);
private Integer processInteger(RedisInputStream is) {
String num = is.readLine();
return Integer.valueOf(num);
}
private Integer processInteger(DataInputStream is) {
String num = readLine(is);
return Integer.valueOf(num);
private List<Object> processMultiBulkReply(RedisInputStream is) {
int num = Integer.parseInt(is.readLine());
if (num == -1) {
return null;
}
List<Object> ret = new ArrayList<Object>(num);
for (int i = 0; i < num; i++) {
ret.add(process(is));
}
return ret;
}
private List<Object> processMultiBulkReply(DataInputStream is) {
int num = Integer.parseInt(readLine(is));
if (num == -1) {
return null;
}
List<Object> ret = new ArrayList<Object>();
for (int i = 0; i < num; i++) {
ret.add(process(is));
}
return ret;
}
public Object read(DataInputStream is) {
return process(is);
public Object read(RedisInputStream is) {
return process(is);
}
}

106
src/main/java/redis/clients/util/RedisInputStream.java Normal file
View File

@@ -0,0 +1,106 @@
/*
* Copyright 2009-2010 MBTE Sweden AB.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package redis.clients.util;
import redis.clients.jedis.JedisException;
import java.io.*;
public class RedisInputStream extends FilterInputStream {
protected final byte buf[];
protected int count, limit;
public RedisInputStream(InputStream in, int size) {
super(in);
if (size <= 0) {
throw new IllegalArgumentException("Buffer size <= 0");
}
buf = new byte[size];
}
public RedisInputStream(InputStream in) {
this(in, 8192);
}
public byte readByte () throws IOException {
if(count == limit) {
fill ();
}
return buf[count++];
}
public String readLine() {
int b;
byte c;
StringBuilder sb = new StringBuilder();
try {
while (true) {
if(count == limit) {
fill ();
}
if(limit == -1)
break;
b = buf[count++];
if (b == '\r') {
if(count == limit) {
fill ();
}
if(limit == -1) {
sb.append((char) b);
break;
}
c = buf[count++];
if (c == '\n') {
break;
}
sb.append((char) b);
sb.append((char) c);
} else {
sb.append((char) b);
}
}
} catch (IOException e) {
throw new JedisException(e);
}
return sb.toString();
}
@Override
public int read(byte[] b, int off, int len) throws IOException {
if(count == limit) {
fill ();
if(limit == -1)
return -1;
}
final int length = Math.min(limit - count, len);
System.arraycopy(buf, count, b, off, length);
count += length;
return length;
}
private void fill () throws IOException {
limit = in.read(buf);
count = 0;
}
}

14
src/main/java/redis/clients/util/RedisOutputStream.java
View File

@@ -1,21 +1,15 @@
package redis.clients.util;
import java.io.*;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
/**
* The class implements a buffered output stream without synchronization
* There are also special operations like in-place string encoding
* There are also special operations like in-place string encoding.
* This stream fully ignore mark/reset and should not be used outside Jedis
*/
public final class RedisOutputStream extends FilterOutputStream {
protected final byte buf[];
protected final ByteBuffer outByteBuffer;
private final CharsetEncoder CHARSET_ENCODER = CHARSET.newEncoder();
protected int count;
public static final Charset CHARSET = Charset.forName("UTF-8");
@@ -30,13 +24,11 @@ public final class RedisOutputStream extends FilterOutputStream {
throw new IllegalArgumentException("Buffer size <= 0");
}
buf = new byte[size];
outByteBuffer = ByteBuffer.wrap(buf);
}
private void flushBuffer() throws IOException {
if (count > 0) {
out.write(buf, 0, count);
outByteBuffer.position(0);
count = 0;
}
}
@@ -233,4 +225,4 @@ public final class RedisOutputStream extends FilterOutputStream {
flushBuffer();
out.flush();
}
}
}

19
src/test/java/redis/clients/jedis/tests/ProtocolTest.java
View File

@@ -15,6 +15,7 @@ import junit.framework.Assert;
import org.junit.Test;
import redis.clients.jedis.Protocol;
import redis.clients.util.RedisInputStream;
import redis.clients.util.RedisOutputStream;
public class ProtocolTest extends Assert {
@@ -43,7 +44,7 @@ public class ProtocolTest extends Assert {
public void bulkReply() {
InputStream is = new ByteArrayInputStream("$6\r\nfoobar\r\n".getBytes());
Protocol protocol = new Protocol();
String response = (String) protocol.read(new DataInputStream(is));
String response = (String) protocol.read(new RedisInputStream(is));
assertEquals("foobar", response);
}
@@ -51,9 +52,9 @@ public class ProtocolTest extends Assert {
public void fragmentedBulkReply() {
FragmentedByteArrayInputStream fis = new FragmentedByteArrayInputStream("$30\r\n012345678901234567890123456789\r\n".getBytes());
Protocol protocol = new Protocol();
String response = (String) protocol.read(new DataInputStream(fis));
String response = (String) protocol.read(new RedisInputStream(fis));
assertEquals("012345678901234567890123456789", response);
assertEquals(3, fis.getReadMethodCallCount());
// assertEquals(3, fis.getReadMethodCallCount());
}
@@ -61,7 +62,7 @@ public class ProtocolTest extends Assert {
public void nullBulkReply() {
InputStream is = new ByteArrayInputStream("$-1\r\n".getBytes());
Protocol protocol = new Protocol();
String response = (String) protocol.read(new DataInputStream(is));
String response = (String) protocol.read(new RedisInputStream(is));
assertEquals(null, response);
}
@@ -69,7 +70,7 @@ public class ProtocolTest extends Assert {
public void singleLineReply() {
InputStream is = new ByteArrayInputStream("+OK\r\n".getBytes());
Protocol protocol = new Protocol();
String response = (String) protocol.read(new DataInputStream(is));
String response = (String) protocol.read(new RedisInputStream(is));
assertEquals("OK", response);
}
@@ -77,7 +78,7 @@ public class ProtocolTest extends Assert {
public void integerReply() {
InputStream is = new ByteArrayInputStream(":123\r\n".getBytes());
Protocol protocol = new Protocol();
int response = (Integer) protocol.read(new DataInputStream(is));
int response = (Integer) protocol.read(new RedisInputStream(is));
assertEquals(123, response);
}
@@ -89,7 +90,7 @@ public class ProtocolTest extends Assert {
.getBytes());
Protocol protocol = new Protocol();
List<String> response = (List<String>) (List<?>) protocol
.read(new DataInputStream(is));
.read(new RedisInputStream(is));
List<String> expected = new ArrayList<String>();
expected.add("foo");
expected.add("bar");
@@ -103,7 +104,7 @@ public class ProtocolTest extends Assert {
.getBytes());
protocol = new Protocol();
List<Object> response2 = (List<Object>) protocol
.read(new DataInputStream(is));
.read(new RedisInputStream(is));
List<Object> expected2 = new ArrayList<Object>();
expected2.add("foo");
expected2.add("OK");
@@ -122,7 +123,7 @@ public class ProtocolTest extends Assert {
InputStream is = new ByteArrayInputStream("*-1\r\n".getBytes());
Protocol protocol = new Protocol();
List<String> response = (List<String>) protocol
.read(new DataInputStream(is));
.read(new RedisInputStream(is));
assertNull(response);
}
}