Merge remote-tracking branch 'sundyli/tpcds-1g' into iceberg-hdfs

Author: Xuanwo

src/common/storage/src/statistics.rs

@@ -184,19 +184,19 @@ impl Datum {
     }
 
     pub fn can_compare(&self, other: &Self) -> bool {
-        match (self, other) {
+        matches!(
+            (self, other),
             (Datum::Bool(_), Datum::Bool(_))
-            | (Datum::Int(_), Datum::Int(_))
-            | (Datum::Int(_), Datum::UInt(_))
-            | (Datum::Int(_), Datum::Float(_))
-            | (Datum::UInt(_), Datum::UInt(_))
-            | (Datum::UInt(_), Datum::Int(_))
-            | (Datum::UInt(_), Datum::Float(_))
-            | (Datum::Float(_), Datum::Float(_))
-            | (Datum::Float(_), Datum::Int(_))
-            | (Datum::Float(_), Datum::UInt(_))
-            | (Datum::Bytes(_), Datum::Bytes(_)) => true,
-            _ => false,
-        }
+                | (Datum::Int(_), Datum::Int(_))
+                | (Datum::Int(_), Datum::UInt(_))
+                | (Datum::Int(_), Datum::Float(_))
+                | (Datum::UInt(_), Datum::UInt(_))
+                | (Datum::UInt(_), Datum::Int(_))
+                | (Datum::UInt(_), Datum::Float(_))
+                | (Datum::Float(_), Datum::Float(_))
+                | (Datum::Float(_), Datum::Int(_))
+                | (Datum::Float(_), Datum::UInt(_))
+                | (Datum::Bytes(_), Datum::Bytes(_))
+        )
     }
 }

src/query/sql/src/planner/optimizer/property/selectivity.rs

@@ -442,7 +442,7 @@ impl<'a> SelectivityEstimator<'a> {
             let lower_bound = bucket.lower_bound();
             let upper_bound = bucket.upper_bound();
 
-            if !const_datum.can_compare(&lower_bound) {
+            if !const_datum.can_compare(lower_bound) {
                 return Ok(DEFAULT_SELECTIVITY);
             }
 

src/query/sql/src/planner/semantic/type_check.rs

@@ -3183,7 +3183,8 @@ impl<'a> TypeChecker<'a> {
                                     .contains(func.name.to_string());
                         }
                         fn enter_expr(&mut self, expr: &Expr) {
-                            self.contain_agg = matches!(expr, Expr::CountAll { window: None, .. });
+                            self.contain_agg = self.contain_agg
+                                || matches!(expr, Expr::CountAll { window: None, .. });
                         }
                     }
                     let mut visitor = AggFuncVisitor { contain_agg: false };