Dave Jarvis' Repositories

git clone https://repo.autonoma.ca/repo/treetrek.git
treetrek / Commits / 741963e

Applies minor optimizations

AuthorDave Jarvis <email>
Date2026-02-23 13:15:51 GMT-0800
Commit741963e905ee66dc77aee785a461a4885cbc7756
Parent68c009a
git/CompressionStream.php
}
-class ZlibExtractorStream implements CompressionStream {
+class ZlibDeflatorStream implements CompressionStream {
public function stream(
StreamReader $stream,
git/Git.php
public function getObjectSize( string $sha, string $path = '' ): int {
- return $path !== ''
- ? ( $this->resolvePath(
- $this->getTreeSha( $this->resolve( $sha ) ),
- $path
- )['sha'] ?? '' ) !== ''
- ? $this->packs->getSize( $this->resolvePath( $this->getTreeSha( $this->resolve( $sha ) ), $path )['sha'] )
- ?: $this->loose->getSize( $this->resolvePath( $this->getTreeSha( $this->resolve( $sha ) ), $path )['sha'] )
- : 0
- : ( $sha !== ''
- ? $this->packs->getSize( $sha ) ?: $this->loose->getSize( $sha )
- : 0 );
+ $target = $sha;
+
+ if( $path !== '' ) {
+ $target = $this->resolvePath(
+ $this->getTreeSha( $this->resolve( $sha ) ),
+ $path
+ )['sha'] ?? '';
+ }
+
+ return $target !== ''
+ ? $this->packs->getSize( $target )
+ ?: $this->loose->getSize( $target )
+ : 0;
}
git/PackEntryReader.php
private const MAX_CACHE = 1024;
- private DeltaDecoder $decoder;
- private array $cache;
- private int $cacheSize;
-
- public function __construct( DeltaDecoder $decoder ) {
- $this->decoder = $decoder;
- $this->cache = [];
- $this->cacheSize = 0;
- }
-
- public function getEntryMeta( PackContext $context ): array {
- return $context->computeArray(
- function( StreamReader $stream, int $offset ): array {
- $packStream = new GitPackStream( $stream );
- $packStream->seek( $offset );
- $hdr = $packStream->readVarInt();
-
- return [
- 'type' => $hdr['type'],
- 'size' => $hdr['size'],
- 'baseOffset' => $hdr['type'] === 6
- ? $offset - $packStream->readOffsetDelta()
- : 0,
- 'baseSha' => $hdr['type'] === 7
- ? \bin2hex( $packStream->read( 20 ) )
- : ''
- ];
- },
- [ 'type' => 0, 'size' => 0 ]
- );
- }
-
- public function getSize( PackContext $context ): int {
- return $context->computeIntDedicated(
- function( StreamReader $stream, int $offset ): int {
- $packStream = new GitPackStream( $stream );
- $packStream->seek( $offset );
- $hdr = $packStream->readVarInt();
-
- return $hdr['type'] === 6 || $hdr['type'] === 7
- ? $this->decoder->readDeltaTargetSize(
- $stream, $hdr['type']
- )
- : $hdr['size'];
- },
- 0
- );
- }
-
- public function read(
- PackContext $context,
- int $cap,
- callable $readShaBaseFn
- ): string {
- return $context->computeStringDedicated(
- function(
- StreamReader $s,
- int $o
- ) use ( $cap, $readShaBaseFn ): string {
- return $this->readWithStream(
- new GitPackStream( $s ), $o, $cap, $readShaBaseFn
- );
- },
- ''
- );
- }
-
- private function readWithStream(
- GitPackStream $stream,
- int $offset,
- int $cap,
- callable $readShaBaseFn
- ): string {
- $stream->seek( $offset );
- $hdr = $stream->readVarInt();
- $type = $hdr['type'];
-
- $result = isset( $this->cache[$offset] )
- ? ( $cap > 0 && \strlen( $this->cache[$offset] ) > $cap
- ? \substr( $this->cache[$offset], 0, $cap )
- : $this->cache[$offset] )
- : ( $type === 6
- ? $this->readOffsetDeltaContent(
- $stream, $offset, $cap, $readShaBaseFn
- )
- : ( $type === 7
- ? $this->readRefDeltaContent(
- $stream, $cap, $readShaBaseFn
- )
- : $this->inflate( $stream, $cap ) ) );
-
- if( $cap === 0 && !isset( $this->cache[$offset] ) ) {
- $this->cache[$offset] = $result;
- $this->cacheSize++;
-
- if( $this->cacheSize > self::MAX_CACHE ) {
- unset( $this->cache[\array_key_first( $this->cache )] );
- $this->cacheSize--;
- }
- }
-
- return $result;
- }
-
- private function readOffsetDeltaContent(
- GitPackStream $stream,
- int $offset,
- int $cap,
- callable $readShaBaseFn
- ): string {
- $neg = $stream->readOffsetDelta();
- $cur = $stream->tell();
- $bData = $this->readWithStream(
- $stream, $offset - $neg, $cap, $readShaBaseFn
- );
-
- $stream->seek( $cur );
-
- return $this->decoder->apply(
- $bData,
- $this->inflate( $stream ),
- $cap
- );
- }
-
- private function readRefDeltaContent(
- GitPackStream $stream,
- int $cap,
- callable $readShaBaseFn
- ): string {
- $sha = \bin2hex( $stream->read( 20 ) );
- $cur = $stream->tell();
- $bas = $readShaBaseFn( $sha, $cap );
-
- $stream->seek( $cur );
-
- return $this->decoder->apply(
- $bas,
- $this->inflate( $stream ),
- $cap
- );
- }
-
- public function streamRawCompressed(
- PackContext $context
- ): Generator {
- yield from $context->streamGenerator(
- function( StreamReader $stream, int $offset ): Generator {
- $packStream = new GitPackStream( $stream );
- $packStream->seek( $offset );
- $hdr = $packStream->readVarInt();
-
- yield from $hdr['type'] !== 6 && $hdr['type'] !== 7
- ? (new ZlibExtractorStream())->stream( $stream )
- : [];
- }
- );
- }
-
- public function streamRawDelta( PackContext $context ): Generator {
- yield from $context->streamGenerator(
- function( StreamReader $stream, int $offset ): Generator {
- $packStream = new GitPackStream( $stream );
- $packStream->seek( $offset );
- $hdr = $packStream->readVarInt();
-
- if( $hdr['type'] === 6 ) {
- $packStream->readOffsetDelta();
- } elseif( $hdr['type'] === 7 ) {
- $packStream->read( 20 );
- }
-
- yield from (new ZlibExtractorStream())->stream( $stream );
- }
- );
- }
-
- public function streamEntryGenerator(
- PackContext $context
- ): Generator {
- yield from $context->streamGeneratorDedicated(
- function(
- StreamReader $stream,
- int $offset
- ) use ( $context ): Generator {
- $packStream = new GitPackStream( $stream );
- $packStream->seek( $offset );
- $hdr = $packStream->readVarInt();
-
- yield from $hdr['type'] === 6 || $hdr['type'] === 7
- ? $this->streamDeltaObjectGenerator(
- $packStream, $context, $hdr['type'], $offset
- )
- : (new ZlibInflaterStream())->stream( $stream );
- }
- );
- }
-
- private function streamDeltaObjectGenerator(
- GitPackStream $stream,
- PackContext $context,
- int $type,
- int $offset
- ): Generator {
- yield from $context->isWithinDepth( self::MAX_DEPTH )
- ? ( $type === 6
- ? $this->processOffsetDelta( $stream, $context, $offset )
- : $this->processRefDelta( $stream, $context ) )
- : [];
- }
-
- private function readSizeWithStream(
- GitPackStream $stream,
- int $offset
- ): int {
- $cur = $stream->tell();
- $stream->seek( $offset );
- $hdr = $stream->readVarInt();
-
- $result = isset( $this->cache[$offset] )
- ? \strlen( $this->cache[$offset] )
- : ( $hdr['type'] === 6 || $hdr['type'] === 7
- ? $this->decoder->readDeltaTargetSize(
- $stream, $hdr['type']
- )
- : $hdr['size'] );
-
- if( !isset( $this->cache[$offset] ) ) {
- $stream->seek( $cur );
- }
-
- return $result;
- }
-
- private function processOffsetDelta(
- GitPackStream $stream,
- PackContext $context,
- int $offset
- ): Generator {
- $neg = $stream->readOffsetDelta();
- $cur = $stream->tell();
- $baseOff = $offset - $neg;
-
- $baseSrc = isset( $this->cache[$baseOff] )
- ? $this->cache[$baseOff]
- : ( $this->readSizeWithStream( $stream, $baseOff )
- <= self::MAX_BASE_RAM
- ? $this->readWithStream(
- $stream,
- $baseOff,
- 0,
- function( string $sha, int $cap ) use ( $context ): string {
- return $this->resolveBaseSha( $sha, $cap, $context );
- }
- )
- : $this->collectBase(
- $this->streamEntryGenerator(
- $context->deriveOffsetContext( $neg )
- )
- ) );
-
- $stream->seek( $cur );
-
- yield from $this->decoder->applyStreamGenerator(
- $stream, $baseSrc
- );
- }
-
- private function processRefDelta(
- GitPackStream $stream,
- PackContext $context
- ): Generator {
- $baseSha = \bin2hex( $stream->read( 20 ) );
- $cur = $stream->tell();
- $size = $context->resolveBaseSize( $baseSha );
-
- $baseSrc = $size <= self::MAX_BASE_RAM
- ? $this->resolveBaseSha( $baseSha, 0, $context )
- : $this->collectBase(
- $context->resolveBaseStream( $baseSha )
- );
-
- $stream->seek( $cur );
-
- yield from $this->decoder->applyStreamGenerator(
- $stream, $baseSrc
- );
- }
-
- private function collectBase(
- iterable $chunks
- ): BufferedReader|string {
- $parts = [];
- $total = 0;
- $tmp = false;
-
- foreach( $chunks as $chunk ) {
- $total += \strlen( $chunk );
-
- if( $tmp instanceof BufferedReader ) {
- $tmp->write( $chunk );
- } elseif( $total > self::MAX_BASE_RAM ) {
- $tmp = new BufferedReader(
- 'php://temp/maxmemory:65536', 'w+b'
- );
-
- foreach( $parts as $part ) {
- $tmp->write( $part );
- }
-
- $tmp->write( $chunk );
- $parts = [];
- } else {
- $parts[] = $chunk;
- }
- }
-
- if( $tmp instanceof BufferedReader ) {
- $tmp->rewind();
- }
-
- return $tmp === false ? \implode( '', $parts ) : $tmp;
- }
-
- private function resolveBaseSha(
- string $sha,
- int $cap,
- PackContext $context
- ): string {
- $chunks = [];
-
- foreach( $context->resolveBaseStream( $sha ) as $chunk ) {
- $chunks[] = $chunk;
- }
-
- $result = \implode( '', $chunks );
-
- return $cap > 0 && \strlen( $result ) > $cap
- ? \substr( $result, 0, $cap )
- : $result;
- }
-
- private function inflate(
- StreamReader $stream,
- int $cap = 0
- ): string {
- $inflater = new ZlibInflaterStream();
- $chunks = [];
- $len = 0;
-
- foreach( $inflater->stream( $stream ) as $data ) {
+ private DeltaDecoder $decoder;
+ private ZlibDeflatorStream $deflator;
+ private ZlibInflaterStream $inflater;
+ private array $cache;
+ private int $cacheSize;
+
+ public function __construct( DeltaDecoder $decoder ) {
+ $this->decoder = $decoder;
+ $this->deflator = new ZlibDeflatorStream();
+ $this->inflater = new ZlibInflaterStream();
+ $this->cache = [];
+ $this->cacheSize = 0;
+ }
+
+ public function getEntryMeta( PackContext $context ): array {
+ return $context->computeArray(
+ function( StreamReader $stream, int $offset ): array {
+ $packStream = new GitPackStream( $stream );
+ $packStream->seek( $offset );
+ $hdr = $packStream->readVarInt();
+
+ return [
+ 'type' => $hdr['type'],
+ 'size' => $hdr['size'],
+ 'baseOffset' => $hdr['type'] === 6
+ ? $offset - $packStream->readOffsetDelta()
+ : 0,
+ 'baseSha' => $hdr['type'] === 7
+ ? \bin2hex( $packStream->read( 20 ) )
+ : ''
+ ];
+ },
+ [ 'type' => 0, 'size' => 0 ]
+ );
+ }
+
+ public function getSize( PackContext $context ): int {
+ return $context->computeIntDedicated(
+ function( StreamReader $stream, int $offset ): int {
+ $packStream = new GitPackStream( $stream );
+ $packStream->seek( $offset );
+ $hdr = $packStream->readVarInt();
+
+ return $hdr['type'] === 6 || $hdr['type'] === 7
+ ? $this->decoder->readDeltaTargetSize(
+ $stream, $hdr['type']
+ )
+ : $hdr['size'];
+ },
+ 0
+ );
+ }
+
+ public function read(
+ PackContext $context,
+ int $cap,
+ callable $readShaBaseFn
+ ): string {
+ return $context->computeStringDedicated(
+ function(
+ StreamReader $s,
+ int $o
+ ) use ( $cap, $readShaBaseFn ): string {
+ return $this->readWithStream(
+ new GitPackStream( $s ), $o, $cap, $readShaBaseFn
+ );
+ },
+ ''
+ );
+ }
+
+ private function readWithStream(
+ GitPackStream $stream,
+ int $offset,
+ int $cap,
+ callable $readShaBaseFn
+ ): string {
+ $stream->seek( $offset );
+ $hdr = $stream->readVarInt();
+ $type = $hdr['type'];
+
+ $result = isset( $this->cache[$offset] )
+ ? ( $cap > 0 && \strlen( $this->cache[$offset] ) > $cap
+ ? \substr( $this->cache[$offset], 0, $cap )
+ : $this->cache[$offset] )
+ : ( $type === 6
+ ? $this->readOffsetDeltaContent(
+ $stream, $offset, $cap, $readShaBaseFn
+ )
+ : ( $type === 7
+ ? $this->readRefDeltaContent(
+ $stream, $cap, $readShaBaseFn
+ )
+ : $this->inflate( $stream, $cap ) ) );
+
+ if( $cap === 0 && !isset( $this->cache[$offset] ) ) {
+ $this->cache[$offset] = $result;
+ $this->cacheSize++;
+
+ if( $this->cacheSize > self::MAX_CACHE ) {
+ unset( $this->cache[\array_key_first( $this->cache )] );
+ $this->cacheSize--;
+ }
+ }
+
+ return $result;
+ }
+
+ private function readOffsetDeltaContent(
+ GitPackStream $stream,
+ int $offset,
+ int $cap,
+ callable $readShaBaseFn
+ ): string {
+ $neg = $stream->readOffsetDelta();
+ $cur = $stream->tell();
+ $bData = $this->readWithStream(
+ $stream, $offset - $neg, $cap, $readShaBaseFn
+ );
+
+ $stream->seek( $cur );
+
+ return $this->decoder->apply(
+ $bData,
+ $this->inflate( $stream ),
+ $cap
+ );
+ }
+
+ private function readRefDeltaContent(
+ GitPackStream $stream,
+ int $cap,
+ callable $readShaBaseFn
+ ): string {
+ $sha = \bin2hex( $stream->read( 20 ) );
+ $cur = $stream->tell();
+ $bas = $readShaBaseFn( $sha, $cap );
+
+ $stream->seek( $cur );
+
+ return $this->decoder->apply(
+ $bas,
+ $this->inflate( $stream ),
+ $cap
+ );
+ }
+
+ public function streamRawCompressed(
+ PackContext $context
+ ): Generator {
+ yield from $context->streamGenerator(
+ function( StreamReader $stream, int $offset ): Generator {
+ $packStream = new GitPackStream( $stream );
+ $packStream->seek( $offset );
+ $hdr = $packStream->readVarInt();
+
+ yield from $hdr['type'] !== 6 && $hdr['type'] !== 7
+ ? $this->deflator->stream( $stream )
+ : [];
+ }
+ );
+ }
+
+ public function streamRawDelta( PackContext $context ): Generator {
+ yield from $context->streamGenerator(
+ function( StreamReader $stream, int $offset ): Generator {
+ $packStream = new GitPackStream( $stream );
+ $packStream->seek( $offset );
+ $hdr = $packStream->readVarInt();
+
+ if( $hdr['type'] === 6 ) {
+ $packStream->readOffsetDelta();
+ } elseif( $hdr['type'] === 7 ) {
+ $packStream->read( 20 );
+ }
+
+ yield from $this->deflator->stream( $stream );
+ }
+ );
+ }
+
+ public function streamEntryGenerator(
+ PackContext $context
+ ): Generator {
+ yield from $context->streamGeneratorDedicated(
+ function(
+ StreamReader $stream,
+ int $offset
+ ) use ( $context ): Generator {
+ $packStream = new GitPackStream( $stream );
+ $packStream->seek( $offset );
+ $hdr = $packStream->readVarInt();
+
+ yield from $hdr['type'] === 6 || $hdr['type'] === 7
+ ? $this->streamDeltaObjectGenerator(
+ $packStream, $context, $hdr['type'], $offset
+ )
+ : $this->inflater->stream( $stream );
+ }
+ );
+ }
+
+ private function streamDeltaObjectGenerator(
+ GitPackStream $stream,
+ PackContext $context,
+ int $type,
+ int $offset
+ ): Generator {
+ yield from $context->isWithinDepth( self::MAX_DEPTH )
+ ? ( $type === 6
+ ? $this->processOffsetDelta( $stream, $context, $offset )
+ : $this->processRefDelta( $stream, $context ) )
+ : [];
+ }
+
+ private function readSizeWithStream(
+ GitPackStream $stream,
+ int $offset
+ ): int {
+ $cur = $stream->tell();
+ $stream->seek( $offset );
+ $hdr = $stream->readVarInt();
+
+ $result = isset( $this->cache[$offset] )
+ ? \strlen( $this->cache[$offset] )
+ : ( $hdr['type'] === 6 || $hdr['type'] === 7
+ ? $this->decoder->readDeltaTargetSize(
+ $stream, $hdr['type']
+ )
+ : $hdr['size'] );
+
+ if( !isset( $this->cache[$offset] ) ) {
+ $stream->seek( $cur );
+ }
+
+ return $result;
+ }
+
+ private function processOffsetDelta(
+ GitPackStream $stream,
+ PackContext $context,
+ int $offset
+ ): Generator {
+ $neg = $stream->readOffsetDelta();
+ $cur = $stream->tell();
+ $baseOff = $offset - $neg;
+
+ $baseSrc = isset( $this->cache[$baseOff] )
+ ? $this->cache[$baseOff]
+ : ( $this->readSizeWithStream( $stream, $baseOff )
+ <= self::MAX_BASE_RAM
+ ? $this->readWithStream(
+ $stream,
+ $baseOff,
+ 0,
+ function( string $sha, int $cap ) use ( $context ): string {
+ return $this->resolveBaseSha( $sha, $cap, $context );
+ }
+ )
+ : $this->collectBase(
+ $this->streamEntryGenerator(
+ $context->deriveOffsetContext( $neg )
+ )
+ ) );
+
+ $stream->seek( $cur );
+
+ yield from $this->decoder->applyStreamGenerator(
+ $stream, $baseSrc
+ );
+ }
+
+ private function processRefDelta(
+ GitPackStream $stream,
+ PackContext $context
+ ): Generator {
+ $baseSha = \bin2hex( $stream->read( 20 ) );
+ $cur = $stream->tell();
+ $size = $context->resolveBaseSize( $baseSha );
+
+ $baseSrc = $size <= self::MAX_BASE_RAM
+ ? $this->resolveBaseSha( $baseSha, 0, $context )
+ : $this->collectBase(
+ $context->resolveBaseStream( $baseSha )
+ );
+
+ $stream->seek( $cur );
+
+ yield from $this->decoder->applyStreamGenerator(
+ $stream, $baseSrc
+ );
+ }
+
+ private function collectBase(
+ iterable $chunks
+ ): BufferedReader|string {
+ $parts = [];
+ $total = 0;
+ $tmp = false;
+
+ foreach( $chunks as $chunk ) {
+ $total += \strlen( $chunk );
+
+ if( $tmp instanceof BufferedReader ) {
+ $tmp->write( $chunk );
+ } elseif( $total > self::MAX_BASE_RAM ) {
+ $tmp = new BufferedReader(
+ 'php://temp/maxmemory:65536', 'w+b'
+ );
+
+ foreach( $parts as $part ) {
+ $tmp->write( $part );
+ }
+
+ $tmp->write( $chunk );
+ $parts = [];
+ } else {
+ $parts[] = $chunk;
+ }
+ }
+
+ if( $tmp instanceof BufferedReader ) {
+ $tmp->rewind();
+ }
+
+ return $tmp === false ? \implode( '', $parts ) : $tmp;
+ }
+
+ private function resolveBaseSha(
+ string $sha,
+ int $cap,
+ PackContext $context
+ ): string {
+ $chunks = [];
+
+ foreach( $context->resolveBaseStream( $sha ) as $chunk ) {
+ $chunks[] = $chunk;
+ }
+
+ $result = \implode( '', $chunks );
+
+ return $cap > 0 && \strlen( $result ) > $cap
+ ? \substr( $result, 0, $cap )
+ : $result;
+ }
+
+ private function inflate(
+ StreamReader $stream,
+ int $cap = 0
+ ): string {
+ $chunks = [];
+ $len = 0;
+
+ foreach( $this->inflater->stream( $stream ) as $data ) {
$chunks[] = $data;
$len += \strlen( $data );
git/PackfileWriter.php
: $this->encodeEntryHeader(
$entry['logicalType'],
- $this->getObjectSize( $sha )
+ $entry['size'] > 0
+ ? $entry['size']
+ : $this->getObjectSize( $sha )
);
unset( $e );
- \uasort(
- $entries,
- function( array $a, array $b ): int {
- $cmp = $a['packFile'] <=> $b['packFile'];
+ $files = [];
+ $offsets = [];
- return $cmp !== 0
- ? $cmp
- : $a['offset'] <=> $b['offset'];
- }
+ foreach( $entries as $e ) {
+ $files[] = $e['packFile'];
+ $offsets[] = $e['offset'];
+ }
+
+ \array_multisort(
+ $files, \SORT_ASC, \SORT_STRING,
+ $offsets, \SORT_ASC, \SORT_NUMERIC,
+ $entries
);
+
+ foreach( $entries as $sha => &$e ) {
+ $e['size'] = $e['baseSha'] === ''
+ ? $this->getObjectSize( $sha )
+ : 0;
+ }
+
+ unset( $e );
return $entries;
Delta390 lines added, 372 lines removed, 18-line increase