Merge pull request #15 from keboola/adamvyborny-fix-another-memory-leak

Fixed memory leak
keboola · Nov 24, 2022 · 175abeb · 175abeb
2 parents fe26bb8 + f20483f
commit 175abeb
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/src/Export.php b/src/Export.php
@@ -6,7 +6,6 @@
 
 use Generator;
 use Keboola\Component\UserException;
-use Keboola\Utils\Exception\JsonDecodeException;
 use MongoExtractor\Config\ExportOptions;
 use Nette\Utils\Strings;
 use Retry\BackOff\ExponentialBackOffPolicy;

diff --git a/src/Extractor.php b/src/Extractor.php
@@ -13,7 +13,6 @@
 use MongoDB\Driver\Manager;
 use MongoExtractor\Config\Config;
 use MongoExtractor\Config\ExportOptions;
-use MongoExtractor\Config\OldConfigDefinition;
 use Retry\BackOff\ExponentialBackOffPolicy;
 use Retry\Policy\SimpleRetryPolicy;
 use Retry\RetryProxy;
@@ -139,7 +138,7 @@ private function createSshTunnel(array $sshOptions): void
     }
 
     /**
-     * @param array<int, array{path: string, primaryKey: array<int, string>|string|null}> $manifestsData
+     * @param array<string, array{path: string, primaryKey: array<int, string>|string|null}> $manifestsData
      */
     protected function generateManifests(array $manifestsData, ExportOptions $exportOptions): void
     {

diff --git a/src/Parse.php b/src/Parse.php
@@ -30,7 +30,7 @@ public function __construct(
 
     /**
      * Parses exported json and creates .csv and .manifest files
-     * @return array<int, array{path: string, primaryKey: array<int, string>|string}>
+     * @return array<string, array{path: string, primaryKey: array<int, string>|string}>
      * @throws \Keboola\Csv\Exception
      * @throws \Keboola\Csv\InvalidArgumentException
      */

diff --git a/src/Parser/Mapping.php b/src/Parser/Mapping.php
@@ -25,7 +25,7 @@ class Mapping implements ParserInterface
     private string $path;
     private string $name;
     private Filesystem $filesystem;
-    /** @var array<int, array{path: string, primaryKey: array<int, string>|string}> */
+    /** @var array<string, array{path: string, primaryKey: array<int, string>|string}> */
     private array $manifestData = [];
 
     /**
@@ -81,7 +81,7 @@ public function parse(array $data): void
                     throw new Exception('Failed write to file "' . $outputCsv . '"');
                 }
 
-                $this->manifestData[] = [
+                $this->manifestData[$outputCsv] = [
                     'path' => $outputCsv . '.manifest',
                     'primaryKey' => $file->getPrimaryKey(true),
                 ];
@@ -105,7 +105,7 @@ protected function prependHeader(Table $file, string &$content): void
     }
 
     /**
-     * @return array<int, array{path: string, primaryKey: array<int, string>|string}>
+     * @return array<string, array{path: string, primaryKey: array<int, string>|string}>
      */
     public function getManifestData(): array
     {

diff --git a/src/Parser/ParserInterface.php b/src/Parser/ParserInterface.php
@@ -9,6 +9,6 @@ interface ParserInterface
     /** @param array<int, object> $data */
     public function parse(array $data): void;
 
-    /** @return array<int, array{path: string, primaryKey: array<int, string>|string}> */
+    /** @return array<string, array{path: string, primaryKey: array<int, string>|string}> */
     public function getManifestData(): array;
 }
diff --git a/src/Parser/Raw.php b/src/Parser/Raw.php
@@ -72,10 +72,14 @@ private function writerRowToOutputFile(object $item): void
     }
 
     /**
-     * @return array<int, array{path: string, primaryKey: array<int, string>|string}>
+     * @return array<string, array{path: string, primaryKey: array<int, string>|string}>
      */
     public function getManifestData(): array
     {
-        return [['path' => $this->filename . '.manifest', 'primaryKey' => $this->setIdAsPrimaryKey ? ['id']: []]];
+        return [
+            $this->filename => [
+                'path' => $this->filename . '.manifest', 'primaryKey' => $this->setIdAsPrimaryKey ? ['id']: [],
+            ],
+        ];
     }
 }