Skip to content
Snippets Groups Projects
Commit d4a8e130 authored by jaapjansma's avatar jaapjansma
Browse files

Fixed issue with in memory data flows. Such as the duplicate contacts.

parent 79cba4aa
No related branches found
No related tags found
No related merge requests found
# Version 1.104 (not yet released)
* Fixed issue with in memory data flows. Such as the duplicate contacts.
* Added field for bounded calculations. Bounded calculations are calculations where you specify a minimum bound and maximum bound. If the value is outside the bounds the minimum value or maximum value is shown.
# Version 1.103
......
......@@ -127,20 +127,16 @@ class CombinedDataFlow extends AbstractDataFlow implements MultipleSourceDataFlo
$dataFlow->convertJoinClausesToWhereClause();
}
}
for($i=0; $i<count($this->sourceDataFlowDescriptions); $i++) {
do {
$batch = [];
try {
$batch = $this->getAllRecordsFromDataFlowAsArray($this->sourceDataFlowDescriptions[$i]->getDataFlow(), $this->batchSize);
for($j=$i+1; $j<count($this->sourceDataFlowDescriptions); $j++) {
$this->sourceDataFlowDescriptions[$j]->getJoinSpecification()->prepareRightDataFlow($batch, $this->sourceDataFlowDescriptions[$j]->getDataFlow());
$rightRecords = $this->getAllRecordsFromDataFlowAsArray($this->sourceDataFlowDescriptions[$j]->getDataFlow());
$batch = $this->sourceDataFlowDescriptions[$j]->getJoinSpecification()->join($batch, $rightRecords);
}
$allRecords = array_merge($allRecords, $batch);
} catch (DataFlowException $e) {
}
} while(count($batch) >= $this->batchSize || $this->batchSize == 0);
try {
$batch = $this->getAllRecordsFromDataFlowAsArray($this->sourceDataFlowDescriptions[0]->getDataFlow());
for($j=1; $j<count($this->sourceDataFlowDescriptions); $j++) {
$this->sourceDataFlowDescriptions[$j]->getJoinSpecification()->prepareRightDataFlow($batch, $this->sourceDataFlowDescriptions[$j]->getDataFlow());
$rightRecords = $this->getAllRecordsFromDataFlowAsArray($this->sourceDataFlowDescriptions[$j]->getDataFlow());
$batch = $this->sourceDataFlowDescriptions[$j]->getJoinSpecification()->join($batch, $rightRecords);
}
$allRecords = array_merge($allRecords, $batch);
} catch (DataFlowException $e) {
// Do nothing
}
$this->recordCount = count($allRecords);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment