Improve performance of array comparison & sorting (#612)

flow-php · Oct 18, 2023 · cdd434a · cdd434a
1 parent 80258e5
commit cdd434a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/core/etl/src/Flow/ArrayComparison/ArrayComparison.php b/src/core/etl/src/Flow/ArrayComparison/ArrayComparison.php
@@ -42,12 +42,13 @@ private function valueEquals($a, $b) : bool
             return false;
         }
 
-        foreach (\array_keys($b) as $key) {
-            if (!\array_key_exists($key, $a) || !\array_key_exists($key, $b)) {
+        /** @psalm-suppress MixedAssignment */
+        foreach ($b as $key => $value) {
+            if (!\array_key_exists($key, $a)) {
                 return false;
             }
 
-            if (!$this->valueEquals($a[$key], $b[$key])) {
+            if (!$this->valueEquals($a[$key], $value)) {
                 return false;
             }
         }

diff --git a/src/core/etl/src/Flow/ArrayComparison/ArraySortByKey.php b/src/core/etl/src/Flow/ArrayComparison/ArraySortByKey.php
@@ -19,9 +19,9 @@ public function __invoke(array $array) : array
         );
 
         if (\array_is_list($array)) {
-            \usort($array, fn ($a, $b) : int => $a <=> $b);
+            \sort($array);
         } else {
-            \uksort($array, fn ($a, $b) : int => $a <=> $b);
+            \ksort($array);
         }
 
         return $array;

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/ArrayEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/ArrayEntry.php
@@ -63,7 +63,7 @@ public function is(string|Reference $name) : bool
 
     public function isEqual(Entry $entry) : bool
     {
-        return $this->is($entry->name()) && $entry instanceof self && (new ArrayComparison())->equals($this->value(), $entry->value());
+        return $this->is($entry->name()) && $entry instanceof self && (new ArrayComparison())->equals($this->value, $entry->value());
     }
 
     public function map(callable $mapper) : Entry
@@ -83,7 +83,7 @@ public function rename(string $name) : Entry
 
     public function toString() : string
     {
-        return \json_encode($this->value(), JSON_THROW_ON_ERROR);
+        return \json_encode($this->value, \JSON_THROW_ON_ERROR);
     }
 
     public function value() : array