kv/KeyValueDB: add column family #18049
Merged
Conversation
This file contains 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
amitkumar50
reviewed
Oct 2, 2017
| class TransactionImpl { | ||
| public: | ||
| /// Set Keys | ||
| void set( | ||
| const std::string &prefix, ///< [in] Prefix for keys | ||
| const std::string &prefix, ///< [in] Prefix for keys, or CF name |
liewegas
force-pushed
the
wip-kv-iterator
branch
2 times, most recently
from
5ac15ce
to
01814ea
Compare
|
@markhpc can you give this one a whirl? I think it's basically ready to merge. |
|
On it! |
liewegas
force-pushed
the
wip-kv-iterator
branch
from
01814ea
to
d02335f
Compare
These iterfaces are similar but ultimately unrelated! Unfortunately we are stuck with a joined class hiearchy because of DBObjectMap. Someday it would be nice to break this link. Signed-off-by: Sage Weil <sage@redhat.com>
This uses the most general class as the type for the Iterator shared_ptr typedef, and makes the class that filters by prefix private. Signed-off-by: Sage Weil <sage@redhat.com>
get_wholespace_iterator() and get_iterator(). This gets rid of the goofy _get_iterator() indirection and avoids colliding on names w/ virtual methods. Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Jianjian Huo <jianjian.huo@ssi.samsung.com> Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
liewegas
force-pushed
the
wip-kv-iterator
branch
from
d02335f
to
a5289cb
Compare
- detect and use existing CFs on open Signed-off-by: Jianjian Huo <jianjian.huo@ssi.samsung.com> Signed-off-by: Adam C. Emerson <aemerson@redhat.com> Signed-off-by: Sage Weil <sage@redhat.com>
Merge operators always map to a prefix, just like a CF, so we can link directly to the operator without doing any lookup. Signed-off-by: Sage Weil <sage@redhat.com>
This was hard-coded to 'b'. Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
liewegas
force-pushed
the
wip-kv-iterator
branch
from
a5289cb
to
6ea96fa
Compare
markhpc
approved these changes
Oct 5, 2017
| @@ -65,8 +65,14 @@ const string PREFIX_OBJ = "O"; // object name -> onode_t | |||
| const string PREFIX_OMAP = "M"; // u64 + keyname -> value | |||
| const string PREFIX_DEFERRED = "L"; // id -> deferred_transaction_t | |||
| const string PREFIX_ALLOC = "B"; // u64 offset -> u64 length (freelist) | |||
| const string PREFIX_ALLOC_BITMAP = "b"; // (see BitmapFreelistManager) | |||
There was a problem hiding this comment.
The old way of doing this is nasty, but I'm not sure it's great to move BitmapFreelistManager specific prefix into BlueStore.cc?
OTOH, we can just reserve "B" and "b" for freelist management in general, which feels a bit saner, so maybe this is ok in the end.
We need to close the default CF handle *only* if we explicitly opened it. Also, take care to use that handle wherever we can. This is mostly paranoia--I'm not sure if rocksdb cares if you mix the handle you opened with DefaultColumnFamily(), which is different. Signed-off-by: Sage Weil <sage@redhat.com>
adamemerson
approved these changes
Oct 6, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is another iteration of Adam's squash, but it also cleans up the iterator
mess in KeyValueDB, and simplifies a bunch of the cf handle stuff in rocksdb.