Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed merging nullable with non nullable schema definitions #1111

Merged
merged 1 commit into from
Jul 4, 2024

Conversation

norberttech
Copy link
Member

Change Log

Added

Fixed

  • Fixed merging nullable with non nullable schema definitions

Changed

Removed

Deprecated

Security


Description

$newDefinitions[$entry] = $newDefinitions[$entry]->merge($definition);
}
}

foreach ($schema->definitions as $entry => $definition) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

additionally, we managed to get rid of one unnecessary iteration 😊

Copy link
Contributor

github-actions bot commented Jul 4, 2024

Flow PHP - Benchmarks

Results of the benchmarks from this PR are compared with the results from 1.x branch.

Extractors
+-----------------------+-------------------+------+-----+------------------+------------------+-----------------+
| benchmark             | subject           | revs | its | mem_peak         | mode             | rstdev          |
+-----------------------+-------------------+------+-----+------------------+------------------+-----------------+
| CSVExtractorBench     | bench_extract_10k | 1    | 3   | 3.914mb +0.01%   | 513.246ms +0.85% | ±0.16% -74.35%  |
| JsonExtractorBench    | bench_extract_10k | 1    | 3   | 3.947mb +0.01%   | 1.089s +2.04%    | ±0.87% +129.01% |
| ParquetExtractorBench | bench_extract_10k | 1    | 3   | 135.389mb -0.00% | 743.959ms +0.21% | ±0.52% -15.19%  |
| TextExtractorBench    | bench_extract_10k | 1    | 3   | 3.674mb +0.01%   | 35.415ms +3.59%  | ±1.05% +177.81% |
| XmlExtractorBench     | bench_extract_10k | 1    | 3   | 3.621mb +0.01%   | 430.047ms -1.86% | ±0.41% -82.39%  |
+-----------------------+-------------------+------+-----+------------------+------------------+-----------------+
Transformers
+-----------------------------+--------------------------+------+-----+------------------+-----------------+----------------+
| benchmark                   | subject                  | revs | its | mem_peak         | mode            | rstdev         |
+-----------------------------+--------------------------+------+-----+------------------+-----------------+----------------+
| RenameEntryTransformerBench | bench_transform_10k_rows | 1    | 3   | 115.966mb +0.00% | 60.239ms +1.77% | ±1.22% +30.82% |
+-----------------------------+--------------------------+------+-----+------------------+-----------------+----------------+
Loaders
+--------------------+----------------+------+-----+------------------+-----------------+----------------+
| benchmark          | subject        | revs | its | mem_peak         | mode            | rstdev         |
+--------------------+----------------+------+-----+------------------+-----------------+----------------+
| CSVLoaderBench     | bench_load_10k | 1    | 3   | 54.069mb +0.00%  | 84.180ms +0.38% | ±0.48% -37.72% |
| JsonLoaderBench    | bench_load_10k | 1    | 3   | 106.502mb +0.00% | 51.623ms +0.57% | ±0.56% -61.64% |
| ParquetLoaderBench | bench_load_10k | 1    | 3   | 225.846mb -0.00% | 1.483s +7.01%   | ±0.20% -47.57% |
| TextLoaderBench    | bench_load_10k | 1    | 3   | 16.863mb +0.00%  | 44.755ms -0.60% | ±0.72% -32.91% |
+--------------------+----------------+------+-----+------------------+-----------------+----------------+
Building Blocks
+-------------------------+----------------------------+------+-----+------------------+------------------+-----------------+
| benchmark               | subject                    | revs | its | mem_peak         | mode             | rstdev          |
+-------------------------+----------------------------+------+-----+------------------+------------------+-----------------+
| NativeEntryFactoryBench | bench_entry_factory        | 1    | 3   | 116.517mb +0.00% | 493.331ms -0.10% | ±0.83% -23.46%  |
| NativeEntryFactoryBench | bench_entry_factory        | 1    | 3   | 59.995mb +0.00%  | 251.320ms +0.36% | ±0.79% +25.33%  |
| NativeEntryFactoryBench | bench_entry_factory        | 1    | 3   | 14.928mb +0.00%  | 54.737ms +4.02%  | ±1.61% -52.03%  |
| TypeDetectorBench       | bench_type_detector        | 1    | 3   | 59.695mb +0.00%  | 465.874ms +1.18% | ±1.01% -69.66%  |
| TypeDetectorBench       | bench_type_detector        | 1    | 3   | 14.234mb +0.00%  | 86.178ms +1.34%  | ±0.74% +7.06%   |
| RowsBench               | bench_chunk_10_on_10k      | 2    | 3   | 86.786mb +0.00%  | 3.421ms +7.17%   | ±2.22% +212.31% |
| RowsBench               | bench_diff_left_1k_on_10k  | 2    | 3   | 102.385mb +0.00% | 189.673ms +0.92% | ±0.94% -46.17%  |
| RowsBench               | bench_diff_right_1k_on_10k | 2    | 3   | 85.105mb +0.00%  | 19.118ms +2.02%  | ±0.31% +7.45%   |
| RowsBench               | bench_drop_1k_on_10k       | 2    | 3   | 88.026mb +0.00%  | 1.917ms +12.02%  | ±1.17% -39.78%  |
| RowsBench               | bench_drop_right_1k_on_10k | 2    | 3   | 88.026mb +0.00%  | 1.959ms +12.16%  | ±1.46% +11.95%  |
| RowsBench               | bench_entries_on_10k       | 2    | 3   | 85.139mb +0.00%  | 2.763ms +5.00%   | ±0.87% -68.48%  |
| RowsBench               | bench_filter_on_10k        | 2    | 3   | 85.667mb +0.00%  | 15.092ms +4.22%  | ±0.92% -36.58%  |
| RowsBench               | bench_find_on_10k          | 2    | 3   | 85.667mb +0.00%  | 14.956ms +3.30%  | ±0.86% +11.20%  |
| RowsBench               | bench_find_one_on_10k      | 10   | 3   | 83.572mb +0.00%  | 1.706μs +0.36%   | ±2.72% +0.00%   |
| RowsBench               | bench_first_on_10k         | 10   | 3   | 83.572mb +0.00%  | 0.400μs +100.00% | ±0.00% 0.00%    |
| RowsBench               | bench_flat_map_on_1k       | 2    | 3   | 92.922mb +0.00%  | 12.218ms +0.84%  | ±0.42% -60.36%  |
| RowsBench               | bench_map_on_10k           | 2    | 3   | 122.292mb +0.00% | 61.464ms +1.86%  | ±0.38% -41.94%  |
| RowsBench               | bench_merge_1k_on_10k      | 2    | 3   | 86.187mb +0.00%  | 1.533ms +20.67%  | ±1.33% +628.90% |
| RowsBench               | bench_partition_by_on_10k  | 2    | 3   | 89.534mb +0.00%  | 65.046ms +4.56%  | ±0.04% -97.44%  |
| RowsBench               | bench_remove_on_10k        | 2    | 3   | 88.289mb +0.00%  | 4.031ms +4.27%   | ±2.47% +130.36% |
| RowsBench               | bench_sort_asc_on_1k       | 2    | 3   | 83.715mb +0.00%  | 39.205ms +1.36%  | ±1.10% +164.47% |
| RowsBench               | bench_sort_by_on_1k        | 2    | 3   | 83.716mb +0.00%  | 39.528ms +2.16%  | ±0.19% -90.98%  |
| RowsBench               | bench_sort_desc_on_1k      | 2    | 3   | 83.715mb +0.00%  | 39.344ms +1.07%  | ±0.49% -47.39%  |
| RowsBench               | bench_sort_entries_on_1k   | 2    | 3   | 86.013mb +0.00%  | 7.506ms +1.50%   | ±0.24% -81.72%  |
| RowsBench               | bench_sort_on_1k           | 2    | 3   | 83.572mb +0.00%  | 28.889ms +0.85%  | ±0.97% +44.57%  |
| RowsBench               | bench_take_1k_on_10k       | 10   | 3   | 83.572mb +0.00%  | 13.788μs +1.38%  | ±0.69% -42.83%  |
| RowsBench               | bench_take_right_1k_on_10k | 10   | 3   | 83.572mb +0.00%  | 16.041μs -1.10%  | ±1.57% +48.60%  |
| RowsBench               | bench_unique_on_1k         | 2    | 3   | 102.386mb +0.00% | 191.038ms -0.50% | ±0.44% -16.52%  |
+-------------------------+----------------------------+------+-----+------------------+------------------+-----------------+

@norberttech norberttech merged commit f888699 into flow-php:1.x Jul 4, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant