fix: Performance improvements using SimpleCachingIteratorAggregate.

loophp · Jun 3, 2022 · 51e7d6f · 51e7d6f
1 parent ab5f9f0
commit 51e7d6f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -121,7 +121,7 @@ parameters:
 			path: src/Operation/GroupBy.php
 
 		-
-			message: "#^Parameter \\#1 \\.\\.\\.\\$ of closure expects callable\\(mixed, mixed, iterable\\)\\: bool, Closure\\(mixed, mixed, loophp\\\\iterators\\\\CachingIteratorAggregate\\)\\: bool given\\.$#"
+			message: "#^Parameter \\#1 \\.\\.\\.\\$ of closure expects callable\\(mixed, mixed, iterable\\)\\: bool, Closure\\(mixed, mixed, loophp\\\\iterators\\\\SimpleCachingIteratorAggregate\\)\\: bool given\\.$#"
 			count: 1
 			path: src/Operation/Init.php
 
@@ -214,4 +214,3 @@ parameters:
 			message: "#^Template type UKey of method loophp\\\\collection\\\\Operation\\\\Zip\\:\\:__invoke\\(\\) is not referenced in a parameter\\.$#"
 			count: 1
 			path: src/Operation/Zip.php
-
diff --git a/src/Operation/DropWhile.php b/src/Operation/DropWhile.php
@@ -12,8 +12,8 @@
 use Closure;
 use Generator;
 use loophp\collection\Utils\CallbacksArrayReducer;
-use loophp\iterators\CachingIteratorAggregate;
 use loophp\iterators\IterableIteratorAggregate;
+use loophp\iterators\SimpleCachingIteratorAggregate;
 
 /**
  * @immutable
@@ -43,7 +43,7 @@ public function __invoke(): Closure
              * @return Generator<TKey, T>
              */
             static function (iterable $iterable) use ($callbacks): Generator {
-                $iteratorAggregate = (new CachingIteratorAggregate((new IterableIteratorAggregate($iterable))->getIterator()));
+                $iteratorAggregate = (new SimpleCachingIteratorAggregate((new IterableIteratorAggregate($iterable))->getIterator()));
 
                 $every = (new Every())()(
                     /**

diff --git a/src/Operation/Init.php b/src/Operation/Init.php
@@ -11,7 +11,7 @@
 
 use Closure;
 use Generator;
-use loophp\iterators\CachingIteratorAggregate;
+use loophp\iterators\SimpleCachingIteratorAggregate;
 
 /**
  * @immutable
@@ -34,9 +34,9 @@ public function __invoke(): Closure
             /**
              * @param T $value
              * @param TKey $key
-             * @param CachingIteratorAggregate<TKey, T> $iterator
+             * @param SimpleCachingIteratorAggregate<TKey, T> $iterator
              */
-            static fn ($value, $key, CachingIteratorAggregate $iterator): bool => $iterator->hasNext()
+            static fn ($value, $key, SimpleCachingIteratorAggregate $iterator): bool => $iterator->hasNext()
         );
 
         // Point free style.

diff --git a/src/Operation/Partition.php b/src/Operation/Partition.php
@@ -11,9 +11,9 @@
 
 use Closure;
 use Generator;
-use loophp\iterators\CachingIteratorAggregate;
 use loophp\iterators\ClosureIteratorAggregate;
 use loophp\iterators\IterableIteratorAggregate;
+use loophp\iterators\SimpleCachingIteratorAggregate;
 
 /**
  * @immutable
@@ -42,7 +42,7 @@ public function __invoke(): Closure
              * @return Generator<int, iterable<TKey, T>>
              */
             static function (iterable $iterable) use ($callbacks): Generator {
-                $iteratorAggregate = (new CachingIteratorAggregate((new IterableIteratorAggregate($iterable))->getIterator()));
+                $iteratorAggregate = (new SimpleCachingIteratorAggregate((new IterableIteratorAggregate($iterable))->getIterator()));
 
                 yield new ClosureIteratorAggregate((new Filter())()(...$callbacks), [$iteratorAggregate]);
 

diff --git a/src/Operation/Since.php b/src/Operation/Since.php
@@ -12,8 +12,8 @@
 use Closure;
 use Generator;
 use loophp\collection\Utils\CallbacksArrayReducer;
-use loophp\iterators\CachingIteratorAggregate;
 use loophp\iterators\IterableIteratorAggregate;
+use loophp\iterators\SimpleCachingIteratorAggregate;
 
 /**
  * @immutable
@@ -43,7 +43,7 @@ public function __invoke(): Closure
                  * @return Generator<TKey, T>
                  */
                 static function (iterable $iterable) use ($callbacks): Generator {
-                    $iteratorAggregate = (new CachingIteratorAggregate((new IterableIteratorAggregate($iterable))->getIterator()));
+                    $iteratorAggregate = new SimpleCachingIteratorAggregate((new IterableIteratorAggregate($iterable))->getIterator());
 
                     $every = (new Every())()(
                         /**

diff --git a/src/Operation/Span.php b/src/Operation/Span.php
@@ -11,9 +11,9 @@
 
 use Closure;
 use Generator;
-use loophp\iterators\CachingIteratorAggregate;
 use loophp\iterators\ClosureIteratorAggregate;
 use loophp\iterators\IterableIteratorAggregate;
+use loophp\iterators\SimpleCachingIteratorAggregate;
 
 /**
  * @immutable
@@ -42,7 +42,7 @@ public function __invoke(): Closure
              * @return Generator<int, iterable<TKey, T>>
              */
             static function (iterable $iterable) use ($callbacks): Generator {
-                $iteratorAggregate = (new CachingIteratorAggregate((new IterableIteratorAggregate($iterable))->getIterator()));
+                $iteratorAggregate = new SimpleCachingIteratorAggregate((new IterableIteratorAggregate($iterable))->getIterator());
 
                 yield new ClosureIteratorAggregate((new TakeWhile())()(...$callbacks), [$iteratorAggregate]);
 

diff --git a/src/Operation/TakeWhile.php b/src/Operation/TakeWhile.php
@@ -12,8 +12,8 @@
 use Closure;
 use Generator;
 use loophp\collection\Utils\CallbacksArrayReducer;
-use loophp\iterators\CachingIteratorAggregate;
 use loophp\iterators\IterableIteratorAggregate;
+use loophp\iterators\SimpleCachingIteratorAggregate;
 
 /**
  * @immutable
@@ -43,7 +43,7 @@ public function __invoke(): Closure
                  * @return Generator<TKey, T>
                  */
                 static function (iterable $iterable) use ($callbacks): Generator {
-                    $iteratorAggregate = (new CachingIteratorAggregate((new IterableIteratorAggregate($iterable))->getIterator()));
+                    $iteratorAggregate = new SimpleCachingIteratorAggregate((new IterableIteratorAggregate($iterable))->getIterator());
 
                     $every = (new Every())()(
                         /**

diff --git a/src/Operation/Until.php b/src/Operation/Until.php
@@ -12,8 +12,8 @@
 use Closure;
 use Generator;
 use loophp\collection\Utils\CallbacksArrayReducer;
-use loophp\iterators\CachingIteratorAggregate;
 use loophp\iterators\IterableIteratorAggregate;
+use loophp\iterators\SimpleCachingIteratorAggregate;
 
 /**
  * @immutable
@@ -43,7 +43,7 @@ public function __invoke(): Closure
                  * @return Generator<TKey, T>
                  */
                 static function (iterable $iterable) use ($callbacks): Generator {
-                    $iteratorAggregate = (new CachingIteratorAggregate((new IterableIteratorAggregate($iterable))->getIterator()));
+                    $iteratorAggregate = new SimpleCachingIteratorAggregate((new IterableIteratorAggregate($iterable))->getIterator());
 
                     $every = (new Every())()(
                         /**