chore(query): remove old aggregate codes (#17025)

* chore(query): remove old agg * chore(query): remove old agg * chore(query): remove old agg * chore(query): remove old agg * chore(query): merge group_by into aggregate * chore(query): remove old codes
databendlabs · Dec 11, 2024 · 88c78cc · 88c78cc
1 parent 8646b77
commit 88c78cc
Show file tree

Hide file tree

Showing 43 changed files with 319 additions and 5,595 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/query/expression/src/kernels/group_by.rs b/src/query/expression/src/kernels/group_by.rs
@@ -23,16 +23,11 @@ use super::group_by_hash::HashMethodSerializer;
 use super::group_by_hash::HashMethodSingleBinary;
 use crate::types::DataType;
 use crate::DataBlock;
-use crate::HashMethodDictionarySerializer;
 use crate::HashMethodKeysU128;
 use crate::HashMethodKeysU256;
 
 impl DataBlock {
-    pub fn choose_hash_method(
-        chunk: &DataBlock,
-        indices: &[usize],
-        efficiently_memory: bool,
-    ) -> Result<HashMethodKind> {
+    pub fn choose_hash_method(chunk: &DataBlock, indices: &[usize]) -> Result<HashMethodKind> {
         let hash_key_types = indices
             .iter()
             .map(|&offset| {
@@ -42,13 +37,10 @@ impl DataBlock {
             .collect::<Result<Vec<_>>>();
 
         let hash_key_types = hash_key_types?;
-        Self::choose_hash_method_with_types(&hash_key_types, efficiently_memory)
+        Self::choose_hash_method_with_types(&hash_key_types)
     }
 
-    pub fn choose_hash_method_with_types(
-        hash_key_types: &[DataType],
-        efficiently_memory: bool,
-    ) -> Result<HashMethodKind> {
+    pub fn choose_hash_method_with_types(hash_key_types: &[DataType]) -> Result<HashMethodKind> {
         if hash_key_types.len() == 1
             && matches!(
                 hash_key_types[0],
@@ -74,14 +66,8 @@ impl DataBlock {
                 if hash_key_type.is_nullable() {
                     group_key_len += 1;
                 }
-            } else if !efficiently_memory || hash_key_types.len() == 1 {
-                return Ok(HashMethodKind::Serializer(HashMethodSerializer::default()));
             } else {
-                return Ok(HashMethodKind::DictionarySerializer(
-                    HashMethodDictionarySerializer {
-                        dict_keys: hash_key_types.len(),
-                    },
-                ));
+                return Ok(HashMethodKind::Serializer(HashMethodSerializer::default()));
             }
         }
 

diff --git a/src/query/expression/src/kernels/group_by_hash/method.rs b/src/query/expression/src/kernels/group_by_hash/method.rs
@@ -31,7 +31,6 @@ use crate::types::DecimalDataType;
 use crate::types::NumberDataType;
 use crate::types::StringColumn;
 use crate::Column;
-use crate::HashMethodDictionarySerializer;
 use crate::HashMethodKeysU128;
 use crate::HashMethodKeysU16;
 use crate::HashMethodKeysU256;
@@ -91,7 +90,6 @@ pub trait HashMethod: Clone + Sync + Send + 'static {
 #[derive(Clone, Debug)]
 pub enum HashMethodKind {
     Serializer(HashMethodSerializer),
-    DictionarySerializer(HashMethodDictionarySerializer),
     SingleBinary(HashMethodSingleBinary),
     KeysU8(HashMethodKeysU8),
     KeysU16(HashMethodKeysU16),
@@ -106,7 +104,7 @@ macro_rules! with_hash_method {
     ( | $t:tt | $($tail:tt)* ) => {
         match_template::match_template! {
             $t = [Serializer, SingleBinary, KeysU8, KeysU16,
-            KeysU32, KeysU64, KeysU128, KeysU256, DictionarySerializer],
+            KeysU32, KeysU64, KeysU128, KeysU256],
             $($tail)*
         }
     }
@@ -123,26 +121,6 @@ macro_rules! with_join_hash_method {
     }
 }
 
-#[macro_export]
-macro_rules! with_mappedhash_method {
-    ( | $t:tt | $($tail:tt)* ) => {
-        match_template::match_template! {
-            $t = [
-                Serializer => HashMethodSerializer,
-                SingleBinary => HashMethodSingleBinary,
-                KeysU8 => HashMethodKeysU8,
-                KeysU16 => HashMethodKeysU16,
-                KeysU32 => HashMethodKeysU32,
-                KeysU64 => HashMethodKeysU64,
-                KeysU128 => HashMethodKeysU128,
-                KeysU256 => HashMethodKeysU256,
-                DictionarySerializer => HashMethodDictionarySerializer
-            ],
-            $($tail)*
-        }
-    }
-}
-
 impl HashMethodKind {
     pub fn name(&self) -> String {
         with_hash_method!(|T| match self {
@@ -164,7 +142,6 @@ impl HashMethodKind {
             HashMethodKind::KeysU256(_) => {
                 DataType::Decimal(DecimalDataType::Decimal256(i256::default_decimal_size()))
             }
-            HashMethodKind::DictionarySerializer(_) => DataType::Binary,
         }
     }
 }
diff --git a/src/query/expression/src/kernels/group_by_hash/method_dict_serializer.rs b/src/query/expression/src/kernels/group_by_hash/method_dict_serializer.rs
diff --git a/src/query/expression/src/kernels/group_by_hash/mod.rs b/src/query/expression/src/kernels/group_by_hash/mod.rs
@@ -13,14 +13,12 @@
 // limitations under the License.
 
 mod method;
-mod method_dict_serializer;
 mod method_fixed_keys;
 mod method_serializer;
 mod method_single_string;
 mod utils;
 
 pub use method::*;
-pub use method_dict_serializer::*;
 pub use method_fixed_keys::*;
 pub use method_serializer::*;
 pub use method_single_string::*;
diff --git a/src/query/expression/tests/it/group_by.rs b/src/query/expression/tests/it/group_by.rs
@@ -36,10 +36,10 @@ fn test_group_by_hash() -> Result<()> {
         StringType::from_data(vec!["x1", "x1", "x2", "x1", "x2", "x3"]),
     ]);
 
-    let method = DataBlock::choose_hash_method(&block, &[0, 3], false)?;
+    let method = DataBlock::choose_hash_method(&block, &[0, 3])?;
     assert_eq!(method.name(), HashMethodSerializer::default().name(),);
 
-    let method = DataBlock::choose_hash_method(&block, &[0, 1, 2], false)?;
+    let method = DataBlock::choose_hash_method(&block, &[0, 1, 2])?;
 
     assert_eq!(method.name(), HashMethodKeysU32::default().name());
 

diff --git a/src/query/service/Cargo.toml b/src/query/service/Cargo.toml
@@ -164,7 +164,6 @@ serde_urlencoded = { workspace = true }
 sha2 = { workspace = true }
 socket2 = { workspace = true }
 sqlx = { workspace = true }
-strength_reduce = { workspace = true }
 sysinfo = { workspace = true }
 tempfile = { workspace = true }
 tokio = { workspace = true }