[Improve](streaming-job) support specifying offset for StreamingInsertJob create and alter by JNSimba · Pull Request #62490 · apache/doris

JNSimba · 2026-04-14T10:49:11Z

Summary

Support specifying offset (binlog position, LSN, named modes) when creating or altering a StreamingInsertJob via FROM MYSQL/POSTGRES path.
FE: extend DataSourceConfigValidator to validate offset formats (initial/snapshot/latest/earliest/JSON); earliest is MySQL-only, rejected for PostgreSQL. Implement JdbcSourceOffsetProvider.deserializeOffsetProperty() for named modes and JSON offset parsing. Remove S3-only restriction in StreamingInsertJob.initInsertJob() and modifyPropertiesInternal() so CDC jobs can also use offset property. On ALTER, sync offset to sourceProperties for the FROM...TO path.
BE: support JSON LSN offset {"lsn":"N"} in PostgresSourceReader.generatePostgresConfig(), and handle SPECIFIC_OFFSETS mode in JdbcIncrementalSourceReader.getStartOffsetFromConfig().
Fix JdbcOffset.isValidOffset() and toSerializedJson() to return meaningful values instead of hardcoded false/null.

Test plan

Regression test: test_streaming_mysql_job_special_offset — earliest/latest/JSON binlog offset with data sync verification, ALTER JOB offset change, invalid format rejection
Regression test: test_streaming_postgres_job_special_offset — initial/latest with data sync, ALTER JOB with JSON LSN offset and data sync verification, earliest rejection for PG, invalid format rejection
Regression test: test_streaming_mysql_job_special_offset_restart_fe — create job with JSON binlog offset, verify data sync, restart FE, verify job recovery and continued sync

🤖 Generated with Claude Code

…tJob create and alter Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Thearas · 2026-04-14T10:49:17Z

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

What problem was fixed (it's best to include specific error reporting information). How it was fixed.
Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
What features were added. Why was this function added?
Which code was refactored and why was this part of the code refactored?
Which functions were optimized and what is the difference before and after the optimization?

… alter offset test - CDC ALTER only allows JSON specific offset (reject named modes like initial/latest) - ALTER offset uses PROPERTIES('offset'='{"file":"xxx","pos":"yyy"}') syntax - Update regression cases to use PROPERTIES for ALTER - Add cdc_stream TVF ALTER offset regression test Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

JNSimba · 2026-04-14T11:16:00Z

run buildall

…urceType().name() Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

JNSimba · 2026-04-15T02:24:15Z

/review

Copilot

Pull request overview

This PR extends StreamingInsertJob CDC offset support so users can specify named offsets (initial/snapshot/latest/earliest) and JSON “specific offsets” when creating jobs via FROM MYSQL/POSTGRES, and JSON offsets when altering jobs (with validation and BE parsing support).

Changes:

FE: extend source config validation to accept additional offset modes and JSON offsets; wire validateSource to be data-source-type aware; allow CDC jobs to use offset property and restrict ALTER to JSON offsets for CDC.
FE: implement/adjust JDBC offset property deserialization and improve JdbcOffset behaviors (isValidOffset, toSerializedJson).
BE: add PostgreSQL JSON LSN offset support and handle SPECIFIC_OFFSETS startup mode.

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
regression-test/suites/job_p0/streaming_job/cdc/tvf/test_streaming_job_cdc_stream_mysql_alter_offset.groovy	Adds TVF-path regression coverage for ALTER with JSON MySQL binlog offset.
regression-test/suites/job_p0/streaming_job/cdc/test_streaming_postgres_job_special_offset.groovy	Adds PG regression coverage for create offsets + ALTER with JSON LSN, plus invalid cases.
regression-test/suites/job_p0/streaming_job/cdc/test_streaming_mysql_job_special_offset_restart_fe.groovy	Adds FE-restart regression coverage for MySQL JSON binlog offset persistence.
regression-test/suites/job_p0/streaming_job/cdc/test_streaming_mysql_job_special_offset.groovy	Adds MySQL regression coverage for earliest/latest/JSON offsets and ALTER behavior.
fs_brokers/cdc_client/src/main/java/org/apache/doris/cdcclient/source/reader/postgres/PostgresSourceReader.java	Adds JSON LSN startup offset handling for PostgreSQL.
fs_brokers/cdc_client/src/main/java/org/apache/doris/cdcclient/source/reader/JdbcIncrementalSourceReader.java	Handles `SPECIFIC_OFFSETS` startup mode by constructing offset from config.
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CreateJobCommand.java	Passes source type into source config validation for offset-type-specific rules.
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/AlterJobCommand.java	Passes data source type into source config validation during ALTER.
fe/fe-core/src/main/java/org/apache/doris/job/offset/jdbc/JdbcSourceOffsetProvider.java	Implements offset property deserialization for named modes and JSON.
fe/fe-core/src/main/java/org/apache/doris/job/offset/jdbc/JdbcOffset.java	Adjusts offset validity and serialization behavior.
fe/fe-core/src/main/java/org/apache/doris/job/extensions/insert/streaming/StreamingInsertJob.java	Enables offset property validation beyond S3 and restricts CDC ALTER to JSON offsets.
fe/fe-core/src/main/java/org/apache/doris/job/extensions/insert/streaming/DataSourceConfigValidator.java	Adds data-source-type-aware offset validation and JSON detection helper.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

github-actions

Found 1 blocking issue.

High - now serializes JDBC offsets in a different shape from what still reads. For binlog offsets the new JSON nests fields under , but the deserialize/replay path still expects a flattened list of string maps. persists this serialized value immediately after , so cloud replay / offset restore can no longer round-trip the altered CDC offset correctly.

Critical checkpoints:

Goal of task: Support special offsets on create/alter. Partially achieved; create/alter paths were extended and regression tests were added, but the new serialized offset format breaks persisted/replayed CDC offsets in cloud mode.
Modification size/focus: Focused overall.
Concurrency: No new concurrency concerns identified in the touched code paths.
Lifecycle/static init: No special lifecycle or static-init issues identified.
Configuration: No new configs added.
Compatibility/storage format: Blocking issue. The PR changes serialized JDBC offset shape without updating the corresponding deserialize/replay path.
Parallel code paths: Checked both and job paths; the persistence problem sits in shared JDBC offset serialization.
Special conditional checks: The new ALTER restriction to JSON offsets is understandable and commented.
Test coverage: New regression tests cover MySQL/Postgres create/alter and one FE-restart scenario, but they do not cover cloud-mode reset/replay of an altered JSON offset.
Observability: Existing logs seem adequate for this path.
Transaction/persistence: Problematic because offset reset/replay persists a format the current reader does not consume.
Data write/atomicity: No direct new write-atomicity issue beyond the persisted offset corruption risk.
FE-BE variable passing: No new FE-BE field propagation issues identified.
Performance: No material performance regressions identified in the reviewed diff.
Other issues: None beyond the blocking serialization mismatch.

…vider, fix serialization - Add validateAlterOffset() to SourceOffsetProvider interface, CDC impl rejects non-JSON offset, S3 impl allows any format (default no-op) - StreamingInsertJob delegates ALTER offset validation to provider - AlterJobCommand.validateProps calls validateAlterOffset before validateOffset - Restore S3-only guard in initInsertJob for PROPERTIES offset - Fix JdbcOffset.toSerializedJson() to produce flat format compatible with deserializeOffset(): [{"split_id":"binlog-split","file":"xxx","pos":"yyy"}] - Remove unnecessary ts_usec padding in PostgresSourceReader JSON offset - Remove instanceof check in modifyPropertiesInternal (validation moved to AlterJobCommand) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

JNSimba · 2026-04-15T03:35:55Z

/review

JNSimba · 2026-04-15T03:36:02Z

run buildall

…izeOffsetProperty Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

github-actions

Found 2 blocking correctness issues.

FE accepts any JSON offset on ALTER for JDBC jobs. JdbcSourceOffsetProvider.validateAlterOffset() and deserializeOffsetProperty() only gate on isJsonOffset(), so a PostgreSQL job can accept MySQL-style JSON like {"file":"binlog.000001","pos":"154"} (and vice versa). ALTER succeeds, but the resumed job then fails in the broker because PostgresSourceReader.generatePostgresConfig() requires lsn.
ALTER on the FROM MYSQL/POSTGRES ... TO path does not persist the new startup offset into sourceProperties. modifyPropertiesInternal() updates only the in-memory provider, while replay/reconstruction uses sourceProperties (for example in gsonPostProcess() and when creating the next multi-table task). If FE restarts before the first post-ALTER commit, the altered offset is lost and the job resumes from the old mode/offset.

Critical checkpoint conclusions:

Goal of current task: Partially accomplished. The PR adds special-offset support, but the ALTER path is still incorrect in the two scenarios above, so the feature is not correct end-to-end.
Modification size/clarity: Mostly focused, but the ALTER validation/persistence logic is split in a way that misses source-specific constraints and durable state updates.
Concurrency: No new lock-order or thread-safety issue found in the touched code.
Lifecycle/static initialization: No special lifecycle or static-init issue found.
Configuration items: No new config items added.
Compatibility: No incompatible wire/storage format change identified.
Parallel code paths: The CREATE path and downstream readers enforce source-specific semantics, but the ALTER path does not; that inconsistency is the root cause of one blocker.
Special conditional checks: The new JSON-only check is too broad and should be source-type-aware.
Test coverage: New regression tests cover many happy paths, but they do not cover invalid cross-source JSON on ALTER or FE restart before the first post-ALTER commit on the FROM ... TO path.
Observability: Existing logging looks sufficient to diagnose these failures.
Transaction/persistence: There is a persistence bug for altered offsets on the FROM ... TO path because replay reconstructs from stale sourceProperties.
Data writes/modifications: The restart case can resume consumption from the wrong offset, so data correctness is at risk.
FE/BE variable passing: No new propagation issue beyond the stale sourceProperties state above.
Performance: No material performance regression found in the touched code.
Other issues: None beyond the two blocking findings above.

JNSimba · 2026-04-15T04:08:15Z

run buildall

hello-stephen · 2026-04-15T06:28:35Z

FE Regression Coverage Report

Increment line coverage 12.50% (7/56) 🎉
Increment coverage report
Complete coverage report

…tJob create and alter Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

… alter offset test - CDC ALTER only allows JSON specific offset (reject named modes like initial/latest) - ALTER offset uses PROPERTIES('offset'='{"file":"xxx","pos":"yyy"}') syntax - Update regression cases to use PROPERTIES for ALTER - Add cdc_stream TVF ALTER offset regression test Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…urceType().name() Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…vider, fix serialization - Add validateAlterOffset() to SourceOffsetProvider interface, CDC impl rejects non-JSON offset, S3 impl allows any format (default no-op) - StreamingInsertJob delegates ALTER offset validation to provider - AlterJobCommand.validateProps calls validateAlterOffset before validateOffset - Restore S3-only guard in initInsertJob for PROPERTIES offset - Fix JdbcOffset.toSerializedJson() to produce flat format compatible with deserializeOffset(): [{"split_id":"binlog-split","file":"xxx","pos":"yyy"}] - Remove unnecessary ts_usec padding in PostgresSourceReader JSON offset - Remove instanceof check in modifyPropertiesInternal (validation moved to AlterJobCommand) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…izeOffsetProperty Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…oris into improve_special_offset

…mprove test cases - MySQL BE: supplement kind=SPECIFIC for ALTER offset in createBinlogSplit, add WARN log for fallback to config/earliest offset - PG BE: supplement ts_usec=0 in createOffset for ALTER offset - FE: sync offsetProviderPersist after ALTER offset update, remove debug logs from hasMoreDataToConsume - Improve test cases: verify ALTER offset truly takes effect by checking data before/after the offset mark position - Add golden files for qt_select assertions Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

JNSimba · 2026-04-15T11:09:40Z

/review

already processed

github-actions · 2026-04-24T07:34:17Z

PR approved by at least one committer and no changes requested.

…ffset_resolve # Conflicts: # fe/fe-core/src/main/java/org/apache/doris/job/extensions/insert/streaming/DataSourceConfigValidator.java # fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/AlterJobCommand.java

JNSimba · 2026-04-24T08:25:07Z

run buildall

github-actions · 2026-04-24T08:35:24Z

PR approved by at least one committer and no changes requested.

JNSimba · 2026-04-24T08:52:01Z

run feut

…e change validateSource now takes (Map, String dataSourceType). The test file was added upstream after this PR started changing the signature, so after the merge its six single-arg calls no longer compile. Pass DataSourceType.POSTGRES.name() since every test covers PG slot_name / publication_name validation.

JNSimba · 2026-04-24T09:34:04Z

run buildall

github-actions · 2026-04-24T09:37:35Z

PR approved by at least one committer and no changes requested.

hello-stephen · 2026-04-24T12:16:43Z

FE Regression Coverage Report

Increment line coverage 34.69% (34/98) 🎉
Increment coverage report
Complete coverage report

Resolve conflicts with master: - DataSourceConfigValidator: merge ImmutableSortedSet (PR) and Jackson ObjectMapper (master, apache#62490) imports. - AlterJobCommand cdc_stream branch: union the unmodifiable property list — keep PR's snapshot_split_key / snapshot_split_size / snapshot_parallelism alongside master's slot_name / publication_name (apache#62526). - test_streaming_mysql_job_create_alter: keep both PR's schema rejection case and master's snapshot_*/exclude_columns/target_table cases (apache#62553). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Resolve add/add conflict on DataSourceConfigValidatorTest.java: keep both PR's SSL validation tests and master's slot/publication identifier tests (apache#62526), and update PR's tests to call the new two-argument validateSource(input, dataSourceType) signature introduced by master in apache#62490. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

…tJob create and alter (#62490) ## Summary - Support specifying offset (binlog position, LSN, named modes) when creating or altering a StreamingInsertJob via `FROM MYSQL/POSTGRES` path. - FE: extend `DataSourceConfigValidator` to validate offset formats (initial/snapshot/latest/earliest/JSON); `earliest` is MySQL-only, rejected for PostgreSQL. Implement `JdbcSourceOffsetProvider.deserializeOffsetProperty()` for named modes and JSON offset parsing. Remove S3-only restriction in `StreamingInsertJob.initInsertJob()` and `modifyPropertiesInternal()` so CDC jobs can also use offset property. On ALTER, sync offset to `sourceProperties` for the FROM...TO path. - BE: support JSON LSN offset `{"lsn":"N"}` in `PostgresSourceReader.generatePostgresConfig()`, and handle `SPECIFIC_OFFSETS` mode in `JdbcIncrementalSourceReader.getStartOffsetFromConfig()`. - Fix `JdbcOffset.isValidOffset()` and `toSerializedJson()` to return meaningful values instead of hardcoded false/null.

[Improve](streaming-job) support specifying offset for StreamingInser…

d0fd0b1

…tJob create and alter Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

JNSimba and others added 2 commits April 14, 2026 19:14

[fix](streaming-job) fix checkstyle: line length and unused import

14306bb

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

[fix](streaming-job) fix AlterJobCommand compile error: use getDataSo…

7ccb97b

…urceType().name() Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

JNSimba requested a review from Copilot April 15, 2026 02:24

Copilot started reviewing on behalf of JNSimba April 15, 2026 02:24 View session

Copilot AI reviewed Apr 15, 2026

View reviewed changes

github-actions Bot requested changes Apr 15, 2026

View reviewed changes

Comment thread fe/fe-core/src/main/java/org/apache/doris/job/offset/jdbc/JdbcOffset.java

[fix](streaming-job) remove unreachable named mode branch in deserial…

4a8183a

…izeOffsetProperty Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

github-actions Bot requested changes Apr 15, 2026

View reviewed changes

Comment thread fe/fe-core/src/main/java/org/apache/doris/job/offset/jdbc/JdbcSourceOffsetProvider.java

Comment thread ...-core/src/main/java/org/apache/doris/job/extensions/insert/streaming/StreamingInsertJob.java

fix style

a543e1b

JNSimba and others added 7 commits April 15, 2026 14:55

[Improve](streaming-job) support specifying offset for StreamingInser…

651316b

…tJob create and alter Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

[fix](streaming-job) fix checkstyle: line length and unused import

0feb39c

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

[fix](streaming-job) fix AlterJobCommand compile error: use getDataSo…

70eaeff

…urceType().name() Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

[fix](streaming-job) remove unreachable named mode branch in deserial…

528a075

…izeOffsetProperty Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

fix style

b7c7a15

JNSimba force-pushed the improve_special_offset branch from a543e1b to b7c7a15 Compare April 15, 2026 06:55

JNSimba and others added 2 commits April 15, 2026 16:45

Merge branch 'improve_special_offset' of https://github.com/JNSimba/d…

0865d94

…oris into improve_special_offset

JNSimba closed this Apr 24, 2026

JNSimba reopened this Apr 24, 2026

github-actions Bot added the approved Indicates a PR has been approved by one committer. label Apr 24, 2026

JNSimba dismissed liaoxin01’s stale review via c28ab44 April 24, 2026 08:23

github-actions Bot removed the approved Indicates a PR has been approved by one committer. label Apr 24, 2026

liaoxin01 previously approved these changes Apr 24, 2026

View reviewed changes

github-actions Bot added the approved Indicates a PR has been approved by one committer. label Apr 24, 2026

JNSimba dismissed liaoxin01’s stale review via c7b1dcd April 24, 2026 09:33

github-actions Bot removed the approved Indicates a PR has been approved by one committer. label Apr 24, 2026

catpineapple approved these changes Apr 24, 2026

View reviewed changes

github-actions Bot added the approved Indicates a PR has been approved by one committer. label Apr 24, 2026

JNSimba merged commit 27fba6c into apache:master Apr 24, 2026
30 of 32 checks passed

github-actions Bot added the dev/4.1.x-conflict label Apr 24, 2026

JNSimba added dev/4.1.x and removed dev/4.1.x dev/4.1.x-conflict labels Apr 27, 2026

github-actions Bot mentioned this pull request Apr 27, 2026

branch-4.1: [Improve](streaming-job) support specifying offset for StreamingInsertJob create and alter #62490 #62853

Open

Conversation

JNSimba commented Apr 14, 2026

Summary

Test plan

Uh oh!

Thearas commented Apr 14, 2026

Uh oh!

JNSimba commented Apr 14, 2026

Uh oh!

JNSimba commented Apr 15, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JNSimba commented Apr 15, 2026

Uh oh!

JNSimba commented Apr 15, 2026

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

JNSimba commented Apr 15, 2026

Uh oh!

hello-stephen commented Apr 15, 2026

FE Regression Coverage Report

Uh oh!

JNSimba commented Apr 15, 2026

Uh oh!

github-actions Bot commented Apr 24, 2026

Uh oh!

JNSimba commented Apr 24, 2026

Uh oh!

github-actions Bot commented Apr 24, 2026

Uh oh!

JNSimba commented Apr 24, 2026

Uh oh!

JNSimba commented Apr 24, 2026

Uh oh!

github-actions Bot commented Apr 24, 2026

Uh oh!

Uh oh!

hello-stephen commented Apr 24, 2026

FE Regression Coverage Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants