Code refactoring, all content except Cpython

Author: zhanghaitao3

.github/workflows/install-krb5.sh

@@ -419,7 +419,7 @@ cdef textarray_decode(ConnectionSettings settings, FRBuffer *buf,
 
     # Make a copy of array data since we will be mutating it for
     # the purposes of element decoding.
-    s = gaussdbproto.text_decode(settings, buf)
+    s = pgproto.text_decode(settings, buf)
     array_text = cpythonx.PyUnicode_AsUCS4Copy(s)
 
     try:
@@ -648,7 +648,7 @@ cdef _textarray_decode(ConnectionSettings settings,
 
             # Prepare the element buffer and call the text decoder
             # for the element type.
-            gaussdbproto.as_pg_string_and_size(
+            pgproto.as_pg_string_and_size(
                 settings, item_text, &pg_item_str, &pg_item_len)
             frb_init(&item_buf, pg_item_str, pg_item_len)
             item = decoder(settings, &item_buf, decoder_arg)
@@ -822,12 +822,12 @@ cdef _infer_array_dims(const Py_UCS4 *array_text,
 
 cdef uint4_encode_ex(ConnectionSettings settings, WriteBuffer buf, object obj,
                      const void *arg):
-    return gaussdbproto.uint4_encode(settings, buf, obj)
+    return pgproto.uint4_encode(settings, buf, obj)
 
 
 cdef uint4_decode_ex(ConnectionSettings settings, FRBuffer *buf,
                      const void *arg):
-    return gaussdbproto.uint4_decode(settings, buf)
+    return pgproto.uint4_decode(settings, buf)
 
 
 cdef arrayoid_encode(ConnectionSettings settings, WriteBuffer buf, items):
@@ -841,12 +841,12 @@ cdef arrayoid_decode(ConnectionSettings settings, FRBuffer *buf):
 
 cdef text_encode_ex(ConnectionSettings settings, WriteBuffer buf, object obj,
                     const void *arg):
-    return gaussdbproto.text_encode(settings, buf, obj)
+    return pgproto.text_encode(settings, buf, obj)
 
 
 cdef text_decode_ex(ConnectionSettings settings, FRBuffer *buf,
                     const void *arg):
-    return gaussdbproto.text_decode(settings, buf)
+    return pgproto.text_decode(settings, buf)
 
 
 cdef arraytext_encode(ConnectionSettings settings, WriteBuffer buf, items):

.github/workflows/install-postgres.sh

@@ -385,7 +385,7 @@ cdef init_txid_codecs():
                         <decode_func>pgproto.text_decode,
                         PG_FORMAT_TEXT)
 
-    register_core_codec(PG_SNAPSHOTOID,
+    register_core_codec(pg_snapshotOID,
                         <encode_func>pgproto.pg_snapshot_encode,
                         <decode_func>pgproto.pg_snapshot_decode,
                         PG_FORMAT_BINARY)

async_gaussdb/protocol/codecs/array.pyx

@@ -513,7 +513,7 @@ cdef class CoreProtocol:
             object row
             bytes mem
 
-        if PG_DEBUG:
+        if GAUSSDB_DEBUG:
             if buf.get_message_type() != b'D':
                 raise apg_exc.InternalClientError(
                     '_parse_data_msgs: first message is not "D"')
@@ -523,7 +523,7 @@ cdef class CoreProtocol:
                 buf.discard_message()
             return
 
-        if PG_DEBUG:
+        if GAUSSDB_DEBUG:
             if type(self.result) is not list:
                 raise apg_exc.InternalClientError(
                     '_parse_data_msgs: result is not a list, but {!r}'.

async_gaussdb/protocol/codecs/pgproto.pyx

@@ -106,7 +106,7 @@ DEF ANYCOMPATIBLEMULTIRANGEOID = 4538
 DEF PG_BRIN_BLOOM_SUMMARYOID = 4600
 DEF PG_BRIN_MINMAX_MULTI_SUMMARYOID = 4601
 DEF PG_MCV_LISTOID = 5017
-DEF PG_SNAPSHOTOID = 5038
+DEF pg_snapshotOID = 5038
 DEF XID8OID = 5069
 DEF ANYCOMPATIBLEOID = 5077
 DEF ANYCOMPATIBLEARRAYOID = 5078
@@ -175,7 +175,7 @@ BUILTIN_TYPE_OID_MAP = {
     PG_MCV_LISTOID: 'pg_mcv_list',
     PG_NDISTINCTOID: 'pg_ndistinct',
     PG_NODE_TREEOID: 'pg_node_tree',
-    PG_SNAPSHOTOID: 'pg_snapshot',
+    pg_snapshotOID: 'pg_snapshot',
     POINTOID: 'point',
     POLYGONOID: 'polygon',
     RECORDOID: 'record',

async_gaussdb/protocol/coreproto.pyx

@@ -8,7 +8,7 @@
 from libc.stdint cimport int16_t, int32_t, uint16_t, \
                          uint32_t, int64_t, uint64_t
 
-from async_gaussdb.pgproto.debug cimport PG_DEBUG
+from async_gaussdb.pgproto.debug cimport GAUSSDB_DEBUG
 
 from async_gaussdb.pgproto.pgproto cimport (
     WriteBuffer,

async_gaussdb/protocol/pgtypes.pxi

@@ -804,7 +804,7 @@ cdef class BaseProtocol(CoreProtocol):
         waiter.set_result(True)
 
     cdef _on_result__prepare(self, object waiter):
-        if PG_DEBUG:
+        if GAUSSDB_DEBUG:
             if self.statement is None:
                 raise apg_exc.InternalClientError(
                     '_on_result__prepare: statement is None')
@@ -851,7 +851,7 @@ cdef class BaseProtocol(CoreProtocol):
         waiter.set_result(status_msg)
 
     cdef _decode_row(self, const char* buf, ssize_t buf_len):
-        if PG_DEBUG:
+        if GAUSSDB_DEBUG:
             if self.statement is None:
                 raise apg_exc.InternalClientError(
                     '_decode_row: statement is None')
@@ -863,7 +863,7 @@ cdef class BaseProtocol(CoreProtocol):
         self.waiter = None
 
         if waiter is None:
-            if PG_DEBUG:
+            if GAUSSDB_DEBUG:
                 raise apg_exc.InternalClientError('_on_result: waiter is None')
 
             if self.state == PROTOCOL_COPY_OUT_DATA or \