| hg-reviewers |
This is always a cycle right now, but it will not be for the nodetree
instances I'm planning to add later (see earlier patch).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cext/revlog.c (8 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| * supported and proper types are used in the extensions themselves. */ | * supported and proper types are used in the extensions themselves. */ | ||||
| #define PyInt_Check PyLong_Check | #define PyInt_Check PyLong_Check | ||||
| #define PyInt_FromLong PyLong_FromLong | #define PyInt_FromLong PyLong_FromLong | ||||
| #define PyInt_FromSsize_t PyLong_FromSsize_t | #define PyInt_FromSsize_t PyLong_FromSsize_t | ||||
| #define PyInt_AS_LONG PyLong_AS_LONG | #define PyInt_AS_LONG PyLong_AS_LONG | ||||
| #define PyInt_AsLong PyLong_AsLong | #define PyInt_AsLong PyLong_AsLong | ||||
| #endif | #endif | ||||
| typedef struct indexObjectStruct indexObject; | |||||
| typedef struct { | typedef struct { | ||||
| int children[16]; | int children[16]; | ||||
| } nodetreenode; | } nodetreenode; | ||||
| /* | /* | ||||
| * A base-16 trie for fast node->rev mapping. | * A base-16 trie for fast node->rev mapping. | ||||
| * | * | ||||
| * Positive value is index of the next node in the trie | * Positive value is index of the next node in the trie | ||||
| * Negative value is a leaf: -(rev + 2) | * Negative value is a leaf: -(rev + 2) | ||||
| * Zero is empty | * Zero is empty | ||||
| */ | */ | ||||
| typedef struct { | typedef struct { | ||||
| indexObject *index; | |||||
| nodetreenode *nodes; | nodetreenode *nodes; | ||||
| unsigned length; /* # nodes in use */ | unsigned length; /* # nodes in use */ | ||||
| unsigned capacity; /* # nodes allocated */ | unsigned capacity; /* # nodes allocated */ | ||||
| int depth; /* maximum depth of tree */ | int depth; /* maximum depth of tree */ | ||||
| int splits; /* # splits performed */ | int splits; /* # splits performed */ | ||||
| } nodetree; | } nodetree; | ||||
| /* | /* | ||||
| * This class has two behaviors. | * This class has two behaviors. | ||||
| * | * | ||||
| * When used in a list-like way (with integer keys), we decode an | * When used in a list-like way (with integer keys), we decode an | ||||
| * entry in a RevlogNG index file on demand. Our last entry is a | * entry in a RevlogNG index file on demand. Our last entry is a | ||||
| * sentinel, always a nullid. We have limited support for | * sentinel, always a nullid. We have limited support for | ||||
| * integer-keyed insert and delete, only at elements right before the | * integer-keyed insert and delete, only at elements right before the | ||||
| * sentinel. | * sentinel. | ||||
| * | * | ||||
| * With string keys, we lazily perform a reverse mapping from node to | * With string keys, we lazily perform a reverse mapping from node to | ||||
| * rev, using a base-16 trie. | * rev, using a base-16 trie. | ||||
| */ | */ | ||||
| typedef struct { | struct indexObjectStruct { | ||||
| PyObject_HEAD | PyObject_HEAD | ||||
| /* Type-specific fields go here. */ | /* Type-specific fields go here. */ | ||||
| PyObject *data; /* raw bytes of index */ | PyObject *data; /* raw bytes of index */ | ||||
| Py_buffer buf; /* buffer of data */ | Py_buffer buf; /* buffer of data */ | ||||
| PyObject **cache; /* cached tuples */ | PyObject **cache; /* cached tuples */ | ||||
| const char **offsets; /* populated on demand */ | const char **offsets; /* populated on demand */ | ||||
| Py_ssize_t raw_length; /* original number of elements */ | Py_ssize_t raw_length; /* original number of elements */ | ||||
| Py_ssize_t length; /* current number of elements */ | Py_ssize_t length; /* current number of elements */ | ||||
| PyObject *added; /* populated on demand */ | PyObject *added; /* populated on demand */ | ||||
| PyObject *headrevs; /* cache, invalidated on changes */ | PyObject *headrevs; /* cache, invalidated on changes */ | ||||
| PyObject *filteredrevs;/* filtered revs set */ | PyObject *filteredrevs;/* filtered revs set */ | ||||
| nodetree *nt; /* base-16 trie */ | nodetree *nt; /* base-16 trie */ | ||||
| int ntrev; /* last rev scanned */ | int ntrev; /* last rev scanned */ | ||||
| int ntlookups; /* # lookups */ | int ntlookups; /* # lookups */ | ||||
| int ntmisses; /* # lookups that miss the cache */ | int ntmisses; /* # lookups that miss the cache */ | ||||
| int inlined; | int inlined; | ||||
| } indexObject; | }; | ||||
| static Py_ssize_t index_length(const indexObject *self) | static Py_ssize_t index_length(const indexObject *self) | ||||
| { | { | ||||
| if (self->added == NULL) | if (self->added == NULL) | ||||
| return self->length - 1; | return self->length - 1; | ||||
| return self->length + PyList_GET_SIZE(self->added) - 1; | return self->length + PyList_GET_SIZE(self->added) - 1; | ||||
| } | } | ||||
| return -1; | return -1; | ||||
| } | } | ||||
| self->ntrev = (int)index_length(self); | self->ntrev = (int)index_length(self); | ||||
| self->ntlookups = 1; | self->ntlookups = 1; | ||||
| self->ntmisses = 0; | self->ntmisses = 0; | ||||
| self->nt->depth = 0; | self->nt->depth = 0; | ||||
| self->nt->splits = 0; | self->nt->splits = 0; | ||||
| self->nt->length = 1; | self->nt->length = 1; | ||||
| self->nt->index = self; | |||||
| if (nt_insert(self, nullid, -1) == -1) { | if (nt_insert(self, nullid, -1) == -1) { | ||||
| free(self->nt->nodes); | free(self->nt->nodes); | ||||
| PyMem_Free(self->nt); | PyMem_Free(self->nt); | ||||
| self->nt = NULL; | self->nt = NULL; | ||||
| return -1; | return -1; | ||||
| } | } | ||||
| } | } | ||||
| return 0; | return 0; | ||||