github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3219 from xJoeWoo/properties-decoder-performance

Browse Source 
Enhance PropertiesDecoder decoding performance
pull/3292/head
Nikita Koksharov 4 years ago committed by GitHub
parent fb7611d1a1 46499ae36a
commit a31f0403df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 155 additions and 28 deletions
Show Stats Download Patch File Download Diff File

16
redisson-spring-data/redisson-spring-data-16/src/main/java/org/redisson/spring/data/connection/PropertiesDecoder.java
Unescape Escape View File

@ -34,11 +34,19 @@ public class PropertiesDecoder implements Decoder<Properties> {
public Properties decode(ByteBuf buf, State state) {
String value = buf.toString(CharsetUtil.UTF_8);
Properties result = new Properties();
for (String entry : value.split("\r\n|\n")) {
String[] parts = entry.split(":");
if (parts.length == 2) {
result.put(parts[0], parts[1]);
for (String entry : value.split("\n")) {
if (entry.length() < 2) {
continue;
}
String[] pair = entry.split(":");
if (pair.length != 2 || pair[0].length() == 0 ) {
continue;
}
String second = pair[1];
if (second.charAt(second.length() - 1) == '\r') {
second = second.substring(0, second.length() - 1);
}
result.put(pair[0], second);
}
return result;
}

16
redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/PropertiesDecoder.java
Unescape Escape View File

@ -34,11 +34,19 @@ public class PropertiesDecoder implements Decoder<Properties> {
public Properties decode(ByteBuf buf, State state) {
String value = buf.toString(CharsetUtil.UTF_8);
Properties result = new Properties();
for (String entry : value.split("\r\n|\n")) {
String[] parts = entry.split(":");
if (parts.length == 2) {
result.put(parts[0], parts[1]);
for (String entry : value.split("\n")) {
if (entry.length() < 2) {
continue;
}
String[] pair = entry.split(":");
if (pair.length != 2 || pair[0].length() == 0 ) {
continue;
}
String second = pair[1];
if (second.charAt(second.length() - 1) == '\r') {
second = second.substring(0, second.length() - 1);
}
result.put(pair[0], second);
}
return result;
}

16
redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/PropertiesDecoder.java
Unescape Escape View File

@ -34,11 +34,19 @@ public class PropertiesDecoder implements Decoder<Properties> {
public Properties decode(ByteBuf buf, State state) {
String value = buf.toString(CharsetUtil.UTF_8);
Properties result = new Properties();
for (String entry : value.split("\r\n|\n")) {
String[] parts = entry.split(":");
if (parts.length == 2) {
result.put(parts[0], parts[1]);
for (String entry : value.split("\n")) {
if (entry.length() < 2) {
continue;
}
String[] pair = entry.split(":");
if (pair.length != 2 || pair[0].length() == 0 ) {
continue;
}
String second = pair[1];
if (second.charAt(second.length() - 1) == '\r') {
second = second.substring(0, second.length() - 1);
}
result.put(pair[0], second);
}
return result;
}

16
redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/PropertiesDecoder.java
Unescape Escape View File

@ -34,11 +34,19 @@ public class PropertiesDecoder implements Decoder<Properties> {
public Properties decode(ByteBuf buf, State state) {
String value = buf.toString(CharsetUtil.UTF_8);
Properties result = new Properties();
for (String entry : value.split("\r\n|\n")) {
String[] parts = entry.split(":");
if (parts.length == 2) {
result.put(parts[0], parts[1]);
for (String entry : value.split("\n")) {
if (entry.length() < 2) {
continue;
}
String[] pair = entry.split(":");
if (pair.length != 2 || pair[0].length() == 0 ) {
continue;
}
String second = pair[1];
if (second.charAt(second.length() - 1) == '\r') {
second = second.substring(0, second.length() - 1);
}
result.put(pair[0], second);
}
return result;
}

16
redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/PropertiesDecoder.java
Unescape Escape View File

@ -34,11 +34,19 @@ public class PropertiesDecoder implements Decoder<Properties> {
public Properties decode(ByteBuf buf, State state) {
String value = buf.toString(CharsetUtil.UTF_8);
Properties result = new Properties();
for (String entry : value.split("\r\n|\n")) {
String[] parts = entry.split(":");
if (parts.length == 2) {
result.put(parts[0], parts[1]);
for (String entry : value.split("\n")) {
if (entry.length() < 2) {
continue;
}
String[] pair = entry.split(":");
if (pair.length != 2 || pair[0].length() == 0 ) {
continue;
}
String second = pair[1];
if (second.charAt(second.length() - 1) == '\r') {
second = second.substring(0, second.length() - 1);
}
result.put(pair[0], second);
}
return result;
}

16
redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/PropertiesDecoder.java
Unescape Escape View File

@ -34,11 +34,19 @@ public class PropertiesDecoder implements Decoder<Properties> {
public Properties decode(ByteBuf buf, State state) {
String value = buf.toString(CharsetUtil.UTF_8);
Properties result = new Properties();
for (String entry : value.split("\r\n|\n")) {
String[] parts = entry.split(":");
if (parts.length == 2) {
result.put(parts[0], parts[1]);
for (String entry : value.split("\n")) {
if (entry.length() < 2) {
continue;
}
String[] pair = entry.split(":");
if (pair.length != 2 || pair[0].length() == 0 ) {
continue;
}
String second = pair[1];
if (second.charAt(second.length() - 1) == '\r') {
second = second.substring(0, second.length() - 1);
}
result.put(pair[0], second);
}
return result;
}

16
redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/PropertiesDecoder.java
Unescape Escape View File

@ -34,11 +34,19 @@ public class PropertiesDecoder implements Decoder<Properties> {
public Properties decode(ByteBuf buf, State state) {
String value = buf.toString(CharsetUtil.UTF_8);
Properties result = new Properties();
for (String entry : value.split("\r\n|\n")) {
String[] parts = entry.split(":");
if (parts.length == 2) {
result.put(parts[0], parts[1]);
for (String entry : value.split("\n")) {
if (entry.length() < 2) {
continue;
}
String[] pair = entry.split(":");
if (pair.length != 2 || pair[0].length() == 0 ) {
continue;
}
String second = pair[1];
if (second.charAt(second.length() - 1) == '\r') {
second = second.substring(0, second.length() - 1);
}
result.put(pair[0], second);
}
return result;
}

71
redisson-spring-data/redisson-spring-data-23/src/test/java/org/redisson/spring/data/connection/PropertiesDecoderTest.java
Unescape Escape View File

@ -0,0 +1,71 @@
package org.redisson.spring.data.connection;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.util.CharsetUtil;
import org.junit.Assert;
import org.junit.Test;
import org.redisson.client.handler.State;
import org.redisson.client.protocol.Decoder;
import java.nio.charset.StandardCharsets;
import java.util.Properties;
public class PropertiesDecoderTest {
private final PropertiesDecoder decoder = new PropertiesDecoder();
private final String info = "# Server\r\n" +
"redis_version:5.0.10\r\n" +
"redis_build_id:b9312d2bb5f35b93\r\n" +
"redis_mode:standalone\n" +
"executable:/data/redis-server\n" +
"config_file:\n" +
"" +
"# Client";
@Test
public void testDecode() {
Properties p = decoder.decode(Unpooled.copiedBuffer(info, StandardCharsets.UTF_8), null);
Assert.assertEquals(p.getProperty("redis_version"), "5.0.10");
Assert.assertEquals(p.getProperty("redis_mode"), "standalone");
Assert.assertNull(p.getProperty("config_file"));
}
// Codes below should be deleted before merge
private class PropertiesDecoderOld implements Decoder<Properties> {
@Override
public Properties decode(ByteBuf buf, State state) {
String value = buf.toString(CharsetUtil.UTF_8);
Properties result = new Properties();
for (String entry : value.split("\r\n|\n")) {
String[] parts = entry.split(":");
if (parts.length == 2) {
result.put(parts[0], parts[1]);
}
}
return result;
}
}
// @Test
public void benchmark() {
PropertiesDecoderOld old = new PropertiesDecoderOld();
long start = System.currentTimeMillis();
int c = 400000;
while (c-- > 0) {
old.decode(Unpooled.copiedBuffer(info, StandardCharsets.UTF_8), null);
}
System.out.println(System.currentTimeMillis() - start);
start = System.currentTimeMillis();
c = 400000;
while (c-- > 0) {
testDecode();
}
System.out.println(System.currentTimeMillis() - start);
}
}
Write Preview
Loading…
Cancel
Save