From 43121859ef45d743d9c4d401235f7812db4f54a1 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Sun, 30 Jul 2023 16:14:39 -0700 Subject: [PATCH] use patched pelikan --- Cargo.lock | 127 ++++++++++++++++++++++++++++++++++++++++++----------- Cargo.toml | 6 +-- 2 files changed, 105 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 04e2fc66..8f6d9444 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -395,6 +395,20 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "common" +version = "0.3.1" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" +dependencies = [ + "boring", + "clocksource", + "macros 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "metriken 0.2.1", + "net 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "ringlog 0.2.0", + "serde", +] + [[package]] name = "common" version = "0.3.1" @@ -402,9 +416,9 @@ source = "git+https://github.com/pelikan-io/pelikan#bb18e0c51712779721fc1d1b1a48 dependencies = [ "boring", "clocksource", - "macros", + "macros 0.3.1 (git+https://github.com/pelikan-io/pelikan)", "metriken 0.1.4", - "net", + "net 0.3.1 (git+https://github.com/pelikan-io/pelikan)", "ringlog 0.1.1", "serde", ] @@ -418,12 +432,25 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "config" +version = "0.3.1" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" +dependencies = [ + "common 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "log", + "serde", + "serde_json", + "toml 0.6.0", + "zookeeper", +] + [[package]] name = "config" version = "0.3.1" source = "git+https://github.com/pelikan-io/pelikan#bb18e0c51712779721fc1d1b1a48b6d26ab02aed" dependencies = [ - "common", + "common 0.3.1 (git+https://github.com/pelikan-io/pelikan)", "log", "serde", "serde_json", @@ -1114,13 +1141,23 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "logger" +version = "0.3.1" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" +dependencies = [ + "common 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "config 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "ringlog 0.2.0", +] + [[package]] name = "logger" version = "0.3.1" source = "git+https://github.com/pelikan-io/pelikan#bb18e0c51712779721fc1d1b1a48b6d26ab02aed" dependencies = [ - "common", - "config", + "common 0.3.1 (git+https://github.com/pelikan-io/pelikan)", + "config 0.3.1 (git+https://github.com/pelikan-io/pelikan)", "ringlog 0.1.1", ] @@ -1133,6 +1170,16 @@ dependencies = [ "libc", ] +[[package]] +name = "macros" +version = "0.3.1" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "macros" version = "0.3.1" @@ -1351,6 +1398,19 @@ dependencies = [ "try-lock", ] +[[package]] +name = "net" +version = "0.3.1" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" +dependencies = [ + "boring", + "boring-sys", + "foreign-types-shared", + "libc", + "metriken 0.2.1", + "mio 0.8.6", +] + [[package]] name = "net" version = "0.3.1" @@ -1679,41 +1739,53 @@ dependencies = [ "prost", ] +[[package]] +name = "protocol-common" +version = "0.3.1" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" +dependencies = [ + "bytes 1.4.0", + "common 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "config 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "logger 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "storage-types 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", +] + [[package]] name = "protocol-common" version = "0.3.1" source = "git+https://github.com/pelikan-io/pelikan#bb18e0c51712779721fc1d1b1a48b6d26ab02aed" dependencies = [ "bytes 1.4.0", - "common", - "config", - "logger", - "storage-types", + "common 0.3.1 (git+https://github.com/pelikan-io/pelikan)", + "config 0.3.1 (git+https://github.com/pelikan-io/pelikan)", + "logger 0.3.1 (git+https://github.com/pelikan-io/pelikan)", + "storage-types 0.3.1 (git+https://github.com/pelikan-io/pelikan)", ] [[package]] name = "protocol-memcache" version = "0.3.1" -source = "git+https://github.com/pelikan-io/pelikan#bb18e0c51712779721fc1d1b1a48b6d26ab02aed" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" dependencies = [ - "common", - "logger", - "metriken 0.1.4", + "common 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "logger 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "metriken 0.2.1", "nom", - "protocol-common", + "protocol-common 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", ] [[package]] name = "protocol-ping" version = "0.3.1" -source = "git+https://github.com/pelikan-io/pelikan#bb18e0c51712779721fc1d1b1a48b6d26ab02aed" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" dependencies = [ - "common", - "config", - "logger", - "metriken 0.1.4", - "protocol-common", - "storage-types", + "common 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "config 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "logger 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "metriken 0.2.1", + "protocol-common 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", + "storage-types 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", ] [[package]] @@ -1899,7 +1971,7 @@ dependencies = [ "metriken 0.2.1", "mio 0.8.6", "momento", - "net", + "net 0.3.1 (git+https://github.com/brayniac/pelikan?branch=metriken)", "paste", "protocol-memcache", "protocol-ping", @@ -2104,11 +2176,11 @@ version = "0.3.1" source = "git+https://github.com/pelikan-io/pelikan#bb18e0c51712779721fc1d1b1a48b6d26ab02aed" dependencies = [ "bytes 1.4.0", - "common", + "common 0.3.1 (git+https://github.com/pelikan-io/pelikan)", "log", "metriken 0.1.4", - "net", - "protocol-common", + "net 0.3.1 (git+https://github.com/pelikan-io/pelikan)", + "protocol-common 0.3.1 (git+https://github.com/pelikan-io/pelikan)", ] [[package]] @@ -2209,6 +2281,11 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "storage-types" +version = "0.3.1" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" + [[package]] name = "storage-types" version = "0.3.1" diff --git a/Cargo.toml b/Cargo.toml index 8e821b51..8c0f52df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,10 +25,10 @@ humantime = "2.1.0" momento = "0.31.0" metriken = "0.2.1" mio = "0.8.5" -net = { git = "https://github.com/pelikan-io/pelikan" } +net = { git = "https://github.com/brayniac/pelikan", branch = "metriken" } paste = "1.0.12" -protocol-memcache = { git = "https://github.com/pelikan-io/pelikan" } -protocol-ping = { git = "https://github.com/pelikan-io/pelikan" } +protocol-memcache = { git = "https://github.com/brayniac/pelikan", branch = "metriken" } +protocol-ping = { git = "https://github.com/brayniac/pelikan", branch = "metriken" } rand = "0.8.5" rand_distr = "0.4.3" rand_xoshiro = "0.6.0"