Move ir_generator.go to the ir package and split ir_generate_test.go into two files (#2491)

Author: shendiaomo

pkg/executor/executor.go

@@ -122,7 +122,7 @@ func (s *pythonExecutor) SaveModel(cl *ir.TrainStmt) error {
 	if s.ModelDir != "" {
 		modelURI = fmt.Sprintf("file://%s/%s", s.ModelDir, cl.Into)
 	}
-	return m.Save(modelURI, cl, s.Session)
+	return m.Save(modelURI, s.Session)
 }
 
 func (s *pythonExecutor) runCommand(program string, logStderr bool) error {
@@ -158,7 +158,7 @@ func (s *pythonExecutor) ExecuteQuery(stmt *ir.NormalStmt) error {
 
 func (s *pythonExecutor) ExecuteTrain(cl *ir.TrainStmt) (e error) {
 	var code string
-	if isXGBoostModel(cl.Estimator) {
+	if cl.GetModelKind() == ir.XGBoost {
 		if code, e = xgboost.Train(cl, s.Session); e != nil {
 			return e
 		}
@@ -180,7 +180,7 @@ func (s *pythonExecutor) ExecutePredict(cl *ir.PredictStmt) (e error) {
 	}
 
 	var code string
-	if isXGBoostModel(cl.TrainStmt.Estimator) {
+	if cl.TrainStmt.GetModelKind() == ir.XGBoost {
 		if code, e = xgboost.Pred(cl, s.Session); e != nil {
 			return e
 		}
@@ -201,7 +201,7 @@ func (s *pythonExecutor) ExecuteExplain(cl *ir.ExplainStmt) error {
 		return err
 	}
 	defer db.Close()
-	if isXGBoostModel(cl.TrainStmt.Estimator) {
+	if cl.TrainStmt.GetModelKind() == ir.XGBoost {
 		code, err = xgboost.Explain(cl, s.Session)
 		// TODO(typhoonzero): deal with XGBoost model explain result table creation.
 	} else {
@@ -236,7 +236,7 @@ func (s *pythonExecutor) ExecuteEvaluate(cl *ir.EvaluateStmt) error {
 	// NOTE(typhoonzero): model is already loaded under s.Cwd
 	var code string
 	var err error
-	if isXGBoostModel(cl.TrainStmt.Estimator) {
+	if cl.TrainStmt.GetModelKind() == ir.XGBoost {
 		code, err = xgboost.Evaluate(cl, s.Session)
 		if err != nil {
 			return err

pkg/executor/pre_exec.go

@@ -16,12 +16,10 @@ package executor
 import (
 	"bytes"
 	"fmt"
-	"strings"
 
 	"sqlflow.org/sqlflow/pkg/database"
 	"sqlflow.org/sqlflow/pkg/ir"
 	pb "sqlflow.org/sqlflow/pkg/proto"
-	"sqlflow.org/sqlflow/pkg/step/feature"
 	"sqlflow.org/sqlflow/pkg/verifier"
 )
 
@@ -98,7 +96,7 @@ func createPredictionResultTable(predStmt *ir.PredictStmt, db *database.DB, sess
 // getSQLFieldType is quiet like verify but accept a SQL string as input, and returns
 // an ordered list of the field types.
 func getSQLFieldType(slct string, db *database.DB) ([]string, []string, error) {
-	rows, err := feature.FetchSamples(db, slct)
+	rows, err := verifier.FetchSamples(db, slct)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -128,9 +126,3 @@ func getSQLFieldType(slct string, db *database.DB) ([]string, []string, error) {
 
 	return flds, ft, nil
 }
-
-// TODO(yancey1989): need to discuss fill esimator type in IR,
-// that we don't need the duplicate judgement with pkg/sql/ir_generator.go
-func isXGBoostModel(estimator string) bool {
-	return strings.HasPrefix(strings.ToUpper(estimator), `XGB`)
-}