Bump rocksdb to 7.1.2 (tikv#626)

Author: dignifiedquire

Cargo.toml

@@ -34,7 +34,7 @@ serde1 = ["serde"]
 
 [dependencies]
 libc = "0.2"
-librocksdb-sys = { path = "librocksdb-sys", version = "0.6.1" }
+librocksdb-sys = { path = "librocksdb-sys", version = "0.7.0" }
 serde = { version = "1", features = [ "derive" ], optional = true }
 
 [dev-dependencies]

librocksdb-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "librocksdb-sys"
-version = "0.6.1+6.28.2"
+version = "0.7.0+7.1.2"
 edition = "2018"
 authors = ["Karl Hobley <[email protected]>", "Arkadiy Paronyan <[email protected]>"]
 license = "MIT/Apache-2.0/BSD-3-Clause"
@@ -31,7 +31,7 @@ bzip2-sys = { version = "0.1", default-features = false, optional = true }
 
 [dev-dependencies]
 const-cstr = "0.3"
-uuid = { version = "0.8", features = ["v4"] }
+uuid = { version = "1.0", features = ["v4"] }
 
 [build-dependencies]
 cc = { version = "1.0", features = ["parallel"] }

librocksdb-sys/build.rs

@@ -184,12 +184,19 @@ fn build_rocksdb() {
             .collect::<Vec<&'static str>>();
 
         // Add Windows-specific sources
-        lib_sources.push("port/win/port_win.cc");
-        lib_sources.push("port/win/env_win.cc");
-        lib_sources.push("port/win/env_default.cc");
-        lib_sources.push("port/win/win_logger.cc");
-        lib_sources.push("port/win/io_win.cc");
-        lib_sources.push("port/win/win_thread.cc");
+        lib_sources.extend([
+            "port/win/env_default.cc",
+            "port/win/port_win.cc",
+            "port/win/xpress_win.cc",
+            "port/win/io_win.cc",
+            "port/win/win_thread.cc",
+            "port/win/env_win.cc",
+            "port/win/win_logger.cc",
+        ]);
+
+        if cfg!(feature = "jemalloc") {
+            lib_sources.push("port/win/win_jemalloc.cc");
+        }
     }
 
     config.define("ROCKSDB_SUPPORT_THREAD_LOCAL", None);
@@ -200,11 +207,19 @@ fn build_rocksdb() {
 
     if target.contains("msvc") {
         config.flag("-EHsc");
+        config.flag("-std:c++17");
     } else {
         config.flag(&cxx_standard());
-        // this was breaking the build on travis due to
-        // > 4mb of warnings emitted.
+        // matches the flags in CMakeLists.txt from rocksdb
+        config.flag("-Wsign-compare");
+        config.flag("-Wshadow");
         config.flag("-Wno-unused-parameter");
+        config.flag("-Wno-unused-variable");
+        config.flag("-Woverloaded-virtual");
+        config.flag("-Wnon-virtual-dtor");
+        config.flag("-Wno-missing-field-initializers");
+        config.flag("-Wno-strict-aliasing");
+        config.flag("-Wno-invalid-offsetof");
     }
 
     for file in lib_sources {
@@ -215,6 +230,7 @@ fn build_rocksdb() {
     config.file("build_version.cc");
 
     config.cpp(true);
+    config.flag_if_supported("-std=c++17");
     config.compile("librocksdb.a");
 }
 
@@ -287,7 +303,7 @@ fn try_to_find_and_link_lib(lib_name: &str) -> bool {
 }
 
 fn cxx_standard() -> String {
-    env::var("ROCKSDB_CXX_STD").map_or("-std=c++11".to_owned(), |cxx_std| {
+    env::var("ROCKSDB_CXX_STD").map_or("-std=c++17".to_owned(), |cxx_std| {
         if !cxx_std.starts_with("-std=") {
             format!("-std={}", cxx_std)
         } else {

librocksdb-sys/build_version.cc

@@ -7,9 +7,9 @@
 
 // The build script may replace these values with real values based
 // on whether or not GIT is available and the platform settings
-static const std::string rocksdb_build_git_sha  = "rocksdb_build_git_sha:3122cb435875d720fc3d23a48eb7c0fa89d869aa";
-static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:6.28.2";
-static const std::string rocksdb_build_date = "rocksdb_build_date:2022-02-02 06:19:00";
+static const std::string rocksdb_build_git_sha  = "rocksdb_build_git_sha:00724f43bcea4d82b371a3e43ebec91cfe8c11be";
+static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:7.1.2" ;
+static const std::string rocksdb_build_date = "rocksdb_build_date:2022-04-21 06:19:00";
 
 namespace ROCKSDB_NAMESPACE {
 static void AddProperty(std::unordered_map<std::string, std::string> *props, const std::string& name) {