Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make record time optional for committers #6538

Merged
merged 21 commits into from
Jul 1, 2020
Merged

Make record time optional for committers #6538

merged 21 commits into from
Jul 1, 2020

Conversation

miklos-da
Copy link
Contributor

@miklos-da miklos-da commented Jun 30, 2020 •
edited
Loading

Summary of changes:

  • Made CommitContext.getRecordTime return an Option[Timestamp].
  • Changed all committers to handle the case when record time is not available (e.g., skip checking against maximum record time or deduplication time).
  • Changed all committers to only add record time to the resulting log entry when record time is available.
  • Removed CommitContext.getMaximumRecordTime and have it passed to ConfigCommitter via its constructor.
  • Minor code tidying (e.g., consistent usage of braces around if/else).

Pull Request Checklist

  • Read and understand the contribution guidelines
  • Include appropriate tests
  • Set a descriptive title and thorough description
  • Add a reference to the issue this PR will solve, if appropriate
  • Include changelog additions in one or more commit message bodies between the CHANGELOG_BEGIN and CHANGELOG_END tags
  • Normal production system change, include purpose of change in description

NOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with /AzurePipelines run to
trigger the build.

miklos-da added 14 commits June 30, 2020 12:17
@miklos-da
Removed maximumRecordTime from CommitContext.
5f0ed0c
@miklos-da
Made recordTime optional in CommitContext.
62a72ac
@miklos-da
Added utility function for setting record time in output log entry.
ddcd5da
@miklos-da
Propagate record time from processSubmission.
45a0a37 
CHANGELOG_BEGIN
CHANGELOG_END
@miklos-da
Added basic tests for ConfigCommitter.
0720043
@miklos-da
Code tidying.
189665a
@miklos-da
Added some tests for PackageCommitter.
24f7478
@miklos-da
Added some tests for TransactionCommitter.
9761937
@miklos-da
Added headers.
af012b3
@miklos-da
Share logic for producing a log entry with/without record time.
729593a
@miklos-da
Removed redundant test.
d2d86a2
@miklos-da
Code tidying.
58b16f4
@miklos-da
Merge branches 'kvutils/remove-dependence-on-record-time' and 'master…
de0d07a 
…' of github.com:digital-asset/daml into kvutils/remove-dependence-on-record-time

� Conflicts:
�	ledger/participant-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils/committer/ConfigCommitter.scala
�	ledger/participant-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils/committer/PackageCommitter.scala
�	ledger/participant-state/kvutils/src/main/scala/com/daml/ledger/participant/state/kvutils/committer/PartyAllocationCommitter.scala
@miklos-da
Removed commented out code.
0684a19
@miklos-da miklos-da marked this pull request as ready for review June 30, 2020 16:04
@miklos-da miklos-da requested a review from a user June 30, 2020 16:04
@miklos-da miklos-da requested a review from a user June 30, 2020 16:04
@miklos-da
Merge branches 'kvutils/remove-dependence-on-record-time' and 'master…
9572da0 
…' of github.com:digital-asset/daml into kvutils/remove-dependence-on-record-time
fabiotudone-da
fabiotudone-da reviewed Jul 1, 2020
View reviewed changes
Copy link
Contributor

@fabiotudone-da fabiotudone-da left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly minor changes requested that can be done in a subsequent PR and wouldn't prevent an approval from my side, but I also have a few questions.

...ils/src/main/scala/com/daml/ledger/participant/state/kvutils/committer/ConfigCommitter.scala Show resolved Hide resolved
...rc/main/scala/com/daml/ledger/participant/state/kvutils/committer/TransactionCommitter.scala Show resolved Hide resolved
...st/suite/scala/com/daml/ledger/participant/state/kvutils/committer/ConfigCommitterSpec.scala Outdated Show resolved Hide resolved
...st/suite/scala/com/daml/ledger/participant/state/kvutils/committer/ConfigCommitterSpec.scala Show resolved Hide resolved
...src/test/suite/scala/com/daml/ledger/participant/state/kvutils/committer/CommitterSpec.scala Show resolved Hide resolved
...ite/scala/com/daml/ledger/participant/state/kvutils/committer/TransactionCommitterSpec.scala Show resolved Hide resolved
...ite/scala/com/daml/ledger/participant/state/kvutils/committer/TransactionCommitterSpec.scala Show resolved Hide resolved
...ite/scala/com/daml/ledger/participant/state/kvutils/committer/TransactionCommitterSpec.scala Show resolved Hide resolved
@miklos-da miklos-da requested a review from fabiotudone-da July 1, 2020 13:18
@miklos-da miklos-da merged commit 5302c57 into master Jul 1, 2020
@miklos-da miklos-da deleted the kvutils/remove-dependence-on-record-time branch July 1, 2020 17:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andreaslochbihler-da andreaslochbihler-da andreaslochbihler-da left review comments

@fabiotudone-da fabiotudone-da fabiotudone-da approved these changes

@dasormeter dasormeter Awaiting requested review from dasormeter

@gerolf-da gerolf-da Awaiting requested review from gerolf-da

@hurryabit hurryabit Awaiting requested review from hurryabit

@mziolekda mziolekda Awaiting requested review from mziolekda

@rautenrieth-da rautenrieth-da Awaiting requested review from rautenrieth-da

@remyhaemmerle-da remyhaemmerle-da Awaiting requested review from remyhaemmerle-da

@stefanobaghino-da stefanobaghino-da Awaiting requested review from stefanobaghino-da

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@miklos-da @andreaslochbihler-da @fabiotudone-da