Merge cockroachdb#25235

25235: c-deps: upgrade protobuf and RocksDB r=bdarnell,nvanbenschoten a=benesch It's early in the release cycle. We'll need to upgrade RocksDB again later in the release cycle to pick up some of @nvanbenschoten's work, but better to do the big bump now and a small bump later. Co-authored-by: Nikhil Benesch <[email protected]>
mberhault · May 2, 2018 · 4efee0e · 4efee0e
2 parents 99b6df9 + c9ceee5
commit 4efee0e
Show file tree

Hide file tree

Showing 27 changed files with 3,638 additions and 8,547 deletions.
diff --git a/c-deps/libroach/batch.cc b/c-deps/libroach/batch.cc
@@ -171,6 +171,10 @@ class BaseDeltaIterator : public rocksdb::Iterator {
     Advance();
   }
 
+  void SeekForPrev(const rocksdb::Slice& k) override {
+    status_ = rocksdb::Status::NotSupported("SeekForPrev() not supported");
+  }
+
   void Prev() override { status_ = rocksdb::Status::NotSupported("Prev() not supported"); }
 
   rocksdb::Slice key() const override {

diff --git a/c-deps/libroach/protos/roachpb/data.pb.cc b/c-deps/libroach/protos/roachpb/data.pb.cc
diff --git a/c-deps/libroach/protos/roachpb/data.pb.h b/c-deps/libroach/protos/roachpb/data.pb.h
diff --git a/c-deps/libroach/protos/roachpb/internal.pb.cc b/c-deps/libroach/protos/roachpb/internal.pb.cc
diff --git a/c-deps/libroach/protos/roachpb/internal.pb.h b/c-deps/libroach/protos/roachpb/internal.pb.h