bugfix for keyword field truncate

msfroh · Oct 9, 2020 · 7a09834 · 7a09834
1 parent 8e5d29d
commit 7a09834
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/core/doc/field.rs b/src/core/doc/field.rs
@@ -42,7 +42,11 @@ impl Field {
                     Some(VariantValue::Binary(bytes))
                 }
                 VariantValue::VString(vs) => {
-                    let s = (&vs[..(ByteBlockPool::BYTE_BLOCK_SIZE - 2).min(vs.len())]).to_string();
+                    let mut index = (ByteBlockPool::BYTE_BLOCK_SIZE - 2).min(vs.len());
+                    while !vs.is_char_boundary(index) {
+                        index -= 1;
+                    }
+                    let s = (&vs[..index]).to_string();
                     Some(VariantValue::VString(s))
                 }
                 _ => Some(data),

diff --git a/src/core/util/bytes_ref_hash.rs b/src/core/util/bytes_ref_hash.rs
@@ -179,7 +179,7 @@ impl BytesRefHash {
             // new entry
             let len2 = 2 + bytes.len();
             if len2 + self.byte_pool().byte_upto > ByteBlockPool::BYTE_BLOCK_SIZE {
-                assert!(len2 < ByteBlockPool::BYTE_BLOCK_SIZE);
+                assert!(len2 <= ByteBlockPool::BYTE_BLOCK_SIZE);
                 // this length check already done in the caller func
                 //                if len2 > BYTE_BLOCK_SIZE {
                 // bail!("bytes can be at most: {}, got: {}", BYTE_BLOCK_SIZE -