add function extract

Signed-off-by: Runji Wang <wangrunji0408@163.com>

Cargo.toml

@@ -59,7 +59,7 @@ serde = { version = "1", features = ["derive", "rc"] }
 serde_json = "1"
 smallvec = { version = "1", features = ["serde"] }
 sqllogictest = "0.9"
-sqlparser = { version = "0.27", features = ["serde"] }
+sqlparser = { version = "0.30", features = ["serde"] }
 thiserror = "1"
 tikv-jemallocator = { version = "0.5", optional = true, features=["disable_initial_exec_tls"] }
 tokio = { version = "1", features = ["full"] }

src/binder_v2/expr.rs

@@ -44,6 +44,7 @@ impl Binder {
                 leading_field,
                 ..
             } => self.bind_interval(*value, leading_field),
+            Expr::Extract { field, expr } => self.bind_extract(field, *expr),
             _ => todo!("bind expression: {:?}", expr),
         }?;
         self.check_type(id)?;
@@ -182,6 +183,12 @@ impl Binder {
         Ok(self.egraph.add(Node::Constant(value)))
     }
 
+    fn bind_extract(&mut self, field: DateTimeField, expr: Expr) -> Result {
+        let expr = self.bind_expr(expr)?;
+        let field = self.egraph.add(Node::Field(field.into()));
+        Ok(self.egraph.add(Node::Extract([field, expr])))
+    }
+
     fn bind_function(&mut self, func: Function) -> Result {
         // TODO: Support scalar function
         let mut args = vec![];

src/binder_v2/select.rs

@@ -78,7 +78,7 @@ impl Binder {
                         .insert(alias.value, ref_id);
                     select_list.push(id);
                 }
-                SelectItem::Wildcard => {
+                SelectItem::Wildcard(_) => {
                     select_list.append(&mut self.schema(from));
                 }
                 _ => todo!("bind select list"),
@@ -135,7 +135,8 @@ impl Binder {
     }
 
     /// Binds the VALUES clause. Returns a [`Values`](Node::Values) plan.
-    fn bind_values(&mut self, Values(values): Values) -> Result {
+    fn bind_values(&mut self, values: Values) -> Result {
+        let values = values.rows;
         let mut bound_values = Vec::with_capacity(values.len());
         if values.is_empty() {
             return Ok(self.egraph.add(Node::Values([].into())));

src/planner/explain.rs

@@ -162,6 +162,11 @@ impl Display for Explain<'_> {
                 self.expr(else_)
             ),
 
+            // functions
+            Extract([field, e]) => write!(f, "extract({} from {})", self.expr(field), self.expr(e)),
+            Field(field) => write!(f, "{field}"),
+
+            // aggregations
             RowCount => write!(f, "rowcount"),
             Max(a) | Min(a) | Sum(a) | Avg(a) | Count(a) | First(a) | Last(a) => {
                 write!(f, "{}({})", enode, self.expr(a))

src/planner/mod.rs

@@ -4,7 +4,7 @@ use crate::binder_v2::copy::ExtSource;
 use crate::binder_v2::{BoundDrop, CreateTable};
 use crate::catalog::{ColumnRefId, TableRefId};
 use crate::parser::{BinaryOperator, UnaryOperator};
-use crate::types::{ColumnIndex, DataTypeKind, DataValue};
+use crate::types::{ColumnIndex, DataTypeKind, DataValue, DateTimeField};
 
 mod cost;
 mod explain;
@@ -60,7 +60,11 @@ define_language! {
 
         "if" = If([Id; 3]),                     // (if cond then else)
 
-        // aggregates
+        // functions
+        "extract" = Extract([Id; 2]),           // (extract field expr)
+            Field(DateTimeField),
+
+        // aggregations
         "max" = Max(Id),
         "min" = Min(Id),
         "sum" = Sum(Id),

src/planner/rules/type_.rs

@@ -79,6 +79,11 @@ pub fn analyze_type(enode: &Expr, x: impl Fn(&Id) -> Type, catalog: &RootCatalog
         // null ops
         IsNull(_) => Ok(Kind::Bool.not_null()),
 
+        // functions
+        Extract([_, a]) => merge(enode, [x(a)?], |[a]| {
+            matches!(a, Kind::Date | Kind::Interval).then_some(Kind::Int32)
+        }),
+
         // number agg
         Max(a) | Min(a) => x(a),
         Sum(a) => check(enode, x(a)?, |a| a.is_number()),

src/types/date.rs

@@ -25,6 +25,10 @@ impl Date {
     pub fn get_inner(&self) -> i32 {
         self.0
     }
+
+    pub fn extract(&self, field: DateTimeField) -> i32 {
+        todo!()
+    }
 }
 
 pub type ParseDateError = chrono::ParseError;
@@ -130,3 +134,53 @@ impl Display for Date {
         )
     }
 }
+
+#[derive(Debug, parse_display::Display, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[display("{0}")]
+pub struct DateTimeField(sqlparser::ast::DateTimeField);
+
+impl From<sqlparser::ast::DateTimeField> for DateTimeField {
+    fn from(field: sqlparser::ast::DateTimeField) -> Self {
+        DateTimeField(field)
+    }
+}
+
+impl FromStr for DateTimeField {
+    type Err = ();
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        use sqlparser::ast::DateTimeField::*;
+        Ok(Self(match s {
+            "YEAR" => Year,
+            "MONTH" => Month,
+            "WEEK" => Week,
+            "DAY" => Day,
+            "DATE" => Date,
+            "HOUR" => Hour,
+            "MINUTE" => Minute,
+            "SECOND" => Second,
+            "CENTURY" => Century,
+            "DECADE" => Decade,
+            "DOW" => Dow,
+            "DOY" => Doy,
+            "EPOCH" => Epoch,
+            "ISODOW" => Isodow,
+            "ISOYEAR" => Isoyear,
+            "JULIAN" => Julian,
+            "MICROSECOND" => Microsecond,
+            "MICROSECONDS" => Microseconds,
+            "MILLENIUM" => Millenium,
+            "MILLENNIUM" => Millennium,
+            "MILLISECOND" => Millisecond,
+            "MILLISECONDS" => Milliseconds,
+            "NANOSECOND" => Nanosecond,
+            "NANOSECONDS" => Nanoseconds,
+            "QUARTER" => Quarter,
+            "TIMEZONE" => Timezone,
+            "TIMEZONE_HOUR" => TimezoneHour,
+            "TIMEZONE_MINUTE" => TimezoneMinute,
+            "NODATETIME" => NoDateTime,
+            _ => return Err(()),
+        }))
+    }
+}

src/v1/binder/statement/insert.rs

@@ -56,7 +56,7 @@ impl Binder {
                         column_ids,
                         column_types,
                         column_descs,
-                        &values.0,
+                        &values.rows,
                     ),
                     _ => todo!("handle insert ???"),
                 }

src/v1/binder/statement/select.rs

@@ -91,7 +91,7 @@ impl Binder {
                     let expr = self.bind_alias(expr, alias.clone());
                     select_list.push(expr);
                 }
-                SelectItem::Wildcard => {
+                SelectItem::Wildcard(_) => {
                     select_list.extend_from_slice(self.bind_all_column_refs()?.as_slice())
                 }
                 _ => todo!("bind select list"),