Revert "rocksdb: Bump version to 4.9 and fix broken interface usage"

This reverts commit a5ce7dd. Moving to 4.9 introduced some bugs: cockroachdb#9029 and possibly cockroachdb#9037. Reverting pending investigation.
bdarnell · Sep 6, 2016 · fe70c5f · fe70c5f
1 parent 07bdd26
commit fe70c5f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 247 deletions.
diff --git a/GLOCKFILE b/GLOCKFILE
@@ -36,7 +36,7 @@ github.com/chzyer/test bea8f082b6fd8382588bf6fdc6af9217078af151
 github.com/client9/misspell dcb75ecbeec8f85e28b639c3a2f5b4c8a7b8a888
 github.com/cockroachdb/c-jemalloc 42e6a32cd7a4dff9c70d80323681d46d046181ef
 github.com/cockroachdb/c-protobuf 951f3e665896e7ba939fd1f2db9aeaae6ca988f8
-github.com/cockroachdb/c-rocksdb ba8e37dfc825bedc3c0512f2c53dfd7cbbf8076d
+github.com/cockroachdb/c-rocksdb ab57b321a358f4c93fb639331ac3e10911649492
 github.com/cockroachdb/c-snappy d4e7b428fe7fc09e93573df3448567a62df8c9fa
 github.com/cockroachdb/cmux b64f5908f4945f4b11ed4a0a9d3cc1e23350866d
 github.com/cockroachdb/cockroach-go 2e4a60d41697eebb308b1def89f0abaf1c056137

diff --git a/storage/engine/rocksdb/db.cc b/storage/engine/rocksdb/db.cc
@@ -39,7 +39,6 @@
 #include "db.h"
 #include "encoding.h"
 #include "eventlistener.h"
-#include "options_builder.h"
 
 #include <iostream>
 
@@ -1986,11 +1985,13 @@ DBStatus DBEngineAddFile(DBEngine* db, DBSlice path) {
 
 struct DBSstFileWriter {
   std::unique_ptr<rocksdb::Options> options;
+  rocksdb::ImmutableCFOptions ioptions;
   rocksdb::SstFileWriter rep;
 
   DBSstFileWriter(rocksdb::Options* o)
       : options(o),
-        rep(rocksdb::EnvOptions(), *o, o->comparator) {
+        ioptions(*o),
+        rep(rocksdb::EnvOptions(), ioptions, o->comparator) {
   }
   virtual ~DBSstFileWriter() { }
 };

diff --git a/storage/engine/rocksdb/options_builder.cc b/storage/engine/rocksdb/options_builder.cc
diff --git a/storage/engine/rocksdb/options_builder.h b/storage/engine/rocksdb/options_builder.h