Polishing #1367

Prefer exact estimations. Original pull request: #1400.
redis · Sep 4, 2020 · 9bb7560 · 9bb7560
1 parent ec37e79
commit 9bb7560
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/io/lettuce/core/codec/StringCodec.java b/src/main/java/io/lettuce/core/codec/StringCodec.java
@@ -195,18 +195,18 @@ public void encode(String str, ByteBuf target) {
      */
     int sizeOf(String value, boolean estimate) {
 
-        if (estimate) {
-            return (int) averageBytesPerChar * value.length();
-        }
-
         if (utf8) {
             return ByteBufUtil.utf8MaxBytes(value);
         }
-        
+
         if (ascii) {
             return value.length();
         }
-
+
+        if (estimate) {
+            return (int) averageBytesPerChar * value.length();
+        }
+
         return (int) maxBytesPerChar * value.length();
     }
 }
diff --git a/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
@@ -117,7 +117,8 @@ void encodeAndDecodeIso88591Buf() {
     @Test
     void estimateSize() {
 
-        assertThat(new StringCodec(LettuceCharsets.UTF8).estimateSize(teststring)).isEqualTo((int) (teststring.length() * 1.1));
+        assertThat(new StringCodec(LettuceCharsets.UTF8).estimateSize(teststring))
+                .isEqualTo(ByteBufUtil.utf8MaxBytes(teststring));
         assertThat(new StringCodec(LettuceCharsets.ASCII).estimateSize(teststring)).isEqualTo(teststring.length());
         assertThat(new StringCodec(StandardCharsets.ISO_8859_1).estimateSize(teststring)).isEqualTo(teststring.length());
     }