Replace FastReadBuffer object with a struct+inline functions

Author: 1st1

buffer.pxd

@@ -142,44 +142,3 @@ cdef class ReadBuffer:
 
     @staticmethod
     cdef ReadBuffer new_message_parser(object data)
-
-
-@cython.no_gc_clear
-@cython.final
-@cython.freelist(_BUFFER_FREELIST_SIZE)
-cdef class FastReadBuffer:
-
-    cdef:
-        const char* buf
-        ssize_t len
-
-    cdef inline const char* read(self, ssize_t n) except NULL:
-        cdef const char *result
-
-        if n > self.len:
-            self._raise_ins_err(n, self.len)
-
-        result = self.buf
-        self.buf += n
-        self.len -= n
-
-        return result
-
-    cdef inline const char* read_all(self):
-        cdef const char *result
-        result = self.buf
-        self.buf += self.len
-        self.len = 0
-        return result
-
-    cdef inline FastReadBuffer slice_from(self, FastReadBuffer source,
-                                          ssize_t len):
-        self.buf = source.read(len)
-        self.len = len
-        return self
-
-    cdef _raise_ins_err(self, ssize_t n, ssize_t len)
-
-    @staticmethod
-    cdef inline FastReadBuffer new():
-        return FastReadBuffer.__new__(FastReadBuffer)

buffer.pyx

@@ -658,14 +658,3 @@ cdef class ReadBuffer:
         buf._current_message_len_unread = buf._len0
 
         return buf
-
-
-@cython.no_gc_clear
-@cython.final
-@cython.freelist(_BUFFER_FREELIST_SIZE)
-cdef class FastReadBuffer:
-
-    cdef _raise_ins_err(self, ssize_t n, ssize_t len):
-        raise exceptions.BufferError(
-            'insufficient data in buffer: requested {}, remaining {}'.
-                format(n, self.len))

codecs/__init__.pxd

@@ -16,128 +16,128 @@ ctypedef object (*encode_func)(CodecContext settings,
                                object obj)
 
 ctypedef object (*decode_func)(CodecContext settings,
-                               FastReadBuffer buf)
+                               FRBuffer *buf)
 
 
 # Datetime
 cdef date_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef date_decode(CodecContext settings, FastReadBuffer buf)
+cdef date_decode(CodecContext settings, FRBuffer * buf)
 cdef date_encode_tuple(CodecContext settings, WriteBuffer buf, obj)
-cdef date_decode_tuple(CodecContext settings, FastReadBuffer buf)
+cdef date_decode_tuple(CodecContext settings, FRBuffer * buf)
 cdef timestamp_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef timestamp_decode(CodecContext settings, FastReadBuffer buf)
+cdef timestamp_decode(CodecContext settings, FRBuffer * buf)
 cdef timestamp_encode_tuple(CodecContext settings, WriteBuffer buf, obj)
-cdef timestamp_decode_tuple(CodecContext settings, FastReadBuffer buf)
+cdef timestamp_decode_tuple(CodecContext settings, FRBuffer * buf)
 cdef timestamptz_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef timestamptz_decode(CodecContext settings, FastReadBuffer buf)
+cdef timestamptz_decode(CodecContext settings, FRBuffer * buf)
 cdef time_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef time_decode(CodecContext settings, FastReadBuffer buf)
+cdef time_decode(CodecContext settings, FRBuffer * buf)
 cdef time_encode_tuple(CodecContext settings, WriteBuffer buf, obj)
-cdef time_decode_tuple(CodecContext settings, FastReadBuffer buf)
+cdef time_decode_tuple(CodecContext settings, FRBuffer * buf)
 cdef timetz_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef timetz_decode(CodecContext settings, FastReadBuffer buf)
+cdef timetz_decode(CodecContext settings, FRBuffer * buf)
 cdef timetz_encode_tuple(CodecContext settings, WriteBuffer buf, obj)
-cdef timetz_decode_tuple(CodecContext settings, FastReadBuffer buf)
+cdef timetz_decode_tuple(CodecContext settings, FRBuffer * buf)
 cdef interval_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef interval_decode(CodecContext settings, FastReadBuffer buf)
+cdef interval_decode(CodecContext settings, FRBuffer * buf)
 cdef interval_encode_tuple(CodecContext settings, WriteBuffer buf, tuple obj)
-cdef interval_decode_tuple(CodecContext settings, FastReadBuffer buf)
+cdef interval_decode_tuple(CodecContext settings, FRBuffer * buf)
 
 
 # Bits
 cdef bits_encode(CodecContext settings, WriteBuffer wbuf, obj)
-cdef bits_decode(CodecContext settings, FastReadBuffer buf)
+cdef bits_decode(CodecContext settings, FRBuffer * buf)
 
 
 # Bools
 cdef bool_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef bool_decode(CodecContext settings, FastReadBuffer buf)
+cdef bool_decode(CodecContext settings, FRBuffer * buf)
 
 
 # Geometry
 cdef box_encode(CodecContext settings, WriteBuffer wbuf, obj)
-cdef box_decode(CodecContext settings, FastReadBuffer buf)
+cdef box_decode(CodecContext settings, FRBuffer * buf)
 cdef line_encode(CodecContext settings, WriteBuffer wbuf, obj)
-cdef line_decode(CodecContext settings, FastReadBuffer buf)
+cdef line_decode(CodecContext settings, FRBuffer * buf)
 cdef lseg_encode(CodecContext settings, WriteBuffer wbuf, obj)
-cdef lseg_decode(CodecContext settings, FastReadBuffer buf)
+cdef lseg_decode(CodecContext settings, FRBuffer * buf)
 cdef point_encode(CodecContext settings, WriteBuffer wbuf, obj)
-cdef point_decode(CodecContext settings, FastReadBuffer buf)
+cdef point_decode(CodecContext settings, FRBuffer * buf)
 cdef path_encode(CodecContext settings, WriteBuffer wbuf, obj)
-cdef path_decode(CodecContext settings, FastReadBuffer buf)
+cdef path_decode(CodecContext settings, FRBuffer * buf)
 cdef poly_encode(CodecContext settings, WriteBuffer wbuf, obj)
-cdef poly_decode(CodecContext settings, FastReadBuffer buf)
+cdef poly_decode(CodecContext settings, FRBuffer * buf)
 cdef circle_encode(CodecContext settings, WriteBuffer wbuf, obj)
-cdef circle_decode(CodecContext settings, FastReadBuffer buf)
+cdef circle_decode(CodecContext settings, FRBuffer * buf)
 
 
 # Hstore
 cdef hstore_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef hstore_decode(CodecContext settings, FastReadBuffer buf)
+cdef hstore_decode(CodecContext settings, FRBuffer * buf)
 
 
 # Ints
 cdef int2_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef int2_decode(CodecContext settings, FastReadBuffer buf)
+cdef int2_decode(CodecContext settings, FRBuffer * buf)
 cdef int4_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef int4_decode(CodecContext settings, FastReadBuffer buf)
+cdef int4_decode(CodecContext settings, FRBuffer * buf)
 cdef uint4_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef uint4_decode(CodecContext settings, FastReadBuffer buf)
+cdef uint4_decode(CodecContext settings, FRBuffer * buf)
 cdef int8_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef int8_decode(CodecContext settings, FastReadBuffer buf)
+cdef int8_decode(CodecContext settings, FRBuffer * buf)
 
 
 # Floats
 cdef float4_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef float4_decode(CodecContext settings, FastReadBuffer buf)
+cdef float4_decode(CodecContext settings, FRBuffer * buf)
 cdef float8_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef float8_decode(CodecContext settings, FastReadBuffer buf)
+cdef float8_decode(CodecContext settings, FRBuffer * buf)
 
 
 # JSON
 cdef jsonb_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef jsonb_decode(CodecContext settings, FastReadBuffer buf)
+cdef jsonb_decode(CodecContext settings, FRBuffer * buf)
 
 
 # Text
 cdef as_pg_string_and_size(
         CodecContext settings, obj, char **cstr, ssize_t *size)
 cdef text_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef text_decode(CodecContext settings, FastReadBuffer buf)
+cdef text_decode(CodecContext settings, FRBuffer * buf)
 
 # Bytea
 cdef bytea_encode(CodecContext settings, WriteBuffer wbuf, obj)
-cdef bytea_decode(CodecContext settings, FastReadBuffer buf)
+cdef bytea_decode(CodecContext settings, FRBuffer * buf)
 
 
 # UUID
 cdef uuid_encode(CodecContext settings, WriteBuffer wbuf, obj)
-cdef uuid_decode(CodecContext settings, FastReadBuffer buf)
+cdef uuid_decode(CodecContext settings, FRBuffer * buf)
 
 
 # Numeric
 cdef numeric_encode_text(CodecContext settings, WriteBuffer buf, obj)
-cdef numeric_decode_text(CodecContext settings, FastReadBuffer buf)
+cdef numeric_decode_text(CodecContext settings, FRBuffer * buf)
 cdef numeric_encode_binary(CodecContext settings, WriteBuffer buf, obj)
-cdef numeric_decode_binary(CodecContext settings, FastReadBuffer buf)
+cdef numeric_decode_binary(CodecContext settings, FRBuffer * buf)
 
 
 # Void
 cdef void_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef void_decode(CodecContext settings, FastReadBuffer buf)
+cdef void_decode(CodecContext settings, FRBuffer * buf)
 
 
 # tid
 cdef tid_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef tid_decode(CodecContext settings, FastReadBuffer buf)
+cdef tid_decode(CodecContext settings, FRBuffer * buf)
 
 
 # Network
-cdef net_decode(CodecContext settings, FastReadBuffer buf)
+cdef net_decode(CodecContext settings, FRBuffer * buf)
 cdef cidr_encode(CodecContext settings, WriteBuffer buf, obj)
 cdef inet_encode(CodecContext settings, WriteBuffer buf, obj)
 
 
 # txid
 cdef txid_snapshot_encode(CodecContext settings, WriteBuffer buf, obj)
-cdef txid_snapshot_decode(CodecContext settings, FastReadBuffer buf)
+cdef txid_snapshot_decode(CodecContext settings, FRBuffer * buf)

codecs/bits.pyx

@@ -41,10 +41,10 @@ cdef bits_encode(CodecContext settings, WriteBuffer wbuf, obj):
             cpython.PyBuffer_Release(&pybuf)
 
 
-cdef bits_decode(CodecContext settings, FastReadBuffer buf):
+cdef bits_decode(CodecContext settings, FRBuffer *buf):
     cdef:
-        int32_t bitlen = hton.unpack_int32(buf.read(4))
+        int32_t bitlen = hton.unpack_int32(frb_read(buf, 4))
         ssize_t buf_len = buf.len
 
-    bytes_ = cpython.PyBytes_FromStringAndSize(buf.read_all(), buf_len)
+    bytes_ = cpython.PyBytes_FromStringAndSize(frb_read_all(buf), buf_len)
     return BitString.frombytes(bytes_, bitlen)

codecs/bytea.pyx

@@ -29,6 +29,6 @@ cdef bytea_encode(CodecContext settings, WriteBuffer wbuf, obj):
             cpython.PyBuffer_Release(&pybuf)
 
 
-cdef bytea_decode(CodecContext settings, FastReadBuffer buf):
+cdef bytea_decode(CodecContext settings, FRBuffer *buf):
     cdef ssize_t buf_len = buf.len
-    return cpython.PyBytes_FromStringAndSize(buf.read_all(), buf_len)
+    return cpython.PyBytes_FromStringAndSize(frb_read_all(buf), buf_len)

codecs/datetime.pyx

@@ -78,9 +78,9 @@ cdef inline _encode_time(WriteBuffer buf, int64_t seconds,
         buf.write_int64(ts)
 
 
-cdef inline int32_t _decode_time(FastReadBuffer buf, int64_t *seconds,
+cdef inline int32_t _decode_time(FRBuffer *buf, int64_t *seconds,
                                  int32_t *microseconds):
-    cdef int64_t ts = hton.unpack_int64(buf.read(8))
+    cdef int64_t ts = hton.unpack_int64(frb_read(buf, 8))
 
     if ts == pg_time64_infinity:
         return 1
@@ -122,8 +122,8 @@ cdef date_encode_tuple(CodecContext settings, WriteBuffer buf, obj):
     buf.write_int32(pg_ordinal)
 
 
-cdef date_decode(CodecContext settings, FastReadBuffer buf):
-    cdef int32_t pg_ordinal = hton.unpack_int32(buf.read(4))
+cdef date_decode(CodecContext settings, FRBuffer *buf):
+    cdef int32_t pg_ordinal = hton.unpack_int32(frb_read(buf, 4))
 
     if pg_ordinal == pg_date_infinity:
         return infinity_date
@@ -133,8 +133,8 @@ cdef date_decode(CodecContext settings, FastReadBuffer buf):
         return date_from_ordinal(pg_ordinal + pg_date_offset_ord)
 
 
-cdef date_decode_tuple(CodecContext settings, FastReadBuffer buf):
-    cdef int32_t pg_ordinal = hton.unpack_int32(buf.read(4))
+cdef date_decode_tuple(CodecContext settings, FRBuffer *buf):
+    cdef int32_t pg_ordinal = hton.unpack_int32(frb_read(buf, 4))
 
     return (pg_ordinal,)
 
@@ -175,7 +175,7 @@ cdef timestamp_encode_tuple(CodecContext settings, WriteBuffer buf, obj):
     buf.write_int64(microseconds)
 
 
-cdef timestamp_decode(CodecContext settings, FastReadBuffer buf):
+cdef timestamp_decode(CodecContext settings, FRBuffer *buf):
     cdef:
         int64_t seconds = 0
         int32_t microseconds = 0
@@ -192,9 +192,9 @@ cdef timestamp_decode(CodecContext settings, FastReadBuffer buf):
             timedelta(0, seconds, microseconds))
 
 
-cdef timestamp_decode_tuple(CodecContext settings, FastReadBuffer buf):
+cdef timestamp_decode_tuple(CodecContext settings, FRBuffer *buf):
     cdef:
-        int64_t ts = hton.unpack_int64(buf.read(8))
+        int64_t ts = hton.unpack_int64(frb_read(buf, 8))
 
     return (ts,)
 
@@ -236,7 +236,7 @@ cdef timestamptz_encode(CodecContext settings, WriteBuffer buf, obj):
     _encode_time(buf, seconds, microseconds)
 
 
-cdef timestamptz_decode(CodecContext settings, FastReadBuffer buf):
+cdef timestamptz_decode(CodecContext settings, FRBuffer *buf):
     cdef:
         int64_t seconds = 0
         int32_t microseconds = 0
@@ -279,7 +279,7 @@ cdef time_encode_tuple(CodecContext settings, WriteBuffer buf, obj):
     buf.write_int64(microseconds)
 
 
-cdef time_decode(CodecContext settings, FastReadBuffer buf):
+cdef time_decode(CodecContext settings, FRBuffer *buf):
     cdef:
         int64_t seconds = 0
         int32_t microseconds = 0
@@ -295,9 +295,9 @@ cdef time_decode(CodecContext settings, FastReadBuffer buf):
     return datetime.time(hours, min, sec, microseconds)
 
 
-cdef time_decode_tuple(CodecContext settings, FastReadBuffer buf):
+cdef time_decode_tuple(CodecContext settings, FRBuffer *buf):
     cdef:
-        int64_t ts = hton.unpack_int64(buf.read(8))
+        int64_t ts = hton.unpack_int64(frb_read(buf, 8))
 
     return (ts,)
 
@@ -342,17 +342,17 @@ cdef timetz_encode_tuple(CodecContext settings, WriteBuffer buf, obj):
     buf.write_int32(offset_sec)
 
 
-cdef timetz_decode(CodecContext settings, FastReadBuffer buf):
+cdef timetz_decode(CodecContext settings, FRBuffer *buf):
     time = time_decode(settings, buf)
-    cdef int32_t offset = <int32_t>(hton.unpack_int32(buf.read(4)) / 60)
+    cdef int32_t offset = <int32_t>(hton.unpack_int32(frb_read(buf, 4)) / 60)
     # See the comment in the `timetz_encode` method.
     return time.replace(tzinfo=datetime.timezone(timedelta(minutes=-offset)))
 
 
-cdef timetz_decode_tuple(CodecContext settings, FastReadBuffer buf):
+cdef timetz_decode_tuple(CodecContext settings, FRBuffer *buf):
     cdef:
-        int64_t microseconds = hton.unpack_int64(buf.read(8))
-        int32_t offset_sec = hton.unpack_int32(buf.read(4))
+        int64_t microseconds = hton.unpack_int64(frb_read(buf, 8))
+        int32_t offset_sec = hton.unpack_int32(frb_read(buf, 4))
 
     return (microseconds, offset_sec)
 
@@ -391,7 +391,7 @@ cdef interval_encode_tuple(CodecContext settings, WriteBuffer buf,
     buf.write_int32(months)
 
 
-cdef interval_decode(CodecContext settings, FastReadBuffer buf):
+cdef interval_decode(CodecContext settings, FRBuffer *buf):
     cdef:
         int32_t days
         int32_t months
@@ -401,8 +401,8 @@ cdef interval_decode(CodecContext settings, FastReadBuffer buf):
 
     _decode_time(buf, &seconds, &microseconds)
 
-    days = hton.unpack_int32(buf.read(4))
-    months = hton.unpack_int32(buf.read(4))
+    days = hton.unpack_int32(frb_read(buf, 4))
+    months = hton.unpack_int32(frb_read(buf, 4))
 
     if months < 0:
         years = -<int32_t>(-months // 12)
@@ -415,14 +415,14 @@ cdef interval_decode(CodecContext settings, FastReadBuffer buf):
                               seconds=seconds, microseconds=microseconds)
 
 
-cdef interval_decode_tuple(CodecContext settings, FastReadBuffer buf):
+cdef interval_decode_tuple(CodecContext settings, FRBuffer *buf):
     cdef:
         int32_t days
         int32_t months
         int64_t microseconds
 
-    microseconds = hton.unpack_int64(buf.read(8))
-    days = hton.unpack_int32(buf.read(4))
-    months = hton.unpack_int32(buf.read(4))
+    microseconds = hton.unpack_int64(frb_read(buf, 8))
+    days = hton.unpack_int32(frb_read(buf, 4))
+    months = hton.unpack_int32(frb_read(buf, 4))
 
     return (months, days, microseconds)