Skip to content

Improve performance when reading 28 bit nodes #54

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

Merged
horgh merged 3 commits into from
Dec 12, 2019
Merged

Improve performance when reading 28 bit nodes #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4044984
Improve performance when reading 28 bit nodes
oschwald Dec 11, 2019
e1e2c97
Set a fixed seed in benchmark
oschwald Dec 11, 2019
7e5bdb0
Test on Python 3.8
oschwald Dec 11, 2019
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
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ matrix:
dist: trusty
- python: 3.7
dist: xenial
- python: 3.8
dist: xenial
env: RUN_LINTER=1
- python: nightly
dist: xenial
Expand Down
1 change: 1 addition & 0 deletions examples/benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

args = parser.parse_args()

random.seed(0)
reader = maxminddb.open_database(args.file, args.mode)


Expand Down
14 changes: 6 additions & 8 deletions maxminddb/reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

import struct

from maxminddb.compat import byte_from_int, compat_ip_address, string_type
from maxminddb.compat import compat_ip_address, string_type
from maxminddb.const import MODE_AUTO, MODE_MMAP, MODE_FILE, MODE_MEMORY, MODE_FD
from maxminddb.decoder import Decoder
from maxminddb.errors import InvalidDatabaseError
Expand Down Expand Up @@ -179,15 +179,13 @@ def _read_node(self, node_number, index):
offset = base_offset + index * 3
node_bytes = b'\x00' + self._buffer[offset:offset + 3]
elif record_size == 28:
(middle, ) = struct.unpack(
b'!B', self._buffer[base_offset + 3:base_offset + 4])
offset = base_offset + 3 * index
node_bytes = bytearray(self._buffer[offset:offset + 4])
if index:
middle &= 0x0F
node_bytes[0] = 0x0F & node_bytes[0]
else:
middle = (0xF0 & middle) >> 4
offset = base_offset + index * 4
node_bytes = byte_from_int(middle) + self._buffer[offset:offset +
3]
middle = (0xF0 & node_bytes.pop()) >> 4
node_bytes.insert(0, middle)
elif record_size == 32:
offset = base_offset + index * 4
node_bytes = self._buffer[offset:offset + 4]
Expand Down