From 880392cb241e4aeb1fd50a571c969b61cec30995 Mon Sep 17 00:00:00 2001 From: Yusuke Kato Date: Thu, 25 Jul 2024 11:00:18 +0900 Subject: [PATCH] fix conflict bug (#2537) Signed-off-by: kpango --- Makefile | 11 -------- rust/Cargo.lock | 68 ++++++++++++++++++++++++++++++++++--------------- 2 files changed, 48 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index e7aa23d095..2ad989b1a1 100644 --- a/Makefile +++ b/Makefile @@ -76,17 +76,6 @@ RUSTUP_HOME ?= $(RUST_HOME)/rustup CARGO_HOME ?= $(RUST_HOME)/cargo RUST_VERSION := $(eval RUST_VERSION := $(shell cat versions/RUST_VERSION))$(RUST_VERSION) -<<<<<<< HEAD -NPM_GLOBAL_PREFIX := $(eval NPM_GLOBAL_PREFIX := $(shell npm prefix --location=global))$(NPM_GLOBAL_PREFIX) - -NPM_GLOBAL_PREFIX := $(eval NPM_GLOBAL_PREFIX := $(shell npm prefix --location=global))$(NPM_GLOBAL_PREFIX) - -TEST_NOT_IMPL_PLACEHOLDER = NOT IMPLEMENTED BELOW - -TEMP_DIR := $(eval TEMP_DIR := $(shell mktemp -d))$(TEMP_DIR) - -======= ->>>>>>> 76eb8d7b5 (refactor index manager service add index service API to expose index informations (#2525)) BUF_VERSION := $(eval BUF_VERSION := $(shell cat versions/BUF_VERSION))$(BUF_VERSION) NGT_VERSION := $(eval NGT_VERSION := $(shell cat versions/NGT_VERSION))$(NGT_VERSION) FAISS_VERSION := $(eval FAISS_VERSION := $(shell cat versions/FAISS_VERSION))$(FAISS_VERSION) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index fc08c7d7d5..787aebcaa7 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -22,6 +22,11 @@ name = "agent" version = "0.1.0" dependencies = [ "ngt", + "prost", + "proto", + "tokio", + "tokio-stream", + "tonic", ] [[package]] @@ -343,6 +348,12 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + [[package]] name = "http" version = "0.2.12" @@ -475,6 +486,16 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "matchit" version = "0.7.3" @@ -585,8 +606,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" [[package]] -<<<<<<< HEAD -======= name = "parking_lot" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -610,7 +629,6 @@ dependencies = [ ] [[package]] ->>>>>>> 76eb8d7b5 (refactor index manager service add index service API to expose index informations (#2525)) name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -745,8 +763,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= name = "redox_syscall" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -756,7 +772,6 @@ dependencies = [ ] [[package]] ->>>>>>> 76eb8d7b5 (refactor index manager service add index service API to expose index informations (#2525)) name = "rustc-demangle" version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -781,6 +796,12 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "scratch" version = "1.0.7" @@ -807,6 +828,15 @@ dependencies = [ "syn", ] +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + [[package]] name = "slab" version = "0.4.9" @@ -816,6 +846,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + [[package]] name = "smawk" version = "0.3.2" @@ -930,18 +966,12 @@ dependencies = [ "bytes", "libc", "mio", -<<<<<<< HEAD -======= "parking_lot", ->>>>>>> 76eb8d7b5 (refactor index manager service add index service API to expose index informations (#2525)) "pin-project-lite", + "signal-hook-registry", "socket2", -<<<<<<< HEAD - "windows-sys 0.48.0", -======= "tokio-macros", "windows-sys 0.52.0", ->>>>>>> 76eb8d7b5 (refactor index manager service add index service API to expose index informations (#2525)) ] [[package]] @@ -955,8 +985,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= name = "tokio-macros" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -968,7 +996,6 @@ dependencies = [ ] [[package]] ->>>>>>> 76eb8d7b5 (refactor index manager service add index service API to expose index informations (#2525)) name = "tokio-stream" version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -977,6 +1004,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", + "tokio-util", ] [[package]] @@ -994,9 +1022,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ "async-stream", "async-trait", @@ -1021,9 +1049,9 @@ dependencies = [ [[package]] name = "tonic-types" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b39bd850e4bf99146b3fd244019562cafd30338db068c5795c55b448eb02411" +checksum = "f4aa089471d8d4c60ec3aef047739713a4695f0b309d4cea0073bc55201064f4" dependencies = [ "prost", "prost-types",