Drop write_utf8() and read_utf8(); optimize read_len_prefixed_utf8()

Author: 1st1

buffer.pxd

@@ -28,6 +28,9 @@ cdef class WriteBuffer:
     cdef inline len(self):
         return self._length
 
+    cdef inline write_len_prefixed_utf8(self, str s):
+        return self.write_len_prefixed_bytes(s.encode('utf-8'))
+
     cdef inline _check_readonly(self)
     cdef inline _ensure_alloced(self, ssize_t extra_length)
     cdef _reallocate(self, ssize_t new_size)
@@ -39,7 +42,6 @@ cdef class WriteBuffer:
     cdef write_len_prefixed_bytes(self, bytes data)
     cdef write_bytestring(self, bytes string)
     cdef write_str(self, str string, str encoding)
-    cdef write_utf8(self, str string)
     cdef write_cstr(self, const char *data, ssize_t len)
     cdef write_int16(self, int16_t i)
     cdef write_int32(self, int32_t i)
@@ -101,12 +103,6 @@ cdef class ReadBuffer:
     cdef inline int32_t get_message_length(self):
         return self._current_message_len
 
-    cdef inline read_utf8(self):
-        return self.read_null_str().decode('utf-8')
-
-    cdef inline read_len_prefixed_utf8(self):
-        return self.read_len_prefixed_bytes().decode('utf-8')
-
     cdef feed_data(self, data)
     cdef inline _ensure_first_buf(self)
     cdef _switch_to_next_buf(self)
@@ -116,6 +112,7 @@ cdef class ReadBuffer:
     cdef inline _read_and_discard(self, ssize_t nbytes)
     cdef bytes read_bytes(self, ssize_t nbytes)
     cdef bytes read_len_prefixed_bytes(self)
+    cdef str read_len_prefixed_utf8(self)
     cdef inline int32_t read_int32(self) except? -1
     cdef inline int16_t read_int16(self) except? -1
     cdef inline read_null_str(self)

buffer.pyx

@@ -151,9 +151,6 @@ cdef class WriteBuffer:
     cdef write_str(self, str string, str encoding):
         self.write_bytestring(string.encode(encoding))
 
-    cdef write_utf8(self, str string):
-        self.write_bytestring(string.encode('utf-8'))
-
     cdef write_len_prefixed_bytes(self, bytes data):
         # Write a length-prefixed (not NULL-terminated) UTF-8 string.
         cdef:
@@ -401,6 +398,23 @@ cdef class ReadBuffer:
                 'negative length for a len-prefixed bytes value')
         return self.read_bytes(size)
 
+    cdef str read_len_prefixed_utf8(self):
+        cdef:
+            int32_t size
+            const char *cbuf
+
+        size = self.read_int32()
+        if size < 0:
+            raise exceptions.BufferError(
+                'negative length for a len-prefixed bytes value')
+
+        self._ensure_first_buf()
+        cbuf = self._try_read_bytes(size)
+        if cbuf != NULL:
+            return cpython.PyUnicode_DecodeUTF8(cbuf, size, NULL)
+        else:
+            return self.read_len_prefixed_bytes().decode('utf-8')
+
     cdef inline char read_byte(self) except? -1:
         cdef const char *first_byte