Skip to content

Conversation

@blerer
Copy link
Contributor

@blerer blerer commented Jun 10, 2024

Thanks for sending a pull request! Here are some tips if you're new here:

  • Ensure you have added or run the appropriate tests for your PR.
  • Be sure to keep the PR description updated to reflect all changes.
  • Write your PR title to summarize what this PR proposes.
  • If possible, provide a concise example to reproduce the issue for a faster review.
  • Read our contributor guidelines
  • If you're making a documentation change, see our guide to documentation contribution

Commit messages should follow the following format:

<One sentence description, usually Jira title or CHANGES.txt summary>

<Optional lengthier description (context on patch)>

patch by <Authors>; reviewed by <Reviewers> for CASSANDRA-#####

Co-authored-by: Name1 <email1>
Co-authored-by: Name2 <email2>

The Cassandra Jira

@blerer blerer force-pushed the CASSANDRA-19617-trunk branch from 6a2cb4b to 1d310ee Compare June 10, 2024 15:11
@@ -1,3 +1,4 @@
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

merge conflict

return open(table.keyspace).getColumnFamilyStore(table.id);
}

public static ColumnFamilyStore openAndGetStoreIfExists(TableMetadata table)
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we add @Nullable?

* Returns a ColumnFamilyStore by metadata if it exists, null otherwise
* Differently from others, this method does not throw exception if the table does not exist.
*/
public static ColumnFamilyStore getIfExists(TableMetadata table)
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we add @Nullable?

return cfs;
}

public ColumnFamilyStore getIfExists(TableId id)
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we add @Nullable?

Copy link
Contributor

@dcapwell dcapwell left a comment

Choose a reason for hiding this comment

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

don't know paxos well enough to comment that the changes are correct and safe, so would need someone like @belliottsmith to review that section. The rest of the changes LGTM though

@blerer
Copy link
Contributor Author

blerer commented Jun 11, 2024

@dcapwell Looking at the PR I mixed up 2 patches here. Let me clean my mess.

@blerer blerer closed this Jun 11, 2024
@blerer blerer deleted the CASSANDRA-19617-trunk branch June 27, 2024 11:57
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