Bump pgproto version

* Switch to a new FBBuffer abstraction
* Drop Memory object
* Start using new ReadBuffer.discard_message()

Author: 1st1

asyncpg/pgproto

@@ -25,7 +25,7 @@ ctypedef object (*encode_func_ex)(ConnectionSettings settings,
 
 
 ctypedef object (*decode_func_ex)(ConnectionSettings settings,
-                                  FastReadBuffer buf,
+                                  FRBuffer *buf,
                                   const void *arg)
 
 
@@ -271,17 +271,17 @@ cdef inline textarray_encode(ConnectionSettings settings, WriteBuffer buf,
     buf.write_buffer(array_data)
 
 
-cdef inline array_decode(ConnectionSettings settings, FastReadBuffer buf,
+cdef inline array_decode(ConnectionSettings settings, FRBuffer *buf,
                          decode_func_ex decoder, const void *decoder_arg):
     cdef:
-        int32_t ndims = hton.unpack_int32(buf.read(4))
-        int32_t flags = hton.unpack_int32(buf.read(4))
-        uint32_t elem_oid = <uint32_t>hton.unpack_int32(buf.read(4))
+        int32_t ndims = hton.unpack_int32(frb_read(buf, 4))
+        int32_t flags = hton.unpack_int32(frb_read(buf, 4))
+        uint32_t elem_oid = <uint32_t>hton.unpack_int32(frb_read(buf, 4))
         list result
         int i
         int32_t elem_len
         int32_t elem_count = 1
-        FastReadBuffer elem_buf = FastReadBuffer.new()
+        FRBuffer elem_buf
         int32_t dims[ARRAY_MAXDIM]
         Codec elem_codec
 
@@ -295,40 +295,40 @@ cdef inline array_decode(ConnectionSettings settings, FastReadBuffer buf,
             format(ndims, ARRAY_MAXDIM))
 
     for i in range(ndims):
-        dims[i] = hton.unpack_int32(buf.read(4))
+        dims[i] = hton.unpack_int32(frb_read(buf, 4))
         # Ignore the lower bound information
-        buf.read(4)
+        frb_read(buf, 4)
 
     if ndims == 1:
         # Fast path for flat arrays
         elem_count = dims[0]
         result = cpython.PyList_New(elem_count)
 
         for i in range(elem_count):
-            elem_len = hton.unpack_int32(buf.read(4))
+            elem_len = hton.unpack_int32(frb_read(buf, 4))
             if elem_len == -1:
                 elem = None
             else:
-                elem_buf.slice_from(buf, elem_len)
-                elem = decoder(settings, elem_buf, decoder_arg)
+                frb_slice_from(&elem_buf, buf, elem_len)
+                elem = decoder(settings, &elem_buf, decoder_arg)
 
             cpython.Py_INCREF(elem)
             cpython.PyList_SET_ITEM(result, i, elem)
 
     else:
         result = _nested_array_decode(settings, buf,
                                       decoder, decoder_arg, ndims, dims,
-                                      elem_buf)
+                                      &elem_buf)
 
     return result
 
 
 cdef _nested_array_decode(ConnectionSettings settings,
-                          FastReadBuffer buf,
+                          FRBuffer *buf,
                           decode_func_ex decoder,
                           const void *decoder_arg,
                           int32_t ndims, int32_t *dims,
-                          FastReadBuffer elem_buf):
+                          FRBuffer *elem_buf):
 
     cdef:
         int32_t elem_len
@@ -351,12 +351,12 @@ cdef _nested_array_decode(ConnectionSettings settings,
 
     for i in range(array_len):
         # Decode the element.
-        elem_len = hton.unpack_int32(buf.read(4))
+        elem_len = hton.unpack_int32(frb_read(buf, 4))
         if elem_len == -1:
             elem = None
         else:
             elem = decoder(settings,
-                           elem_buf.slice_from(buf, elem_len),
+                           frb_slice_from(elem_buf, buf, elem_len),
                            decoder_arg)
 
         # Take an explicit reference for PyList_SET_ITEM in the below
@@ -399,7 +399,7 @@ cdef _nested_array_decode(ConnectionSettings settings,
     return stride
 
 
-cdef textarray_decode(ConnectionSettings settings, FastReadBuffer buf,
+cdef textarray_decode(ConnectionSettings settings, FRBuffer *buf,
                       decode_func_ex decoder, const void *decoder_arg,
                       Py_UCS4 typdelim):
     cdef:
@@ -455,7 +455,7 @@ cdef _textarray_decode(ConnectionSettings settings,
         int i
         object item
         str item_text
-        FastReadBuffer item_buf = FastReadBuffer.new()
+        FRBuffer item_buf
         char *pg_item_str
         ssize_t pg_item_len
 
@@ -639,9 +639,8 @@ cdef _textarray_decode(ConnectionSettings settings,
             # for the element type.
             pgproto.as_pg_string_and_size(
                 settings, item_text, &pg_item_str, &pg_item_len)
-            item_buf.buf = pg_item_str
-            item_buf.len = pg_item_len
-            item = decoder(settings, item_buf, decoder_arg)
+            frb_init(&item_buf, pg_item_str, pg_item_len)
+            item = decoder(settings, &item_buf, decoder_arg)
 
         # Place the decoded element in the array.
         cpython.Py_INCREF(item)
@@ -815,7 +814,7 @@ cdef uint4_encode_ex(ConnectionSettings settings, WriteBuffer buf, object obj,
     return pgproto.uint4_encode(settings, buf, obj)
 
 
-cdef uint4_decode_ex(ConnectionSettings settings, FastReadBuffer buf,
+cdef uint4_decode_ex(ConnectionSettings settings, FRBuffer *buf,
                      const void *arg):
     return pgproto.uint4_decode(settings, buf)
 
@@ -825,7 +824,7 @@ cdef arrayoid_encode(ConnectionSettings settings, WriteBuffer buf, items):
                  <encode_func_ex>&uint4_encode_ex, NULL)
 
 
-cdef arrayoid_decode(ConnectionSettings settings, FastReadBuffer buf):
+cdef arrayoid_decode(ConnectionSettings settings, FRBuffer *buf):
     return array_decode(settings, buf, <decode_func_ex>&uint4_decode_ex, NULL)
 
 
@@ -834,7 +833,7 @@ cdef text_encode_ex(ConnectionSettings settings, WriteBuffer buf, object obj,
     return pgproto.text_encode(settings, buf, obj)
 
 
-cdef text_decode_ex(ConnectionSettings settings, FastReadBuffer buf,
+cdef text_decode_ex(ConnectionSettings settings, FRBuffer *buf,
                     const void *arg):
     return pgproto.text_decode(settings, buf)
 
@@ -844,11 +843,11 @@ cdef arraytext_encode(ConnectionSettings settings, WriteBuffer buf, items):
                  <encode_func_ex>&text_encode_ex, NULL)
 
 
-cdef arraytext_decode(ConnectionSettings settings, FastReadBuffer buf):
+cdef arraytext_decode(ConnectionSettings settings, FRBuffer *buf):
     return array_decode(settings, buf, <decode_func_ex>&text_decode_ex, NULL)
 
 
-cdef anyarray_decode(ConnectionSettings settings, FastReadBuffer buf):
+cdef anyarray_decode(ConnectionSettings settings, FRBuffer *buf):
     # Instances of anyarray (or any other polymorphic pseudotype) are
     # never supposed to be returned from actual queries.
     raise exceptions.ProtocolError(

asyncpg/protocol/codecs/array.pyx

@@ -10,7 +10,7 @@ ctypedef object (*encode_func)(ConnectionSettings settings,
                                object obj)
 
 ctypedef object (*decode_func)(ConnectionSettings settings,
-                               FastReadBuffer buf)
+                               FRBuffer *buf)
 
 ctypedef object (*codec_encode_func)(Codec codec,
                                      ConnectionSettings settings,
@@ -19,7 +19,7 @@ ctypedef object (*codec_encode_func)(Codec codec,
 
 ctypedef object (*codec_decode_func)(Codec codec,
                                      ConnectionSettings settings,
-                                     FastReadBuffer buf)
+                                     FRBuffer *buf)
 
 
 cdef enum CodecType:
@@ -101,29 +101,24 @@ cdef class Codec:
     cdef encode_in_python(self, ConnectionSettings settings, WriteBuffer buf,
                           object obj)
 
-    cdef decode_scalar(self, ConnectionSettings settings, FastReadBuffer buf)
+    cdef decode_scalar(self, ConnectionSettings settings, FRBuffer *buf)
 
-    cdef decode_array(self, ConnectionSettings settings, FastReadBuffer buf)
+    cdef decode_array(self, ConnectionSettings settings, FRBuffer *buf)
 
-    cdef decode_array_text(self, ConnectionSettings settings,
-                           FastReadBuffer buf)
+    cdef decode_array_text(self, ConnectionSettings settings, FRBuffer *buf)
 
-    cdef decode_range(self, ConnectionSettings settings, FastReadBuffer buf)
+    cdef decode_range(self, ConnectionSettings settings, FRBuffer *buf)
 
-    cdef decode_composite(self, ConnectionSettings settings,
-                          FastReadBuffer buf)
+    cdef decode_composite(self, ConnectionSettings settings, FRBuffer *buf)
 
-    cdef decode_in_python(self, ConnectionSettings settings,
-                          FastReadBuffer buf)
+    cdef decode_in_python(self, ConnectionSettings settings, FRBuffer *buf)
 
     cdef inline encode(self,
                        ConnectionSettings settings,
                        WriteBuffer buf,
                        object obj)
 
-    cdef inline decode(self,
-                       ConnectionSettings settings,
-                       FastReadBuffer buf)
+    cdef inline decode(self, ConnectionSettings settings, FRBuffer *buf)
 
     cdef has_encoder(self)
     cdef has_decoder(self)

asyncpg/protocol/codecs/base.pxd

@@ -191,25 +191,25 @@ cdef class Codec:
                 object obj):
         return self.encoder(self, settings, buf, obj)
 
-    cdef decode_scalar(self, ConnectionSettings settings, FastReadBuffer buf):
+    cdef decode_scalar(self, ConnectionSettings settings, FRBuffer *buf):
         return self.c_decoder(settings, buf)
 
-    cdef decode_array(self, ConnectionSettings settings, FastReadBuffer buf):
+    cdef decode_array(self, ConnectionSettings settings, FRBuffer *buf):
         return array_decode(settings, buf, codec_decode_func_ex,
                             <void*>(<cpython.PyObject>self.element_codec))
 
     cdef decode_array_text(self, ConnectionSettings settings,
-                           FastReadBuffer buf):
+                           FRBuffer *buf):
         return textarray_decode(settings, buf, codec_decode_func_ex,
                                 <void*>(<cpython.PyObject>self.element_codec),
                                 self.element_delimiter)
 
-    cdef decode_range(self, ConnectionSettings settings, FastReadBuffer buf):
+    cdef decode_range(self, ConnectionSettings settings, FRBuffer *buf):
         return range_decode(settings, buf, codec_decode_func_ex,
                             <void*>(<cpython.PyObject>self.element_codec))
 
     cdef decode_composite(self, ConnectionSettings settings,
-                          FastReadBuffer buf):
+                          FRBuffer *buf):
         cdef:
             object result
             ssize_t elem_count
@@ -218,9 +218,9 @@ cdef class Codec:
             uint32_t elem_typ
             uint32_t received_elem_typ
             Codec elem_codec
-            FastReadBuffer elem_buf = FastReadBuffer.new()
+            FRBuffer elem_buf
 
-        elem_count = <ssize_t><uint32_t>hton.unpack_int32(buf.read(4))
+        elem_count = <ssize_t><uint32_t>hton.unpack_int32(frb_read(buf, 4))
         if elem_count != len(self.element_type_oids):
             raise exceptions.OutdatedSchemaCacheError(
                 'unexpected number of attributes of composite type: '
@@ -235,7 +235,7 @@ cdef class Codec:
         result = record.ApgRecord_New(self.record_desc, elem_count)
         for i in range(elem_count):
             elem_typ = self.element_type_oids[i]
-            received_elem_typ = <uint32_t>hton.unpack_int32(buf.read(4))
+            received_elem_typ = <uint32_t>hton.unpack_int32(frb_read(buf, 4))
 
             if received_elem_typ != elem_typ:
                 raise exceptions.OutdatedSchemaCacheError(
@@ -253,21 +253,21 @@ cdef class Codec:
                     position=i,
                 )
 
-            elem_len = hton.unpack_int32(buf.read(4))
+            elem_len = hton.unpack_int32(frb_read(buf, 4))
             if elem_len == -1:
                 elem = None
             else:
                 elem_codec = self.element_codecs[i]
-                elem = elem_codec.decode(settings,
-                                         elem_buf.slice_from(buf, elem_len))
+                elem = elem_codec.decode(
+                    settings, frb_slice_from(&elem_buf, buf, elem_len))
 
             cpython.Py_INCREF(elem)
             record.ApgRecord_SET_ITEM(result, i, elem)
 
         return result
 
     cdef decode_in_python(self, ConnectionSettings settings,
-                          FastReadBuffer buf):
+                          FRBuffer *buf):
         if self.xformat == PG_XFORMAT_OBJECT:
             if self.format == PG_FORMAT_BINARY:
                 data = pgproto.bytea_decode(settings, buf)
@@ -284,7 +284,7 @@ cdef class Codec:
 
         return self.py_decoder(data)
 
-    cdef inline decode(self, ConnectionSettings settings, FastReadBuffer buf):
+    cdef inline decode(self, ConnectionSettings settings, FRBuffer *buf):
         return self.decoder(self, settings, buf)
 
     cdef inline has_encoder(self):
@@ -398,7 +398,7 @@ cdef codec_encode_func_ex(ConnectionSettings settings, WriteBuffer buf,
 
 
 # Decode callback for arrays
-cdef codec_decode_func_ex(ConnectionSettings settings, FastReadBuffer buf,
+cdef codec_decode_func_ex(ConnectionSettings settings, FRBuffer *buf,
                           const void *arg):
     return (<Codec>arg).decode(settings, buf)
 

asyncpg/protocol/codecs/base.pyx

@@ -108,30 +108,30 @@ cdef range_encode(ConnectionSettings settings, WriteBuffer buf,
     buf.write_buffer(bounds_data)
 
 
-cdef range_decode(ConnectionSettings settings, FastReadBuffer buf,
+cdef range_decode(ConnectionSettings settings, FRBuffer *buf,
                   decode_func_ex decoder, const void *decoder_arg):
     cdef:
-        uint8_t flags = <uint8_t>buf.read(1)[0]
+        uint8_t flags = <uint8_t>frb_read(buf, 1)[0]
         int32_t bound_len
         object lower = None
         object upper = None
-        FastReadBuffer bound_buf = FastReadBuffer.new()
+        FRBuffer bound_buf
 
     if _range_has_lbound(flags):
-        bound_len = hton.unpack_int32(buf.read(4))
+        bound_len = hton.unpack_int32(frb_read(buf, 4))
         if bound_len == -1:
             lower = None
         else:
-            bound_buf.slice_from(buf, bound_len)
-            lower = decoder(settings, bound_buf, decoder_arg)
+            frb_slice_from(&bound_buf, buf, bound_len)
+            lower = decoder(settings, &bound_buf, decoder_arg)
 
     if _range_has_ubound(flags):
-        bound_len = hton.unpack_int32(buf.read(4))
+        bound_len = hton.unpack_int32(frb_read(buf, 4))
         if bound_len == -1:
             upper = None
         else:
-            bound_buf.slice_from(buf, bound_len)
-            upper = decoder(settings, bound_buf, decoder_arg)
+            frb_slice_from(&bound_buf, buf, bound_len)
+            upper = decoder(settings, &bound_buf, decoder_arg)
 
     return apg_types.Range(lower=lower, upper=upper,
                            lower_inc=(flags & RANGE_LB_INC) != 0,

asyncpg/protocol/codecs/range.pyx

@@ -17,22 +17,22 @@ cdef inline record_encode_frame(ConnectionSettings settings, WriteBuffer buf,
     buf.write_buffer(elem_data)
 
 
-cdef anonymous_record_decode(ConnectionSettings settings, FastReadBuffer buf):
+cdef anonymous_record_decode(ConnectionSettings settings, FRBuffer *buf):
     cdef:
         tuple result
         ssize_t elem_count
         ssize_t i
         int32_t elem_len
         uint32_t elem_typ
         Codec elem_codec
-        FastReadBuffer elem_buf = FastReadBuffer.new()
+        FRBuffer elem_buf
 
-    elem_count = <ssize_t><uint32_t>hton.unpack_int32(buf.read(4))
+    elem_count = <ssize_t><uint32_t>hton.unpack_int32(frb_read(buf, 4))
     result = cpython.PyTuple_New(elem_count)
 
     for i in range(elem_count):
-        elem_typ = <uint32_t>hton.unpack_int32(buf.read(4))
-        elem_len = hton.unpack_int32(buf.read(4))
+        elem_typ = <uint32_t>hton.unpack_int32(frb_read(buf, 4))
+        elem_len = hton.unpack_int32(frb_read(buf, 4))
 
         if elem_len == -1:
             elem = None
@@ -43,7 +43,7 @@ cdef anonymous_record_decode(ConnectionSettings settings, FastReadBuffer buf):
                     'no decoder for composite type element in '
                     'position {} of type OID {}'.format(i, elem_typ))
             elem = elem_codec.decode(settings,
-                                     elem_buf.slice_from(buf, elem_len))
+                                     frb_slice_from(&elem_buf, buf, elem_len))
 
         cpython.Py_INCREF(elem)
         cpython.PyTuple_SET_ITEM(result, i, elem)