morningman opened a new pull request, #68303:
URL: https://github.com/apache/doris/pull/68303
Cherry-picked from #68138
Batch pick of every merged PR carrying the `incremental-computation` label
that `branch-incremental-computation` does not have yet (no
`incremental-computation-picked` label), in the order they landed on master
(`git log --first-parent`). One commit per PR, each ending with `(cherry picked
from commit <master sha>)`. Follows the same convention as #67830, #68017,
#68073, #68151 and #68236. This round has a single PR.
| # | Master commit | PR | Title |
|---|---|---|---|
| 1 | 695c88b5772 | #68138 | [fix](binlog) Refresh incremental partition
versions before pruning |
Not included on purpose:
- The 28 labelled PRs that already carry `incremental-computation-picked`
(every other closed PR with the label).
### Prerequisite check
- **#68138** declares #67181 as related; #67181 (`e5a4e725fac`) is before
the fork point `efedf10c7e3`. Everything the pick uses already exists on this
branch: `OlapTableWrapper.selectNonEmptyPartitionIds(Collection<Long>,
Optional<StreamReadMode>)` / `hasFixedVisibleVersions()`, the two-argument
`CloudPartition.getSnapshotVisibleVersionFromMs(List, boolean)`,
`StreamReadMode`, the three `RowBinlogTableWrapper` constructors, and the test
helpers (`BinlogTestUtils.newTestRowBinlogConfig`,
`PlanConstructor.newOlapTable`, `MemoTestUtils.createConnectContext`,
`PlanChecker.from(ConnectContext, Plan)`). `cherry-pick -x` applied cleanly
(one auto-merge in `CloudPartition.java`, no conflict).
### Drift check against master
- `RowBinlogTableWrapper.java`, `OlapTableWrapperTest.java` and the new
`PruneEmptyPartitionTest.java` are byte-identical to master at `695c88b5772`.
- `CloudPartition.java` differs from master only by the unlabelled #66296
("Reduce cloud version sync config": the `maxAttempts` overload of
`getSnapshotVisibleVersionFromMs` / `getSnapshotVisibleVersion` and the
`VariableMgr.getDefaultSessionVariable()` fallback for
`cloudPartitionVersionCacheTtlMs`). Applying #66296's hunks for this file on
top of the branch in a temporary index gives a zero-line diff against master,
so nothing of the pick is missing; the pick itself only calls the two-argument
`getSnapshotVisibleVersionFromMs(partitions, false)`, which is the same on both
sides. #66296 stays out, as in the previous rounds.
### Verification
- FE: `run-fe-ut.sh --run` on this branch (regenerates thrift/protobuf,
compiles fe-core main + test) with the two touched test classes plus every test
class that exercises `selectNonEmptyPartitionIds` /
`getSnapshotVisibleVersionFromMs` / `RowBinlogTableWrapper`: 8 classes, 108
tests, 0 failures, 0 errors, BUILD SUCCESS — `CloudGlobalTransactionMgrTest`
37, `ExplainTableStreamPlanTest` 24, `PhysicalPlanTranslatorTest` 17,
`OlapScanNodeTest` 12, `PartitionCompensatorTest` 12, `OlapTableWrapperTest` 4
(the two new tests included), `PruneEmptyPartitionTest` 1 (new),
`TableBinlogFunctionAuthTest` 1. The `@Test` counts of the two touched classes
equal master's.
- FE checkstyle on fe-core: 0 violations.
- No BE, cloud or regression-suite changes in this PR.
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
