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

add rocksdb subtree #163

Merged
merged 3 commits into from
Nov 29, 2017
Merged

add rocksdb subtree #163

merged 3 commits into from
Nov 29, 2017

Conversation

BusyJay
Copy link
Member

@BusyJay BusyJay commented Nov 29, 2017 •
edited
Loading

This is a part of #159. Create a seperate pr to make it easy to review.

To update rocksdb, use following command:

$ git remote add pingcap-rocksdb https://github.com/pingcap/rocksdb.git
$ git subtree pull -P librocksdb_sys/rocksdb pingcap-rocksdb release --squash

Note that the two commits should not be squashed.

@BusyJay
Squashed 'librocksdb_sys/rocksdb/' content from commit 532fc5e
9e953a7 
git-subtree-dir: librocksdb_sys/rocksdb
git-subtree-split: 532fc5e66456b3fb71b2370258905b71b8340010
@BusyJay
Merge commit '9e953a73af301105efc0769e9a770cfde2f2ffcd' as 'librocksd…
008dd54 
…b_sys/rocksdb'
zhangjinpeng87
zhangjinpeng87 previously approved these changes Nov 29, 2017
View reviewed changes
Copy link
Member

@zhangjinpeng87 zhangjinpeng87 left a comment

Choose a reason for hiding this comment

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

LGTM

@zhangjinpeng87
Copy link
Member

@huachaohuang PTAL

@BusyJay
Copy link
Member Author

BusyJay commented Nov 29, 2017

Cargo doesn't support shallow clone yet, so use subtree instead of submodule here.

@siddontang
Copy link

I suggest adding the update script in the Makefile so we can use make update_rocksdb to do it automatically.

siddontang
siddontang approved these changes Nov 29, 2017
View reviewed changes
Copy link

@siddontang siddontang left a comment

Choose a reason for hiding this comment

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

LGTM

@BusyJay BusyJay merged commit 87a8e35 into tikv:master Nov 29, 2017
@BusyJay BusyJay deleted the subtree branch November 29, 2017 11:20
sre-bot added a commit that referenced this pull request Jun 4, 2020
@sre-bot
titan: feat: Titan should return user value to compaction filter #163 (…
188acd9 
…#499)
yiwu-arbug pushed a commit that referenced this pull request Jun 4, 2020
@sre-bot
titan: Fix GC may delete a already deleted blob file (#168)
d472363 
update titan to include tikv/titan#169 for tikv-4.x

include the following changes
```
81814ec 2020-06-04 zbk602423539@gmail.. Fix GC may delete a already deleted blob file (#168) (#169)
80657c0 2020-06-04 zbk602423539@gmail.. Fix wrong assert delta < 0 for cocurrent compaction while flush (#172) (#176)
0db7976 2020-06-04 sre-bot@pingcap.com  Fix wrong live data size when encounter rewrite failure (#161) (#175)
c41f2a2 2020-06-04 sre-bot@pingcap.com  feat: Titan should return user value to compaction filter #163 (#164) (#174)
```

Signed-off-by: sre-bot <sre-bot@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@siddontang siddontang siddontang approved these changes

@zhangjinpeng87 zhangjinpeng87 zhangjinpeng87 left review comments

@huachaohuang huachaohuang Awaiting requested review from huachaohuang

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
@BusyJay @zhangjinpeng87 @siddontang