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.

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

libroach: Prepare for RocksDB 6.2 upgrade #38528

Merged
merged 1 commit into from
Jun 28, 2019

Conversation

ajkr
Copy link
Contributor

@ajkr ajkr commented Jun 27, 2019

In our current RocksDB version (5.17), there are using-declarations for
std::unique_ptr inside a namespace rocksdb block in some header
files. Those were rightfully removed in the version we are about to
upgrade to (6.2). So we need to change libroach to not reference
rocksdb::unique_ptr.

Release note: None

Verified

This commit was signed with the committer’s verified signature.
billy1624 Billy Chan
In our current RocksDB version (5.17), there are using-declarations for
`std::unique_ptr` inside a `namespace rocksdb` block in some header
files. Those were rightfully removed in the version we are about to
upgrade to (6.2). So we need to change libroach to not reference
`rocksdb::unique_ptr`.

Release note: None
@ajkr ajkr requested a review from a team June 27, 2019 22:49
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@ajkr ajkr mentioned this pull request Jun 27, 2019
32 tasks
@ajkr
Copy link
Contributor Author

ajkr commented Jun 27, 2019

bors r+

craig bot pushed a commit that referenced this pull request Jun 27, 2019
38528: libroach: Prepare for RocksDB 6.2 upgrade r=ajkr a=ajkr

In our current RocksDB version (5.17), there are using-declarations for
`std::unique_ptr` inside a `namespace rocksdb` block in some header
files. Those were rightfully removed in the version we are about to
upgrade to (6.2). So we need to change libroach to not reference
`rocksdb::unique_ptr`.

Release note: None

Co-authored-by: Andrew Kryczka <andrew.kryczka2@gmail.com>
@craig
Copy link
Contributor

craig bot commented Jun 28, 2019

Build succeeded

@craig craig bot merged commit db0e8e7 into cockroachdb:master Jun 28, 2019
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.

None yet

3 participants