NextGraph
/
rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix wrong indentation

Browse Source 
Summary:
Somehow the indentation was incorrect in this file.
The only change in this PR is to get it right again in order to make the code more readable.
Please reject if you think it's not worth it.
Closes https://github.com/facebook/rocksdb/pull/3504

Differential Revision: D6996011

Pulled By: miasantreble

fbshipit-source-id: 060514a3a8c910d34bad795b36eb4d278512b154
main
jsteemann 7 years ago committed by Facebook Github Bot
parent ba6ee1f749
commit 6a30b98fdc
1 changed files with 82 additions and 82 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 164
      utilities/write_batch_with_index/write_batch_with_index.cc

164
utilities/write_batch_with_index/write_batch_with_index.cc
Unescape View File

@ -486,108 +486,108 @@ void WriteBatchWithIndex::Rep::AddNewEntry(uint32_t column_family_id) {
ReadKeyFromWriteBatchEntry(&entry_ptr, &key, column_family_id != 0); ReadKeyFromWriteBatchEntry(&entry_ptr, &key, column_family_id != 0);
assert(success); assert(success);
auto* mem = arena.Allocate(sizeof(WriteBatchIndexEntry)); auto* mem = arena.Allocate(sizeof(WriteBatchIndexEntry));
auto* index_entry = auto* index_entry =
new (mem) WriteBatchIndexEntry(last_entry_offset, column_family_id, new (mem) WriteBatchIndexEntry(last_entry_offset, column_family_id,
key.data() - wb_data.data(), key.size()); key.data() - wb_data.data(), key.size());
skip_list.Insert(index_entry); skip_list.Insert(index_entry);
} }
void WriteBatchWithIndex::Rep::Clear() {
write_batch.Clear();
ClearIndex();
}
void WriteBatchWithIndex::Rep::ClearIndex() { void WriteBatchWithIndex::Rep::Clear() {
skip_list.~WriteBatchEntrySkipList(); write_batch.Clear();
arena.~Arena(); ClearIndex();
new (&arena) Arena(); }
new (&skip_list) WriteBatchEntrySkipList(comparator, &arena);
last_entry_offset = 0;
}
Status WriteBatchWithIndex::Rep::ReBuildIndex() { void WriteBatchWithIndex::Rep::ClearIndex() {
Status s; skip_list.~WriteBatchEntrySkipList();
arena.~Arena();
new (&arena) Arena();
new (&skip_list) WriteBatchEntrySkipList(comparator, &arena);
last_entry_offset = 0;
}
ClearIndex(); Status WriteBatchWithIndex::Rep::ReBuildIndex() {
Status s;
if (write_batch.Count() == 0) { ClearIndex();
// Nothing to re-index
return s;
}
size_t offset = WriteBatchInternal::GetFirstOffset(&write_batch); if (write_batch.Count() == 0) {
// Nothing to re-index
return s;
}
Slice input(write_batch.Data()); size_t offset = WriteBatchInternal::GetFirstOffset(&write_batch);
input.remove_prefix(offset);
// Loop through all entries in Rep and add each one to the index Slice input(write_batch.Data());
int found = 0; input.remove_prefix(offset);
while (s.ok() && !input.empty()) {
Slice key, value, blob, xid;
uint32_t column_family_id = 0; // default
char tag = 0;
// set offset of current entry for call to AddNewEntry() // Loop through all entries in Rep and add each one to the index
last_entry_offset = input.data() - write_batch.Data().data(); int found = 0;
while (s.ok() && !input.empty()) {
Slice key, value, blob, xid;
uint32_t column_family_id = 0; // default
char tag = 0;
s = ReadRecordFromWriteBatch(&input, &tag, &column_family_id, &key, // set offset of current entry for call to AddNewEntry()
&value, &blob, &xid); last_entry_offset = input.data() - write_batch.Data().data();
if (!s.ok()) {
break;
}
switch (tag) { s = ReadRecordFromWriteBatch(&input, &tag, &column_family_id, &key,
case kTypeColumnFamilyValue: &value, &blob, &xid);
case kTypeValue: if (!s.ok()) {
case kTypeColumnFamilyDeletion: break;
case kTypeDeletion:
case kTypeColumnFamilySingleDeletion:
case kTypeSingleDeletion:
case kTypeColumnFamilyMerge:
case kTypeMerge:
found++;
if (!UpdateExistingEntryWithCfId(column_family_id, key)) {
AddNewEntry(column_family_id);
}
break;
case kTypeLogData:
case kTypeBeginPrepareXID:
case kTypeBeginPersistedPrepareXID:
case kTypeEndPrepareXID:
case kTypeCommitXID:
case kTypeRollbackXID:
case kTypeNoop:
break;
default:
return Status::Corruption("unknown WriteBatch tag in ReBuildIndex",
ToString(static_cast<unsigned int>(tag)));
}
} }
if (s.ok() && found != write_batch.Count()) { switch (tag) {
s = Status::Corruption("WriteBatch has wrong count"); case kTypeColumnFamilyValue:
case kTypeValue:
case kTypeColumnFamilyDeletion:
case kTypeDeletion:
case kTypeColumnFamilySingleDeletion:
case kTypeSingleDeletion:
case kTypeColumnFamilyMerge:
case kTypeMerge:
found++;
if (!UpdateExistingEntryWithCfId(column_family_id, key)) {
AddNewEntry(column_family_id);
}
break;
case kTypeLogData:
case kTypeBeginPrepareXID:
case kTypeBeginPersistedPrepareXID:
case kTypeEndPrepareXID:
case kTypeCommitXID:
case kTypeRollbackXID:
case kTypeNoop:
break;
default:
return Status::Corruption("unknown WriteBatch tag in ReBuildIndex",
ToString(static_cast<unsigned int>(tag)));
} }
}
return s; if (s.ok() && found != write_batch.Count()) {
s = Status::Corruption("WriteBatch has wrong count");
} }
WriteBatchWithIndex::WriteBatchWithIndex( return s;
const Comparator* default_index_comparator, size_t reserved_bytes, }
bool overwrite_key, size_t max_bytes)
: rep(new Rep(default_index_comparator, reserved_bytes, max_bytes, WriteBatchWithIndex::WriteBatchWithIndex(
overwrite_key)) {} const Comparator* default_index_comparator, size_t reserved_bytes,
bool overwrite_key, size_t max_bytes)
: rep(new Rep(default_index_comparator, reserved_bytes, max_bytes,
overwrite_key)) {}
WriteBatchWithIndex::~WriteBatchWithIndex() {} WriteBatchWithIndex::~WriteBatchWithIndex() {}
WriteBatch* WriteBatchWithIndex::GetWriteBatch() { return &rep->write_batch; } WriteBatch* WriteBatchWithIndex::GetWriteBatch() { return &rep->write_batch; }
bool WriteBatchWithIndex::HasDuplicateKeys() { bool WriteBatchWithIndex::HasDuplicateKeys() {
return rep->obsolete_offsets.size() > 0; return rep->obsolete_offsets.size() > 0;
} }
WBWIIterator* WriteBatchWithIndex::NewIterator() { WBWIIterator* WriteBatchWithIndex::NewIterator() {
return new WBWIIteratorImpl(0, &(rep->skip_list), &rep->write_batch); return new WBWIIteratorImpl(0, &(rep->skip_list), &rep->write_batch);
} }
WBWIIterator* WriteBatchWithIndex::NewIterator( WBWIIterator* WriteBatchWithIndex::NewIterator(

Write Preview
Loading…
Cancel
Save