Fixed replacing instance of dataframe when using aggregate method (#1057)

* Fixed replacing instance of dataframe when using aggregate method

* Removed DataFrame::rebuild

Author: norberttech

src/core/etl/src/Flow/ETL/DataFrame.php

@@ -605,16 +605,6 @@ public function printSchema(?int $limit = 20, Schema\SchemaFormatter $formatter
         $clone->run();
     }
 
-    /**
-     * @lazy
-     *
-     * @param callable(Pipeline $pipeline, FlowContext $context) : DataFrame $callback
-     */
-    public function rebuild(callable $callback) : self
-    {
-        return $callback($this->pipeline, $this->context);
-    }
-
     /**
      * @lazy
      */

src/core/etl/src/Flow/ETL/DataFrame/GroupedDataFrame.php

@@ -6,24 +6,29 @@
 
 use Flow\ETL\Function\AggregatingFunction;
 use Flow\ETL\Row\Reference;
-use Flow\ETL\{DataFrame, FlowContext, GroupBy, Pipeline};
+use Flow\ETL\{DataFrame, GroupBy, Pipeline};
 
 final class GroupedDataFrame
 {
+    /**
+     * @var \ReflectionClass<DataFrame>
+     */
+    private \ReflectionClass $dataFrameReflection;
+
     public function __construct(private readonly DataFrame $df, private readonly GroupBy $groupBy)
     {
+        $this->dataFrameReflection = new \ReflectionClass($this->df);
     }
 
     public function aggregate(AggregatingFunction ...$aggregations) : DataFrame
     {
         $this->groupBy->aggregate(...$aggregations);
 
-        return $this->df->rebuild(function (Pipeline $pipeline, FlowContext $context) : DataFrame {
-            return new DataFrame(
-                new Pipeline\LinkedPipeline(new Pipeline\GroupByPipeline($this->groupBy, $pipeline)),
-                $context
-            );
-        });
+        $pipelineProperty = $this->dataFrameReflection->getProperty('pipeline');
+        $currentPipeline = $pipelineProperty->getValue($this->df);
+        $pipelineProperty->setValue($this->df, new Pipeline\LinkedPipeline(new Pipeline\GroupByPipeline($this->groupBy, $currentPipeline)));
+
+        return $this->df;
     }
 
     public function pivot(Reference $ref) : self

src/core/etl/src/Flow/ETL/Pipeline/LinkedPipeline.php

@@ -57,9 +57,7 @@ public function pipes() : Pipes
 
     public function process(FlowContext $context) : \Generator
     {
-        foreach ($this->nextPipeline->process($context) as $rows) {
-            yield $rows;
-        }
+        return $this->nextPipeline->process($context);
     }
 
     public function source() : Extractor