Commit 2f499a3
authored
[runners-flink] Use index-based version comparison in flink_runner.gradle (#38272)
* [runners-flink] Use index-based version comparison in flink_runner.gradle
`previous_versions` was computed by lexicographic string comparison
against `flink_major`:
def previous_versions = all_versions.findAll { it < flink_major }
This breaks for `flink_versions=1.17,1.18,1.19,1.20,2.0` (the current
gradle.properties value) because lexicographic ordering disagrees with
semantic ordering whenever a two-digit minor crosses a single-digit
boundary. Concretely, today this resolves to:
flink_major=1.17 -> [] (correct)
flink_major=1.18 -> ["1.17", "1.20"] (wrong; should be ["1.17"])
flink_major=1.19 -> ["1.17", "1.18", "1.20"] (wrong; should be ["1.17", "1.18"])
flink_major=1.20 -> [] (wrong; should be ["1.17", "1.18", "1.19"])
flink_major=2.0 -> ["1.17", "1.18", "1.19", "1.20"](correct)
The 1.18 and 1.19 builds therefore pick up
`runners/flink/1.20/src/main/java/.../DoFnOperator.java` as a "previous"
override, and the 1.20 build loses the 1.19 test overrides
(MemoryStateBackendWrapper, StreamSources).
Replace the lex compare with index lookup against `flink_versions`,
exactly like spark_runner.gradle does (PR #38233). Also:
- Trim whitespace from each entry (defensive against
`flink_versions=1.17, 1.18, ...`).
- Throw a clear GradleException if `flink_major` isn't listed in
`flink_versions`, instead of silently producing an empty
`previous_versions` list.
- Update `use_override` to derive from the same index, mirroring the
Spark version.
* Trigger Build
* [runners-flink] Address Gemini review on flink_runner.gradle
- Trim/stringify flink_major before indexOf so command-line / GString
values match the trimmed all_versions entries.
- Drop redundant ternary on previous_versions; subList(0, 0) is already
empty when flink_major is the first listed version.
* Trigger Build1 parent de1cc7d commit 2f499a3
1 file changed
Lines changed: 11 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
36 | | - | |
37 | | - | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
38 | 45 | | |
39 | 46 | | |
40 | 47 | | |
| |||
106 | 113 | | |
107 | 114 | | |
108 | 115 | | |
109 | | - | |
| 116 | + | |
110 | 117 | | |
111 | 118 | | |
112 | 119 | | |
| |||
0 commit comments