Skip to content

Improve performance of long encoding #26

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

Open
jonhkr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve performance of long encoding #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions lib/avro/datum.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,24 @@ public static function encode_long($n): string
{
$n = (int) $n;
$n = ($n << 1) ^ ($n >> 63);
$str = '';

if ($n >= 0 && $n < 0x80) {
return chr($n);
}

$buf = [];
if (($n & ~0x7F) != 0) {
$str .= chr(($n | 0x80) & 0xFF);
$n = self::unsigned_right_shift($n, 7);
$buf []= ($n | 0x80) & 0xFF;
$n = ($n >> 7) ^ (($n >> 63) << 57); // unsigned shift right ($n >>> 7)

while ($n > 0x7F) {
$str .= chr(($n | 0x80) & 0xFF);
$n = self::unsigned_right_shift($n, 7);
$buf []= ($n | 0x80) & 0xFF;
$n >>= 7; // $n is always positive here
}
}

$str .= chr($n);
return $str;
$buf []= $n;
return pack("C*", ...$buf);
}

public static function decode_long(array $bytes): int {
Expand Down
12 changes: 12 additions & 0 deletions test/DatumIOTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,13 @@ function data_provider()

array('"long"', (int) -9223372036854775808, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x01"),
array('"long"', -(1<<62), "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x7F"),
array('"long"', -(1<<61), "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x3F"),
array('"long"', -4294967295, "\xFD\xFF\xFF\xFF\x1F"),
array('"long"', -1<<24, "\xFF\xFF\xFF\x0F"),
array('"long"', -1<<16, "\xFF\xFF\x07"),
array('"long"', -255, "\xFD\x03"),
array('"long"', -128, "\xFF\x01"),
array('"long"', -127, "\xFD\x01"),
array('"long"', -10, "\x13"),
array('"long"', -3, "\005"),
array('"long"', -2, "\003"),
Expand All @@ -110,7 +116,13 @@ function data_provider()
array('"long"', 2, "\004"),
array('"long"', 3, "\006"),
array('"long"', 10, "\x14"),
array('"long"', 127, "\xFE\x01"),
array('"long"', 128, "\x80\x02"),
array('"long"', 255, "\xFE\x03"),
array('"long"', 1<<16, "\x80\x80\x08"),
array('"long"', 1<<24, "\x80\x80\x80\x10"),
array('"long"', 4294967295, "\xFE\xFF\xFF\xFF\x1F"),
array('"long"', 1<<61, "\x80\x80\x80\x80\x80\x80\x80\x80\x40"),
array('"long"', 1<<62, "\x80\x80\x80\x80\x80\x80\x80\x80\x80\x01"),
array('"long"', 9223372036854775807, "\xFE\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x01"),

Expand Down