Yicong-Huang commented on PR #7106:
URL: https://github.com/apache/texera/pull/7106#issuecomment-5126722399
Resolved — the conflicts were purely `controller`→`coordinator`
package-rename drift (that rename is main-only; v1.2 still uses `controller/`),
not a feature dependency. Git rename-detection landed 25 of the files cleanly
on v1.2's `controller/` paths; I hand-resolved the two source conflicts by
keeping v1.2's names and taking the fix's logic:
- `WorkerExecution.scala`: kept the
`controller.execution.WorkerPortExecution` import, took the fix's
`WorkerState.{COMPLETED, TERMINATED, UNINITIALIZED}` import set.
- `DataProcessor.scala`: kept `controllerInterface` /
`mkContext(CONTROLLER)`, adopted `getStateWithVersion` +
`WorkerStateUpdatedRequest(state, stateVersion)`.
The `state_version` proto fields and `StateManager.getStateWithVersion` this
fix adds are internal RPC/state-ordering plumbing (invisible to users) — this
is a correctness fix for out-of-order worker-state application, not a
user-facing feature. Dropped two bits of main-only test scaffolding: the new
`OperatorExecutionSpec.scala` (added by main under `coordinator/execution/`, no
v1.2 counterpart) and two new `WorkflowExecutionSpec` cases that depend on a
`regionWithPort` helper absent on v1.2. All other test updates (adapting to the
new API) applied cleanly and were kept. Release-branch CI does the
authoritative compile. Marking ready.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
