Merge pull request #491 from weibocom/revert-464-main_kvector_hybrid_…

…202405 Revert "Main kvector hybrid 202405"
weibocom · Sep 6, 2024 · c4a1725 · c4a1725
2 parents a013b40 + 349d351
commit c4a1725
Show file tree

Hide file tree

Showing 34 changed files with 239 additions and 1,399 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ds/src/mem/ring_slice.rs b/ds/src/mem/ring_slice.rs
@@ -85,9 +85,6 @@ impl RingSlice {
     #[inline]
     pub fn try_str_num(&self, r: impl Range) -> Option<usize> {
         let (start, end) = r.range(self);
-        if start == end {
-            return None;
-        }
         let mut num = 0usize;
         for i in start..end {
             if !self[i].is_ascii_digit() {

diff --git a/endpoint/src/topo.rs b/endpoint/src/topo.rs
@@ -36,7 +36,6 @@ procs::topology_dispatcher! {
 
     pub trait Topology : Endpoint + Hash{
         fn exp_sec(&self) -> u32 {86400}
-        fn has_attach(&self) -> bool {false}
     } => where P:Protocol, E:Endpoint<Item = R>, R:Request, Topologies<E, P>: Endpoint
 
     trait Inited {

diff --git a/endpoint/src/vector/batch.rs b/endpoint/src/vector/batch.rs
diff --git a/endpoint/src/vector/config.rs b/endpoint/src/vector/config.rs
@@ -14,8 +14,6 @@ pub struct VectorNamespace {
     pub(crate) backends_flaten: Vec<String>,
     #[serde(default)]
     pub(crate) backends: HashMap<Years, Vec<String>>,
-    #[serde(default)]
-    pub(crate) si_backends: Vec<String>,
 }
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
@@ -46,20 +44,6 @@ pub struct Basic {
     pub(crate) user: String,
     #[serde(default)]
     pub(crate) region_enabled: bool,
-    #[serde(default)]
-    pub(crate) si_db_name: String,
-    #[serde(default)]
-    pub(crate) si_table_name: String,
-    #[serde(default)]
-    pub(crate) si_db_count: u32,
-    #[serde(default)]
-    pub(crate) si_table_count: u32,
-    #[serde(default)]
-    pub(crate) si_user: String,
-    #[serde(default)]
-    pub(crate) si_password: String,
-    #[serde(default)]
-    pub(crate) si_cols: Vec<String>,
 }
 
 impl VectorNamespace {
@@ -82,7 +66,7 @@ impl VectorNamespace {
                     }
                     last_year = year.1;
                 }
-                match ns.decrypt_password(ns.basic.password.as_bytes()) {
+                match ns.decrypt_password() {
                     Ok(password) => ns.basic.password = password,
                     Err(e) => {
                         log::warn!("failed to decrypt password, e:{}", e);
@@ -93,19 +77,6 @@ impl VectorNamespace {
                     init.extend_from_slice(b.1);
                     init
                 });
-                if ns.basic.si_password.len() > 0 {
-                    match ns.decrypt_password(ns.basic.si_password.as_bytes()) {
-                        Ok(password) => ns.basic.si_password = password,
-                        Err(e) => {
-                            log::warn!("failed to decrypt si password, e:{}", e);
-                            return None;
-                        }
-                    }
-                }
-                if ns.si_backends.len() > 0 {
-                    ns.backends_flaten
-                        .extend_from_slice(ns.si_backends.as_slice());
-                }
                 Some(ns)
             }
             Err(e) => {
@@ -116,9 +87,9 @@ impl VectorNamespace {
     }
 
     #[inline]
-    fn decrypt_password(&self, data: &[u8]) -> Result<String, Box<dyn std::error::Error>> {
+    fn decrypt_password(&self) -> Result<String, Box<dyn std::error::Error>> {
         let key_pem = fs::read_to_string(&context::get().key_path)?;
-        let encrypted_data = general_purpose::STANDARD.decode(data)?;
+        let encrypted_data = general_purpose::STANDARD.decode(self.basic.password.as_bytes())?;
         let decrypted_data = ds::decrypt::decrypt_password(&key_pem, &encrypted_data)?;
         let decrypted_string = String::from_utf8(decrypted_data)?;
         Ok(decrypted_string)

diff --git a/endpoint/src/vector/mod.rs b/endpoint/src/vector/mod.rs
@@ -1,4 +1,3 @@
-mod batch;
 pub(crate) mod config;
 mod strategy;
 pub mod topo;