Merge branch 'main' into main

secretflow · Aug 9, 2023 · 162faab · 162faab
2 parents 09a7650 + 1ab35cc
commit 162faab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/expression/expression_to_stmt.go b/pkg/expression/expression_to_stmt.go
@@ -121,7 +121,7 @@ func (c ExprConverter) convertScalarFunction(dialect format.Dialect, expr *Scala
 		return &ast.FuncCallExpr{FnName: model.NewCIStr(dialect.GetSpecialFuncName(ast.Ifnull)), Args: children}, nil
 	case ast.If:
 		return &ast.FuncCallExpr{FnName: model.NewCIStr(ast.If), Args: children}, nil
-	case ast.Cos, ast.Abs, ast.Round:
+	case ast.Cos, ast.Abs,ast.Log10, ast.Round:
 		return &ast.FuncCallExpr{FnName: model.NewCIStr(expr.FuncName.L), Args: children}, nil
 	}
 	switch expr.Function.(type) {

diff --git a/pkg/planner/core/testdata/runsql_in.json b/pkg/planner/core/testdata/runsql_in.json
@@ -300,6 +300,10 @@
         "sql": "select round(aggregate_float_0) as a from alice.tbl_1",
         "skip_projection": false,
         "rewritten_sql": "select round(tbl_1.aggregate_float_0) as a from alice.tbl_1"
+      },
+      { "sql": "select log10(aggregate_float_0) as a from alice.tbl_1",
+        "skip_projection": false,
+        "rewritten_sql": "select log10(tbl_1.aggregate_float_0) as a from alice.tbl_1"
       }
     ]
   }