Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-125196: Use PyUnicodeWriter in HAMT #125458

Merged
merged 3 commits into from
Oct 15, 2024
Merged

gh-125196: Use PyUnicodeWriter in HAMT #125458

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
974e343
gh-125196: Use PyUnicodeWriter in HAMT
vstinner Oct 14, 2024
3cc9e8c
Apply suggestions from code review
vstinner Oct 14, 2024
6f7813a
Merge branch 'main' into writer_hamt
vstinner Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 30 additions & 50 deletions Python/hamt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ hamt_node_find(PyHamtNode *node,
#ifdef Py_DEBUG
static int
hamt_node_dump(PyHamtNode *node,
_PyUnicodeWriter *writer, int level);
PyUnicodeWriter *writer, int level);
#endif

static PyHamtNode *
Expand Down Expand Up @@ -444,7 +444,7 @@ hamt_bitindex(uint32_t bitmap, uint32_t bit)
#ifdef Py_DEBUG

static int
_hamt_dump_ident(_PyUnicodeWriter *writer, int level)
_hamt_dump_ident(PyUnicodeWriter *writer, int level)
{
/* Write `' ' * level` to the `writer` */
PyObject *str = NULL;
Expand All @@ -467,7 +467,7 @@ _hamt_dump_ident(_PyUnicodeWriter *writer, int level)
goto error;
}

ret = _PyUnicodeWriter_WriteStr(writer, res);
ret = PyUnicodeWriter_WriteStr(writer, res);

error:
Py_XDECREF(res);
Expand All @@ -476,29 +476,6 @@ _hamt_dump_ident(_PyUnicodeWriter *writer, int level)
return ret;
}

static int
_hamt_dump_format(_PyUnicodeWriter *writer, const char *format, ...)
{
/* A convenient helper combining _PyUnicodeWriter_WriteStr and
PyUnicode_FromFormatV.
*/
PyObject* msg;
int ret;

va_list vargs;
va_start(vargs, format);
msg = PyUnicode_FromFormatV(format, vargs);
va_end(vargs);

if (msg == NULL) {
return -1;
}

ret = _PyUnicodeWriter_WriteStr(writer, msg);
Py_DECREF(msg);
return ret;
}

#endif /* Py_DEBUG */
/////////////////////////////////// Bitmap Node

Expand Down Expand Up @@ -1154,7 +1131,7 @@ hamt_node_bitmap_dealloc(PyHamtNode_Bitmap *self)
#ifdef Py_DEBUG
static int
hamt_node_bitmap_dump(PyHamtNode_Bitmap *node,
_PyUnicodeWriter *writer, int level)
PyUnicodeWriter *writer, int level)
{
/* Debug build: __dump__() method implementation for Bitmap nodes. */

Expand All @@ -1166,8 +1143,8 @@ hamt_node_bitmap_dump(PyHamtNode_Bitmap *node,
goto error;
}

if (_hamt_dump_format(writer, "BitmapNode(size=%zd count=%zd ",
Py_SIZE(node), Py_SIZE(node) / 2))
if (PyUnicodeWriter_Format(writer, "BitmapNode(size=%zd count=%zd ",
Py_SIZE(node), Py_SIZE(node) / 2) < 0)
{
goto error;
}
Expand All @@ -1181,7 +1158,8 @@ hamt_node_bitmap_dump(PyHamtNode_Bitmap *node,
if (tmp2 == NULL) {
goto error;
}
if (_hamt_dump_format(writer, "bitmap=%S id=%p):\n", tmp2, node)) {
if (PyUnicodeWriter_Format(writer, "bitmap=%S id=%p):\n",
tmp2, node) < 0) {
vstinner marked this conversation as resolved.
Show resolved Hide resolved
Py_DECREF(tmp2);
goto error;
}
Expand All @@ -1196,7 +1174,7 @@ hamt_node_bitmap_dump(PyHamtNode_Bitmap *node,
}

if (key_or_null == NULL) {
if (_hamt_dump_format(writer, "NULL:\n")) {
if (PyUnicodeWriter_WriteUTF8(writer, "NULL:\n", -1) < 0) {
goto error;
}

Expand All @@ -1207,14 +1185,14 @@ hamt_node_bitmap_dump(PyHamtNode_Bitmap *node,
}
}
else {
if (_hamt_dump_format(writer, "%R: %R", key_or_null,
val_or_node))
if (PyUnicodeWriter_Format(writer, "%R: %R",
key_or_null, val_or_node) < 0)
{
goto error;
}
}

if (_hamt_dump_format(writer, "\n")) {
if (PyUnicodeWriter_WriteUTF8(writer, "\n", 1) < 0) {
goto error;
}
}
Expand Down Expand Up @@ -1548,7 +1526,7 @@ hamt_node_collision_dealloc(PyHamtNode_Collision *self)
#ifdef Py_DEBUG
static int
hamt_node_collision_dump(PyHamtNode_Collision *node,
_PyUnicodeWriter *writer, int level)
PyUnicodeWriter *writer, int level)
{
/* Debug build: __dump__() method implementation for Collision nodes. */

Expand All @@ -1558,8 +1536,8 @@ hamt_node_collision_dump(PyHamtNode_Collision *node,
goto error;
}

if (_hamt_dump_format(writer, "CollisionNode(size=%zd id=%p):\n",
Py_SIZE(node), node))
if (PyUnicodeWriter_Format(writer, "CollisionNode(size=%zd id=%p):\n",
Py_SIZE(node), node) < 0)
vstinner marked this conversation as resolved.
Show resolved Hide resolved
{
goto error;
}
Expand All @@ -1572,7 +1550,7 @@ hamt_node_collision_dump(PyHamtNode_Collision *node,
goto error;
}

if (_hamt_dump_format(writer, "%R: %R\n", key, val)) {
if (PyUnicodeWriter_Format(writer, "%R: %R\n", key, val) < 0) {
goto error;
}
}
Expand Down Expand Up @@ -1924,7 +1902,7 @@ hamt_node_array_dealloc(PyHamtNode_Array *self)
#ifdef Py_DEBUG
static int
hamt_node_array_dump(PyHamtNode_Array *node,
_PyUnicodeWriter *writer, int level)
PyUnicodeWriter *writer, int level)
{
/* Debug build: __dump__() method implementation for Array nodes. */

Expand All @@ -1934,7 +1912,7 @@ hamt_node_array_dump(PyHamtNode_Array *node,
goto error;
}

if (_hamt_dump_format(writer, "ArrayNode(id=%p):\n", node)) {
if (PyUnicodeWriter_Format(writer, "ArrayNode(id=%p):\n", node) < 0) {
goto error;
}

Expand All @@ -1947,15 +1925,15 @@ hamt_node_array_dump(PyHamtNode_Array *node,
goto error;
}

if (_hamt_dump_format(writer, "%zd::\n", i)) {
if (PyUnicodeWriter_Format(writer, "%zd::\n", i) < 0) {
goto error;
}

if (hamt_node_dump(node->a_array[i], writer, level + 1)) {
goto error;
}

if (_hamt_dump_format(writer, "\n")) {
if (PyUnicodeWriter_WriteUTF8(writer, "\n", 1) < 0) {
goto error;
}
}
Expand Down Expand Up @@ -2071,7 +2049,7 @@ hamt_node_find(PyHamtNode *node,
#ifdef Py_DEBUG
static int
hamt_node_dump(PyHamtNode *node,
_PyUnicodeWriter *writer, int level)
PyUnicodeWriter *writer, int level)
{
/* Debug build: __dump__() method implementation for a node.

Expand Down Expand Up @@ -2440,22 +2418,24 @@ _PyHamt_New(void)
static PyObject *
hamt_dump(PyHamtObject *self)
{
_PyUnicodeWriter writer;

_PyUnicodeWriter_Init(&writer);
PyUnicodeWriter *writer = PyUnicodeWriter_Create(0);
if (writer == NULL) {
return NULL;
}

if (_hamt_dump_format(&writer, "HAMT(len=%zd):\n", self->h_count)) {
if (PyUnicodeWriter_Format(writer, "HAMT(len=%zd):\n",
self->h_count) < 0) {
goto error;
}

if (hamt_node_dump(self->h_root, &writer, 0)) {
if (hamt_node_dump(self->h_root, writer, 0)) {
goto error;
}

return _PyUnicodeWriter_Finish(&writer);
return PyUnicodeWriter_Finish(writer);

error:
_PyUnicodeWriter_Dealloc(&writer);
PyUnicodeWriter_Discard(writer);
return NULL;
}
#endif /* Py_DEBUG */
Expand Down
Loading