Skip to content

[To dev/1.3] Fix historical TsFile filtering and reference acquisition (#19096) - #19113

Merged
jt2594838 merged 1 commit into
dev/1.3from
codex/cp-19096-dev13
Nov 4, 2026
Merged

jt2594838 merged 1 commit into
dev/1.3from
codex/cp-19096-dev13

Conversation

@Caideyipi

Copy link
Copy Markdown
Collaborator

Description

Backport #19096 (814b770) to dev/1.3, based on c0811e5.

Keep row-level time filtering while historical TsFiles are closing, preserve the existing realtime behavior and explicit loose-time-range setting, and retry failed first-reference acquisition without discarding the file or advancing historical progress.

Backport adaptations

  • Apply the historical-source changes to PipeHistoricalDataRegionTsFileSource and its existing resource set.
  • Move queue removal after successful event supply, and release the source pin only after the event acquires its reference. The 1.3 source removed queue entries before acquisition, so this ordering adjustment is required to preserve the original retry behavior.
  • Adapt the six added regression tests to the tree-model constructors and PlainDeviceID. Check both source-pin and event-reference directories, which are separate in 1.3.
  • Define the original exception template in both target locale files because this branch does not yet provide the corresponding message constant.

Validation

  • Built the required TsFile version from source, then ran a clean DataNode dependency-reactor test build: 20 tests passed, 0 failures, errors, or skips, including all six added tests.
  • Clean English test-compile: every Java module compiled successfully. The overall command exited 1 only because the assembly-only distribution module requires server/CLI/ConfigNode ZIPs produced during package.
  • Clean Chinese Java-reactor compilation passed: mvn -T 2 clean test-compile -pl '!distribution' -P with-zh-locale -DskipTests.
  • Spotless and message-key/format-placeholder parity checks passed. Source dependencies were built in an isolated verification directory. Enforcer, Checkstyle, and RAT checks were skipped; distribution packaging was not validated.

* Fix historical TsFile filtering and reference acquisition

* Clarify realtime TsFile filtering and reference ownership

(cherry picked from commit 814b770)
@sonarqubecloud

sonarqubecloud Bot commented Nov 4, 2026

Copy link
Copy Markdown

@jt2594838
jt2594838 merged commit ec46eb2 into dev/1.3 Nov 4, 2026
17 of 18 checks passed
@jt2594838
jt2594838 deleted the codex/cp-19096-dev13 branch November 4, 2026 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants