From eaca4d60982e11410a67c93c136a7e156f2e6047 Mon Sep 17 00:00:00 2001
From: Dmitry Patsura <talk@dmtry.me>
Date: Wed, 10 Jan 2024 16:24:59 +0100
Subject: [PATCH] chore(cubestore): Remove unexpected import of serde re-import

---
 rust/cubestore/Cargo.lock                    | 32 +-------------------
 rust/cubestore/cubestore/Cargo.toml          |  1 -
 rust/cubestore/cubestore/src/util/respawn.rs |  4 +--
 3 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/rust/cubestore/Cargo.lock b/rust/cubestore/Cargo.lock
index 8fbeee31453fc..5a86bcb285de3 100644
--- a/rust/cubestore/Cargo.lock
+++ b/rust/cubestore/Cargo.lock
@@ -1259,7 +1259,6 @@ dependencies = [
  "mockall",
  "moka 0.10.1",
  "msql-srv",
- "mysql_common 0.26.0",
  "nanoid",
  "num 0.3.1",
  "parquet",
@@ -2791,7 +2790,7 @@ dependencies = [
  "async-trait",
  "byteorder",
  "chrono",
- "mysql_common 0.22.2",
+ "mysql_common",
  "nom 5.1.2",
  "rand 0.8.4",
  "time 0.2.7",
@@ -2872,35 +2871,6 @@ dependencies = [
  "uuid 0.8.2",
 ]
 
-[[package]]
-name = "mysql_common"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3694c35738725021e85c7b644b94bdab050d4ea6acca2b5624287f41e2abc5a"
-dependencies = [
- "base64 0.13.0",
- "bigdecimal 0.2.0",
- "bitflags",
- "byteorder",
- "bytes 1.0.1",
- "chrono",
- "flate2",
- "lazy_static",
- "lexical",
- "num-bigint 0.3.2",
- "num-traits 0.2.14",
- "rand 0.8.4",
- "regex",
- "rust_decimal",
- "serde",
- "serde_json",
- "sha1 0.6.0",
- "sha2 0.9.5",
- "time 0.2.7",
- "twox-hash",
- "uuid 0.8.2",
-]
-
 [[package]]
 name = "nanoid"
 version = "0.3.0"
diff --git a/rust/cubestore/cubestore/Cargo.toml b/rust/cubestore/cubestore/Cargo.toml
index 799ddf9b59e81..ecf75e81c1058 100644
--- a/rust/cubestore/cubestore/Cargo.toml
+++ b/rust/cubestore/cubestore/Cargo.toml
@@ -74,7 +74,6 @@ tempfile = "3.2.0"
 tarpc = { version = "0.24", features = ["tokio1"] }
 pin-project-lite = "0.2.4"
 paste = "1.0.4"
-mysql_common = "0.26.0"
 flatbuffers = "23.1.21"
 http-auth-basic = "0.1.2"
 tracing = "0.1.25"
diff --git a/rust/cubestore/cubestore/src/util/respawn.rs b/rust/cubestore/cubestore/src/util/respawn.rs
index b55d90a0587d5..4f11d17432702 100644
--- a/rust/cubestore/cubestore/src/util/respawn.rs
+++ b/rust/cubestore/cubestore/src/util/respawn.rs
@@ -2,8 +2,8 @@ use std::collections::{HashMap, HashSet};
 use std::process::{exit, Child};
 
 use ipc_channel::ipc::{IpcOneShotServer, IpcSender};
-use mysql_common::serde::de::DeserializeOwned;
-use mysql_common::serde::Serialize;
+use serde::de::DeserializeOwned;
+use serde::Serialize;
 
 use crate::sys::process::{avoid_child_zombies, die_with_parent};
 use crate::CubeError;