Skip to content

Commit

Permalink
address comments: remove some comments
Browse files Browse the repository at this point in the history
  • Loading branch information
liuyu85cn committed Apr 21, 2022
1 parent 25f7162 commit 9b69cf4
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
2 changes: 1 addition & 1 deletion src/kvstore/raftex/RaftPart.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ using OpProcessor = folly::Function<std::optional<std::string>(AtomicOp op)>;
* MERGE_PREV: can merge with previous, can't merge any more. (has to be tail)
* MERGE_BOTH: can merge with any other
*
* Normal / heartbeat will alwayse be MERGE_BOTH
* Normal / heartbeat will always be MERGE_BOTH
* Command will alwayse be MERGE_PREV
* ATOMIC_OP can be either MERGE_NEXT or MERGE_BOTH
* depends on if it read a key in write set.
Expand Down
7 changes: 0 additions & 7 deletions src/kvstore/raftex/test/RaftexTestBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -315,13 +315,6 @@ bool checkLog(std::shared_ptr<test::TestShard>& copy,
for (size_t i = start; i <= end; i++) {
folly::StringPiece msg;
if (!copy->getLogMsg(i, msg) || msgs[i] != msg.toString()) {
// LOG(INFO) << "checkLog return false;";
// if (!copy->getLogMsg(i, msg)) {
// LOG(INFO) << "!copy->getLogMsg(i, msg)";
// } else {
// LOG(INFO) << "i = " << i << ", msgs[i] = " << msgs[i]
// << ", msg.toString() = " << msg.toString();
// }
return false;
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/storage/mutate/AddEdgesProcessor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ kvstore::MergeableAtomicOpResult AddEdgesProcessor::addEdgesWithIndex(
auto oldIndexKeys = indexKeys(partId, oldReader.get(), key, index, nullptr);
if (!oldIndexKeys.empty()) {
ret.writeSet.insert(ret.writeSet.end(), oldIndexKeys.begin(), oldIndexKeys.end());
// ret.writeSet.push_back(oldIndexKeys);
// Check the index is building for the specified partition or
// not.
auto indexState = env_->getIndexState(spaceId_, partId);
Expand All @@ -278,7 +277,6 @@ kvstore::MergeableAtomicOpResult AddEdgesProcessor::addEdgesWithIndex(
batchHolder->put(std::string(delOpKey), std::move(idxKey));
}
} else if (env_->checkIndexLocked(indexState)) {
// return folly::Optional<std::string>();
return ret;
} else {
for (auto& idxKey : oldIndexKeys) {
Expand Down

0 comments on commit 9b69cf4

Please sign in to comment.