| quark |
| Restricted Project |
In a future diff we'll be doing metadata parsing in another function as well, so
let's move it to a separate function.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | cstore/py-cdatapack.h (132 lines) |
| Py_XDECREF(retnode); | Py_XDECREF(retnode); | ||||
| Py_XDECREF(deltabaseindexoffset); | Py_XDECREF(deltabaseindexoffset); | ||||
| Py_XDECREF(data_offset); | Py_XDECREF(data_offset); | ||||
| Py_XDECREF(data_size); | Py_XDECREF(data_size); | ||||
| return tuple; | return tuple; | ||||
| } | } | ||||
| PyObject *readpymeta(delta_chain_link_t *link) { | |||||
| /* sync these with remotefilelog.constants */ | |||||
| const char METAKEYFLAG = 'f'; | |||||
| const char METAKEYSIZE = 's'; | |||||
| PyObject *pymeta = PyDict_New(); | |||||
| if (pymeta == NULL) { | |||||
| return PyErr_NoMemory(); | |||||
| } | |||||
| if (link->meta == NULL || link->meta_sz == 0) { | |||||
| // no metadata, usually means it's version 0 | |||||
| return pymeta; | |||||
| } | |||||
| const char *p = (const char *)link->meta; | |||||
| const char *end = p + link->meta_sz; | |||||
| while (p + 3 <= end) { /* 3: ensure 1-byte key, 2-byte size exist */ | |||||
| const char key[2] = {*p, 0}; | |||||
| p += 1; | |||||
| const uint16_t entry_size = ntohs(*((uint16_t *) p)); | |||||
| p += sizeof(entry_size); /* 2-byte size */ | |||||
| if (entry_size + p > end) { | |||||
| goto err_cleanup; | |||||
| } | |||||
| PyObject *pyv = NULL; | |||||
| switch (key[0]) { | |||||
| case METAKEYFLAG: | |||||
| case METAKEYSIZE: | |||||
| { /* an integer field */ | |||||
| unsigned long long v = 0; | |||||
| for (const char *vp = p; vp < p + entry_size; ++vp) { | |||||
| v = (v << 8) | *((uint8_t *) vp); | |||||
| } | |||||
| pyv = PyLong_FromUnsignedLongLong(v); | |||||
| } | |||||
| break; | |||||
| default: | |||||
| { /* treat value as a string field */ | |||||
| pyv = PyString_FromStringAndSize(p, entry_size); | |||||
| } | |||||
| } | |||||
| if (pyv == NULL) { | |||||
| goto err_cleanup; | |||||
| } | |||||
| if (PyDict_SetItemString(pymeta, key, pyv) == -1) { | |||||
| Py_XDECREF(pyv); | |||||
| goto err_cleanup; | |||||
| } | |||||
| p += entry_size; | |||||
| } | |||||
| if (p != end) { | |||||
| goto err_cleanup; | |||||
| } | |||||
| return pymeta; | |||||
| err_cleanup: | |||||
| PyErr_Format(PyExc_ValueError, "corrupted datapack metadata"); | |||||
| Py_XDECREF(pymeta); | |||||
| return NULL; | |||||
| } | |||||
| /** | /** | ||||
| * Finds a node and returns a list of (filename, node, filename, delta base | * Finds a node and returns a list of (filename, node, filename, delta base | ||||
| * node, delta) tuples if found. | * node, delta) tuples if found. | ||||
| */ | */ | ||||
| static PyObject *cdatapack_getdeltachain( | static PyObject *cdatapack_getdeltachain( | ||||
| py_cdatapack *self, | py_cdatapack *self, | ||||
| PyObject *args) { | PyObject *args) { | ||||
| const char *node; | const char *node; | ||||
| result = NULL; | result = NULL; | ||||
| cleanup: | cleanup: | ||||
| freedeltachain(chain); | freedeltachain(chain); | ||||
| return result; | return result; | ||||
| } | } | ||||
| static PyObject *cdatapack_getmeta(py_cdatapack *self, PyObject *args) { | static PyObject *cdatapack_getmeta(py_cdatapack *self, PyObject *args) { | ||||
| /* sync these with remotefilelog.constants */ | |||||
| const char METAKEYFLAG = 'f'; | |||||
| const char METAKEYSIZE = 's'; | |||||
| const char *node; | const char *node; | ||||
| Py_ssize_t node_sz; | Py_ssize_t node_sz; | ||||
| if (!PyArg_ParseTuple(args, "s#", &node, &node_sz)) { | if (!PyArg_ParseTuple(args, "s#", &node, &node_sz)) { | ||||
| return NULL; | return NULL; | ||||
| } | } | ||||
| if (node_sz != NODE_SZ) { | if (node_sz != NODE_SZ) { | ||||
| PyErr_Format(PyExc_ValueError, "node must be %d bytes long", NODE_SZ); | PyErr_Format(PyExc_ValueError, "node must be %d bytes long", NODE_SZ); | ||||
| ((uint8_t *) self->handle->data_mmap) + index_entry.data_offset, | ((uint8_t *) self->handle->data_mmap) + index_entry.data_offset, | ||||
| &link); | &link); | ||||
| if (next.code != GET_DELTA_CHAIN_LINK_OK) { | if (next.code != GET_DELTA_CHAIN_LINK_OK) { | ||||
| PyErr_SetObject(PyExc_KeyError, &args[0]); | PyErr_SetObject(PyExc_KeyError, &args[0]); | ||||
| return NULL; | return NULL; | ||||
| } | } | ||||
| PyObject *pymeta = PyDict_New(); | return readpymeta(&link); | ||||
| if (pymeta == NULL) { | |||||
| return PyErr_NoMemory(); | |||||
| } | |||||
| if (link.meta == NULL || link.meta_sz == 0) { | |||||
| // no metadata, usually means it's version 0 | |||||
| return pymeta; | |||||
| } | |||||
| const char *p = (const char *)link.meta; | |||||
| const char *end = p + link.meta_sz; | |||||
| while (p + 3 <= end) { /* 3: ensure 1-byte key, 2-byte size exist */ | |||||
| const char key[2] = {*p, 0}; | |||||
| p += 1; | |||||
| const uint16_t entry_size = ntohs(*((uint16_t *) p)); | |||||
| p += sizeof(entry_size); /* 2-byte size */ | |||||
| if (entry_size + p > end) { | |||||
| goto err_cleanup; | |||||
| } | |||||
| PyObject *pyv = NULL; | |||||
| switch (key[0]) { | |||||
| case METAKEYFLAG: | |||||
| case METAKEYSIZE: | |||||
| { /* an integer field */ | |||||
| unsigned long long v = 0; | |||||
| for (const char *vp = p; vp < p + entry_size; ++vp) { | |||||
| v = (v << 8) | *((uint8_t *) vp); | |||||
| } | |||||
| pyv = PyLong_FromUnsignedLongLong(v); | |||||
| } | |||||
| break; | |||||
| default: | |||||
| { /* treat value as a string field */ | |||||
| pyv = PyString_FromStringAndSize(p, entry_size); | |||||
| } | |||||
| } | |||||
| if (pyv == NULL) { | |||||
| goto err_cleanup; | |||||
| } | |||||
| if (PyDict_SetItemString(pymeta, key, pyv) == -1) { | |||||
| Py_XDECREF(pyv); | |||||
| goto err_cleanup; | |||||
| } | |||||
| p += entry_size; | |||||
| } | |||||
| if (p != end) { | |||||
| goto err_cleanup; | |||||
| } | |||||
| return pymeta; | |||||
| err_cleanup: | |||||
| PyErr_Format(PyExc_ValueError, "corrupted datapack metadata"); | |||||
| Py_XDECREF(pymeta); | |||||
| return NULL; | |||||
| } | } | ||||
| // ==== cdatapack ctype declaration ==== | // ==== cdatapack ctype declaration ==== | ||||
| static PyMethodDef cdatapack_methods[] = { | static PyMethodDef cdatapack_methods[] = { | ||||
| {"iterentries", (PyCFunction)cdatapack_getiterentries, | {"iterentries", (PyCFunction)cdatapack_getiterentries, | ||||
| METH_NOARGS, | METH_NOARGS, | ||||
| "Iterate over (path, nodeid, deltabasenode, delta) tuples in this " | "Iterate over (path, nodeid, deltabasenode, delta) tuples in this " | ||||