Skip to content

Commit bb01269

Browse files
committed
refactor: remove gaussdbproto submodule and include as regular directory
1 parent 53d19d2 commit bb01269

21 files changed

+641
-642
lines changed

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "async_gaussdb/pgproto"]
2-
path = async_gaussdb/pgproto
3-
url = https://github.com/MagicStack/py-pgproto.git
1+
[submodule "async_gaussdb/gaussdbproto"]
2+
path = async_gaussdb/gaussdbproto
3+
url = https://github.com/MagicStack/py-gaussdbproto.git

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ all: compile
1010

1111
clean:
1212
rm -fr dist/ doc/_build/
13-
rm -fr async_gaussdb/pgproto/*.c async_gaussdb/pgproto/*.html
14-
rm -fr async_gaussdb/pgproto/codecs/*.html
15-
rm -fr async_gaussdb/pgproto/*.so
13+
rm -fr async_gaussdb/gaussdbproto/*.c async_gaussdb/gaussdbproto/*.html
14+
rm -fr async_gaussdb/gaussdbproto/codecs/*.html
15+
rm -fr async_gaussdb/gaussdbproto/*.so
1616
rm -fr async_gaussdb/protocol/*.c async_gaussdb/protocol/*.html
1717
rm -fr async_gaussdb/protocol/*.so build *.egg-info
1818
rm -fr async_gaussdb/protocol/codecs/*.html

async_gaussdb/pgproto

Lines changed: 0 additions & 1 deletion
This file was deleted.

async_gaussdb/protocol/codecs/array.pyx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ cdef textarray_decode(ConnectionSettings settings, FRBuffer *buf,
419419

420420
# Make a copy of array data since we will be mutating it for
421421
# the purposes of element decoding.
422-
s = pgproto.text_decode(settings, buf)
422+
s = gaussdbproto.text_decode(settings, buf)
423423
array_text = cpythonx.PyUnicode_AsUCS4Copy(s)
424424

425425
try:
@@ -467,8 +467,8 @@ cdef _textarray_decode(ConnectionSettings settings,
467467
object item
468468
str item_text
469469
FRBuffer item_buf
470-
char *pg_item_str
471-
ssize_t pg_item_len
470+
char *gaussdb_item_str
471+
ssize_t gaussdb_item_len
472472

473473
ptr = array_text
474474

@@ -648,9 +648,9 @@ cdef _textarray_decode(ConnectionSettings settings,
648648

649649
# Prepare the element buffer and call the text decoder
650650
# for the element type.
651-
pgproto.as_pg_string_and_size(
652-
settings, item_text, &pg_item_str, &pg_item_len)
653-
frb_init(&item_buf, pg_item_str, pg_item_len)
651+
gaussdbproto.as_gaussdb_string_and_size(
652+
settings, item_text, &gaussdb_item_str, &gaussdb_item_len)
653+
frb_init(&item_buf, gaussdb_item_str, gaussdb_item_len)
654654
item = decoder(settings, &item_buf, decoder_arg)
655655

656656
# Place the decoded element in the array.
@@ -822,12 +822,12 @@ cdef _infer_array_dims(const Py_UCS4 *array_text,
822822

823823
cdef uint4_encode_ex(ConnectionSettings settings, WriteBuffer buf, object obj,
824824
const void *arg):
825-
return pgproto.uint4_encode(settings, buf, obj)
825+
return gaussdbproto.uint4_encode(settings, buf, obj)
826826

827827

828828
cdef uint4_decode_ex(ConnectionSettings settings, FRBuffer *buf,
829829
const void *arg):
830-
return pgproto.uint4_decode(settings, buf)
830+
return gaussdbproto.uint4_decode(settings, buf)
831831

832832

833833
cdef arrayoid_encode(ConnectionSettings settings, WriteBuffer buf, items):
@@ -841,12 +841,12 @@ cdef arrayoid_decode(ConnectionSettings settings, FRBuffer *buf):
841841

842842
cdef text_encode_ex(ConnectionSettings settings, WriteBuffer buf, object obj,
843843
const void *arg):
844-
return pgproto.text_encode(settings, buf, obj)
844+
return gaussdbproto.text_encode(settings, buf, obj)
845845

846846

847847
cdef text_decode_ex(ConnectionSettings settings, FRBuffer *buf,
848848
const void *arg):
849-
return pgproto.text_decode(settings, buf)
849+
return gaussdbproto.text_decode(settings, buf)
850850

851851

852852
cdef arraytext_encode(ConnectionSettings settings, WriteBuffer buf, items):
@@ -865,11 +865,11 @@ cdef init_array_codecs():
865865
register_core_codec(_OIDOID,
866866
<encode_func>&arrayoid_encode,
867867
<decode_func>&arrayoid_decode,
868-
PG_FORMAT_BINARY)
868+
GAUSSDB_FORMAT_BINARY)
869869

870870
register_core_codec(_TEXTOID,
871871
<encode_func>&arraytext_encode,
872872
<decode_func>&arraytext_decode,
873-
PG_FORMAT_BINARY)
873+
GAUSSDB_FORMAT_BINARY)
874874

875875
init_array_codecs()

async_gaussdb/protocol/codecs/base.pxd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ cdef enum CodecType:
3333

3434

3535
cdef enum ServerDataFormat:
36-
PG_FORMAT_ANY = -1
37-
PG_FORMAT_TEXT = 0
38-
PG_FORMAT_BINARY = 1
36+
GAUSSDB_FORMAT_ANY = -1
37+
GAUSSDB_FORMAT_TEXT = 0
38+
GAUSSDB_FORMAT_BINARY = 1
3939

4040

4141
cdef enum ClientExchangeFormat:
42-
PG_XFORMAT_OBJECT = 1
43-
PG_XFORMAT_TUPLE = 2
42+
GAUSSDB_XFORMAT_OBJECT = 1
43+
GAUSSDB_XFORMAT_TUPLE = 2
4444

4545

4646
cdef class Codec:

0 commit comments

Comments
 (0)