chore: upgrade criterion to 0.7

Author: zhangsoledad

.github/workflows/rust.yml

@@ -15,7 +15,6 @@ jobs:
         with:
           toolchain: 1.89.0
           components: rustfmt
-          override: true
       - name: Check formatting
         run: |
           cargo fmt --all -- --check
@@ -32,8 +31,7 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: 1.89.0
-          components: clippy
-          override: true
+          components: clippy rustfmt
       - run: sudo apt update && sudo apt install -y libclang-dev
       - name: Run clippy
         run: |
@@ -90,23 +88,19 @@ jobs:
         with:
           toolchain: 1.89.0
           target: ${{ matrix.target }}
-          profile: minimal
-          override: true
+          components: rustfmt
       - name: Remove msys64 # Workaround to resolve link error with C:\msys64\mingw64\bin\libclang.dll
         if: runner.os == 'Windows'
         run: Remove-Item -LiteralPath "C:\msys64\" -Force -Recurse
       - name: Install dependencies
         if: runner.os == 'Windows'
-        run: choco install llvm -y
-      - name: Install libclang-dev
-        if: runner.os == 'Linux'
-        run: sudo apt install libclang-dev
-      - name: Install jemalloc
-        if: runner.os == 'Linux'
-        run: sudo apt install libjemalloc-dev
-      - name: Install liburing
+        run: vcpkg install llvm
+      - name: Install dependencies (macOS)
+        if: runner.os == 'macOS'
+        run: brew install llvm lld
+      - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
-        run: sudo apt install liburing-dev
+        run: sudo apt-get update && sudo apt-get install -y libclang-dev libjemalloc-dev liburing-dev
       - name: Debug librocksdb-sys tests
         if: runner.os == 'Linux' || runner.os == 'Windows'
         run: clang --version && env

.gitmodules

@@ -7,3 +7,9 @@
 [submodule "librocksdb-sys/lz4"]
 	path = librocksdb-sys/lz4
 	url = https://github.com/lz4/lz4.git
+[submodule "librocksdb-sys/zstd"]
+	path = librocksdb-sys/zstd
+	url = https://github.com/facebook/zstd.git
+[submodule "librocksdb-sys/zlib"]
+	path = librocksdb-sys/zlib
+	url = https://github.com/madler/zlib.git

Cargo.toml

@@ -41,7 +41,7 @@ serde = { version = "1", features = ["derive"], optional = true }
 
 [dev-dependencies]
 trybuild = "1.0"
-criterion = "0.5"
+criterion = "0.7"
 
 [[bench]]
 name = "transaction"

librocksdb-sys/Cargo.toml

@@ -50,7 +50,7 @@ uuid = { version = "1.0", features = ["v4"] }
 
 [build-dependencies]
 cc = { version = "1.0", features = ["parallel"] }
-bindgen = { version = "0.72.1", default-features = false }
+bindgen = { version = "0.72.1" }
 glob = "0.3.2"
 pkg-config = "0.3"
 rust-ini = "0.21"

librocksdb-sys/build.rs

@@ -128,23 +128,18 @@ fn build_rocksdb() {
 
     if cfg!(feature = "zstd") {
         config.define("ZSTD", Some("1"));
-        if let Some(path) = env::var_os("DEP_ZSTD_INCLUDE") {
-            config.include(path);
-        }
+        config.include("zstd/lib/");
+        config.include("zstd/lib/dictBuilder/");
     }
 
     if cfg!(feature = "zlib") {
         config.define("ZLIB", Some("1"));
-        if let Some(path) = env::var_os("DEP_Z_INCLUDE") {
-            config.include(path);
-        }
+        config.include("zlib/");
     }
 
     if cfg!(feature = "bzip2") {
         config.define("BZIP2", Some("1"));
-        if let Some(path) = env::var_os("DEP_BZIP2_INCLUDE") {
-            config.include(path);
-        }
+        config.include("bzip2/");
     }
 
     if cfg!(feature = "rtti") {
@@ -385,6 +380,91 @@ fn build_lz4() {
     compiler.compile("liblz4.a");
 }
 
+fn build_zstd() {
+    let mut compiler = cc::Build::new();
+
+    compiler.include("zstd/lib/");
+    compiler.include("zstd/lib/common");
+    compiler.include("zstd/lib/legacy");
+
+    let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap_or_default();
+
+     let globs = &[
+        "zstd/lib/common/*.c",
+        "zstd/lib/compress/*.c",
+        "zstd/lib/decompress/*.c",
+        "zstd/lib/dictBuilder/*.c",
+        "zstd/lib/legacy/*.c",
+    ];
+
+    for pattern in globs {
+        for path in glob::glob(pattern).unwrap() {
+            let path = path.unwrap();
+            compiler.file(path);
+        }
+    }
+
+    if target_arch.contains("x86_64") {
+        if env::var("CARGO_CFG_WINDOWS").is_ok() {
+            compiler.define("ZSTD_DISABLE_ASM", Some(""));
+        } else {
+            compiler.file("zstd/lib/decompress/huf_decompress_amd64.S");
+        }
+    } else {
+        compiler.define("ZSTD_DISABLE_ASM", Some(""));
+    }
+
+    compiler.opt_level(3);
+    compiler.extra_warnings(false);
+    compiler
+        .flag_if_supported("-ffunction-sections")
+        .flag_if_supported("-fdata-sections")
+        .flag_if_supported("-fmerge-all-constants");
+
+    compiler.define("ZSTD_LIB_DEPRECATED", Some("0"));
+    compiler.compile("libzstd.a");
+}
+
+fn build_zlib() {
+    let mut compiler = cc::Build::new();
+
+    let globs = &["zlib/*.c"];
+
+    for pattern in globs {
+        for path in glob::glob(pattern).unwrap() {
+            let path = path.unwrap();
+            compiler.file(path);
+        }
+    }
+
+    compiler.flag_if_supported("-Wno-implicit-function-declaration");
+    compiler.opt_level(3);
+    compiler.extra_warnings(false);
+    compiler.compile("libz.a");
+}
+
+fn build_bzip2() {
+    let mut compiler = cc::Build::new();
+
+    compiler
+        .file("bzip2/blocksort.c")
+        .file("bzip2/bzlib.c")
+        .file("bzip2/compress.c")
+        .file("bzip2/crctable.c")
+        .file("bzip2/decompress.c")
+        .file("bzip2/huffman.c")
+        .file("bzip2/randtable.c");
+
+    compiler
+        .define("_FILE_OFFSET_BITS", Some("64"))
+        .define("BZ_NO_STDIO", None);
+
+    compiler.extra_warnings(false);
+    compiler.opt_level(3);
+    compiler.extra_warnings(false);
+    compiler.compile("libbz2.a");
+}
+
 fn try_to_find_and_link_lib(lib_name: &str) -> bool {
     if let Ok(v) = env::var(&format!("{}_COMPILE", lib_name)) {
         if v.to_lowercase() == "true" || v == "1" {
@@ -433,6 +513,21 @@ fn main() {
         fail_on_empty_directory("lz4");
         build_lz4();
     }
+    if cfg!(feature = "zstd") && !try_to_find_and_link_lib("ZSTD") {
+        println!("cargo:rerun-if-changed=zstd/");
+        fail_on_empty_directory("zstd");
+        build_zstd();
+    }
+    if cfg!(feature = "zlib") && !try_to_find_and_link_lib("Z") {
+        println!("cargo:rerun-if-changed=zlib/");
+        fail_on_empty_directory("zlib");
+        build_zlib();
+    }
+    if cfg!(feature = "bzip2") && !try_to_find_and_link_lib("BZ2") {
+        println!("cargo:rerun-if-changed=bzip2/");
+        fail_on_empty_directory("bzip2");
+        build_bzip2();
+    }
 
     println!("cargo:out_dir={}", env::var("OUT_DIR").unwrap());
 }

librocksdb-sys/bzip2/LICENSE

@@ -0,0 +1,42 @@
+
+--------------------------------------------------------------------------
+
+This program, "bzip2", the associated library "libbzip2", and all
+documentation, are copyright (C) 1996-2019 Julian R Seward.  All
+rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. The origin of this software must not be misrepresented; you must 
+   not claim that you wrote the original software.  If you use this 
+   software in a product, an acknowledgment in the product 
+   documentation would be appreciated but is not required.
+
+3. Altered source versions must be plainly marked as such, and must
+   not be misrepresented as being the original software.
+
+4. The name of the author may not be used to endorse or promote 
+   products derived from this software without specific prior written 
+   permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Julian Seward, jseward@acm.org
+bzip2/libbzip2 version 1.0.8 of 13 July 2019
+
+--------------------------------------------------------------------------