Merge ConsensusCommitTestUtils and ConsensusCommitIntegrationTestUtils #2733
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR consolidates two similar utility classes by merging ConsensusCommitIntegrationTestUtils into ConsensusCommitTestUtils and updating all references accordingly.
- Unified suffix addition functionality across integration tests by replacing all calls to ConsensusCommitIntegrationTestUtils with ConsensusCommitTestUtils.
- Removed the obsolete ConsensusCommitIntegrationTestUtils file.
Reviewed Changes
Copilot reviewed 19 out of 19 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| integration-test/.../TwoPhaseConsensusCommitWithIncludeMetadataEnabledIntegrationTestBase.java | Updated suffix addition call to use ConsensusCommitTestUtils |
| integration-test/.../TwoPhaseConsensusCommitSpecificIntegrationTestBase.java | Updated both properties1 and properties2 suffix addition calls |
| integration-test/.../TwoPhaseConsensusCommitIntegrationTestBase.java | Replaced suffix addition calls in both getProperties1 and getProperties2 |
| integration-test/.../TwoPhaseConsensusCommitCrossPartitionScanIntegrationTestBase.java | Updated calls to add suffix to coordinator namespace |
| integration-test/.../ConsensusCommitWithIncludeMetadataEnabledIntegrationTestBase.java | Replaced suffix addition call in beforeAll() |
| integration-test/.../ConsensusCommitTestUtils.java | Introduced new merged utility method and preserved existing functionality |
| integration-test/.../ConsensusCommitSpecificIntegrationTestBase.java | Updated suffix addition call in beforeAll() |
| integration-test/.../ConsensusCommitNullMetadataIntegrationTestBase.java | Replaced suffix addition call in beforeAll() |
| integration-test/.../ConsensusCommitIntegrationTestBase.java | Updated suffix addition call in getProperties() |
| integration-test/.../ConsensusCommitCrossPartitionScanIntegrationTestBase.java | Updated suffix addition call in getProperties() |
| integration-test/.../ConsensusCommitAdminRepairIntegrationTestBase.java | Updated suffix addition call in getProperties() |
| integration-test/.../ConsensusCommitAdminIntegrationTestBase.java | Updated suffix addition call in getProperties() |
| integration-test/.../ConsensusCommitAdminImportTableIntegrationTestBase.java | Updated suffix addition call in getProperties() |
| core/.../MultiStorageSchemaLoaderIntegrationTest.java | Replaced suffix addition for both Cassandra and JDBC properties |
| core/.../ConsensusCommitJdbcEnv.java | Updated suffix addition call in getProperties() |
| core/.../ConsensusCommitDynamoEnv.java | Updated suffix addition call in getProperties() |
| core/.../ConsensusCommitCosmosEnv.java | Updated suffix addition call in getProperties() |
| core/.../ConsensusCommitCassandraEnv.java | Updated suffix addition call in getProperties() |
Comments suppressed due to low confidence (2)
integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/TwoPhaseConsensusCommitWithIncludeMetadataEnabledIntegrationTestBase.java:63
- Consider updating the related documentation or in-code comments to reference the merge of ConsensusCommitIntegrationTestUtils into ConsensusCommitTestUtils for clarity.
ConsensusCommitTestUtils.addSuffixToCoordinatorNamespace(properties, TEST_NAME);
integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitIntegrationTestUtils.java:1
- Ensure that no external modules or tests rely on ConsensusCommitIntegrationTestUtils now that it has been removed from the codebase.
package com.scalar.db.transaction.consensuscommit; // file removal
brfrn169
commented
Jun 4, 2025
| return properties; | ||
| } | ||
|
|
||
| public static void addSuffixToCoordinatorNamespace(Properties properties, String suffix) { |
Collaborator
Author
There was a problem hiding this comment.
Moved this method from ConsensusCommitIntegrationTestUtils to ConsensusCommitTestUtils.
…usCommitIntegrationTestUtils
brfrn169
deleted the
merge-ConsensusCommitTestUtils-and-ConsensusCommitIntegrationTestUtils
branch
brfrn169
added a commit
that referenced
this pull request
Jun 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR merges
ConsensusCommitTestUtilsandConsensusCommitIntegrationTestUtils, as their roles are similar.Related issues and/or PRs
N/A
Changes made
ConsensusCommitTestUtilsandConsensusCommitIntegrationTestUtilsChecklist
Additional notes (optional)
N/A
Release notes
N/A