From fc09d77e892c082b79340c7e477d78d1108c8a06 Mon Sep 17 00:00:00 2001
From: Tamo <tamo@meilisearch.com>
Date: Thu, 1 Jul 2021 11:38:30 +0200
Subject: [PATCH 1/2] fix the benchmarks dependcies

---
 Cargo.lock            | 70 +++++++------------------------------------
 benchmarks/Cargo.toml |  2 +-
 2 files changed, 11 insertions(+), 61 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 839dfd29e..d2b7b9a5d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -131,7 +131,7 @@ dependencies = [
  "convert_case",
  "criterion",
  "flate2",
- "heed 0.11.0",
+ "heed",
  "jemallocator",
  "milli",
  "reqwest",
@@ -870,35 +870,16 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "heed"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "269c7486ed6def5d7b59a427cec3e87b4d4dd4381d01e21c8c9f2d3985688392"
-dependencies = [
- "bytemuck",
- "byteorder",
- "heed-traits 0.8.0",
- "heed-types 0.8.0",
- "libc",
- "lmdb-rkv-sys 0.11.0",
- "once_cell",
- "page_size",
- "serde",
- "synchronoise",
- "url",
-]
-
 [[package]]
 name = "heed"
 version = "0.12.0"
 source = "git+https://github.com/Kerollmops/heed?tag=v0.12.0#6c0b95793a805dc598f05c119494e6c069de0326"
 dependencies = [
  "byteorder",
- "heed-traits 0.7.0",
- "heed-types 0.7.2",
+ "heed-traits",
+ "heed-types",
  "libc",
- "lmdb-rkv-sys 0.15.0",
+ "lmdb-rkv-sys",
  "once_cell",
  "page_size",
  "serde",
@@ -912,45 +893,25 @@ name = "heed-traits"
 version = "0.7.0"
 source = "git+https://github.com/Kerollmops/heed?tag=v0.12.0#6c0b95793a805dc598f05c119494e6c069de0326"
 
-[[package]]
-name = "heed-traits"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a53a94e5b2fd60417e83ffdfe136c39afacff0d4ac1d8d01cd66928ac610e1a2"
-
 [[package]]
 name = "heed-types"
 version = "0.7.2"
 source = "git+https://github.com/Kerollmops/heed?tag=v0.12.0#6c0b95793a805dc598f05c119494e6c069de0326"
 dependencies = [
  "bincode",
- "heed-traits 0.7.0",
+ "heed-traits",
  "serde",
  "serde_json",
  "zerocopy",
 ]
 
-[[package]]
-name = "heed-types"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a6cf0a6952fcedc992602d5cddd1e3fff091fbe87d38636e3ec23a31f32acbd"
-dependencies = [
- "bincode",
- "bytemuck",
- "byteorder",
- "heed-traits 0.8.0",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "helpers"
 version = "0.7.1"
 dependencies = [
  "anyhow",
  "byte-unit",
- "heed 0.12.0",
+ "heed",
  "jemallocator",
  "milli",
  "stderrlog",
@@ -1014,7 +975,7 @@ dependencies = [
  "funty",
  "futures",
  "grenad",
- "heed 0.12.0",
+ "heed",
  "jemallocator",
  "log",
  "maplit",
@@ -1154,7 +1115,7 @@ dependencies = [
  "anyhow",
  "byte-unit",
  "csv",
- "heed 0.12.0",
+ "heed",
  "jemallocator",
  "milli",
  "roaring",
@@ -1315,17 +1276,6 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
-[[package]]
-name = "lmdb-rkv-sys"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b27470ac25167b3afdfb6af8fcd3bc1be67de50ffbdaf4073378cfded6ae24a5"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "lmdb-rkv-sys"
 version = "0.15.0"
@@ -1434,7 +1384,7 @@ dependencies = [
  "fst",
  "fxhash",
  "grenad",
- "heed 0.12.0",
+ "heed",
  "human_format",
  "itertools 0.10.1",
  "levenshtein_automata",
@@ -2278,7 +2228,7 @@ version = "0.7.1"
 dependencies = [
  "anyhow",
  "byte-unit",
- "heed 0.12.0",
+ "heed",
  "jemallocator",
  "log",
  "milli",
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
index 6d5c99950..d47becca6 100644
--- a/benchmarks/Cargo.toml
+++ b/benchmarks/Cargo.toml
@@ -11,7 +11,7 @@ milli = { path = "../milli" }
 jemallocator = "0.3.2"
 
 [dev-dependencies]
-heed = "*" # we want to use the version milli uses
+heed = { git = "https://github.com/Kerollmops/heed", tag = "v0.12.0", default-features = false, features = ["lmdb", "sync-read-txn"] }
 criterion = { version = "0.3.4", features = ["html_reports"] }
 
 [build-dependencies]

From ec87bf3dd5dc58f2a0d474972dae4f633ba4af05 Mon Sep 17 00:00:00 2001
From: Irevoire <irevoire@protonmail.ch>
Date: Thu, 1 Jul 2021 11:45:05 +0200
Subject: [PATCH 2/2] Update benchmarks/Cargo.toml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Clément Renault <renault.cle@gmail.com>
---
 benchmarks/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
index d47becca6..4e0b0d00c 100644
--- a/benchmarks/Cargo.toml
+++ b/benchmarks/Cargo.toml
@@ -11,7 +11,7 @@ milli = { path = "../milli" }
 jemallocator = "0.3.2"
 
 [dev-dependencies]
-heed = { git = "https://github.com/Kerollmops/heed", tag = "v0.12.0", default-features = false, features = ["lmdb", "sync-read-txn"] }
+heed = { git = "https://github.com/Kerollmops/heed", tag = "v0.12.0" }
 criterion = { version = "0.3.4", features = ["html_reports"] }
 
 [build-dependencies]