Skip to content

Conversation

@nsivabalan
Copy link
Contributor

What is the purpose of the pull request

Looks like conflict resolution had a bug in auto commit code path. Incidentally both spark datasource writer and deltastreamer uses non auto commit code path and hence this was never an issue. Fixing the same in this patch and added tests to verify the fix.

Brief change log

(for example:)

  • Modify AnnotationLocation checkstyle rule in checkstyle.xml

Verify this pull request

(Please pick either of the following options)

This pull request is a trivial rework / code cleanup without any test coverage.

(or)

This pull request is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

(example:)

  • Added integration tests for end-to-end.
  • Added HoodieClientWriteTest to verify the change.
  • Manually verified the change by running a job locally.

Committer checklist

  • Has a corresponding JIRA in PR title & commit

  • Commit message is descriptive of the change

  • CI is green

  • Necessary doc changes done or have another open PR

  • For large changes, please consider breaking it into sub-tasks under an umbrella JIRA.

@nsivabalan
Copy link
Contributor Author

@manojpec : Can you review this patch please

@nsivabalan nsivabalan force-pushed the autoCommitConflictCheck branch from ee0c9a3 to 3c51e8e Compare January 20, 2022 18:41
@codope
Copy link
Member

codope commented Jan 21, 2022

@nsivabalan Changes look good. But TestHoodieBackedMetadata.testMetadataMultiWriter() is failing. Can yuu please check?

@hudi-bot
Copy link
Collaborator

CI report:

Bot commands @hudi-bot supports the following commands:
  • @hudi-bot run azure re-run the last Azure build

@codope codope merged commit e00a904 into apache:master Jan 24, 2022
alexeykudinkin pushed a commit to onehouseinc/hudi that referenced this pull request Jan 25, 2022
… path for auto commit code path (apache#4588)

* Fixing conflict resolution in transaction management code path for auto commit code path

* Addressing comments

* Fixing test failures
vingov pushed a commit to vingov/hudi that referenced this pull request Jan 26, 2022
… path for auto commit code path (apache#4588)

* Fixing conflict resolution in transaction management code path for auto commit code path

* Addressing comments

* Fixing test failures
liusenhua pushed a commit to liusenhua/hudi that referenced this pull request Mar 1, 2022
… path for auto commit code path (apache#4588)

* Fixing conflict resolution in transaction management code path for auto commit code path

* Addressing comments

* Fixing test failures
vingov pushed a commit to vingov/hudi that referenced this pull request Apr 3, 2022
… path for auto commit code path (apache#4588)

* Fixing conflict resolution in transaction management code path for auto commit code path

* Addressing comments

* Fixing test failures
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.

3 participants