Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Unified Diff: components/leveldb/public/cpp/remote_iterator.cc

Issue 2285623002: [Leveldb] Use std::{string,vector} instead of mojo::{String,Array}. (Closed)
Patch Set: Address comments from Yuzhu Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/leveldb/public/cpp/remote_iterator.h ('k') | components/leveldb/public/cpp/util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/leveldb/public/cpp/remote_iterator.cc
diff --git a/components/leveldb/public/cpp/remote_iterator.cc b/components/leveldb/public/cpp/remote_iterator.cc
index b1042f70a53424e1012a14ac6489dd543d4e8f35..c7e0c4ac962f067f681445f7727625de097e8282 100644
--- a/components/leveldb/public/cpp/remote_iterator.cc
+++ b/components/leveldb/public/cpp/remote_iterator.cc
@@ -34,7 +34,7 @@ void RemoteIterator::SeekToLast() {
}
void RemoteIterator::Seek(const Slice& target) {
- database_->IteratorSeek(iterator_id_, GetArrayFor(target), &valid_, &status_,
+ database_->IteratorSeek(iterator_id_, GetVectorFor(target), &valid_, &status_,
&key_, &value_);
}
@@ -47,15 +47,19 @@ void RemoteIterator::Prev() {
}
Slice RemoteIterator::key() const {
- return GetSliceFor(key_);
+ if (!key_)
+ return leveldb::Slice();
+ return GetSliceFor(*key_);
}
Slice RemoteIterator::value() const {
- return GetSliceFor(value_);
+ if (!value_)
+ return leveldb::Slice();
+ return GetSliceFor(*value_);
}
Status RemoteIterator::status() const {
- return DatabaseErrorToStatus(status_, GetSliceFor(key_), GetSliceFor(value_));
+ return DatabaseErrorToStatus(status_, key(), value());
}
} // namespace leveldb
« no previous file with comments | « components/leveldb/public/cpp/remote_iterator.h ('k') | components/leveldb/public/cpp/util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698