update

Author: Yancey0623

pkg/sql/codegen/tensorflow/codegen.go

@@ -238,20 +238,10 @@ func Pred(ir *codegen.PredictIR) (string, error) {
 	}
 	isKeras, estimatorStr := isKerasModel(ir.TrainIR.Estimator)
 
-	resultTableParts := strings.Split(ir.ResultTable, ".")
-	resultTable := ""
-	if len(resultTableParts) == 3 {
-		resultTable = strings.Join(resultTableParts[0:2], ".")
-	} else if len(resultTableParts) == 2 || len(resultTableParts) == 1 {
-		resultTable = ir.ResultTable
-	} else {
-		return "", fmt.Errorf("error result table format, should be db.table.class_col or db.table or table")
-	}
-
 	filler := predFiller{
 		DataSource:        ir.DataSource,
 		Select:            ir.Select,
-		ResultTable:       resultTable,
+		ResultTable:       ir.ResultTable,
 		Estimator:         estimatorStr,
 		IsKerasModel:      isKeras,
 		FieldMetas:        fieldMetas,

pkg/sql/codegen/xgboost/codegen.go

@@ -22,7 +22,6 @@ import (
 	"sqlflow.org/sqlflow/pkg/sql/codegen/attribute"
 
 	"sqlflow.org/sqlflow/pkg/sql/codegen"
-	"sqlflow.org/sqlflow/pkg/sql/codegen/attribute"
 )
 
 func newFloat32(f float32) *float32 {

pkg/sql/executor.go

@@ -29,7 +29,6 @@ import (
 	pb "sqlflow.org/sqlflow/pkg/server/proto"
 	"sqlflow.org/sqlflow/pkg/sql/codegen/tensorflow"
 	"sqlflow.org/sqlflow/pkg/sql/codegen/xgboost"
-	xgb "sqlflow.org/sqlflow/pkg/sql/codegen/xgboost"
 )
 
 // Run executes a SQL query and returns a stream of rows or messages
@@ -419,7 +418,7 @@ func train(wr *PipeWriter, tr *extendedSelect, db *DB, cwd string, modelDir stri
 			if err != nil {
 				return err
 			}
-			code, err := xgb.Train(ir)
+			code, err := xgboost.Train(ir)
 			if err != nil {
 				return err
 			}

pkg/sql/ir_generator.go

@@ -96,7 +96,6 @@ func generatePredictIR(slct *extendedSelect, connStr string, cwd string, modelDi
 	if err != nil {
 		return nil, err
 	}
-	fmt.Printf("select %s, result table: %s\n", slct.standardSelect.String(), slct.into)
 
 	resultTable, err := parseResultTable(slct.into)
 	if err != nil {
@@ -564,15 +563,18 @@ func parseShape(e *expr) ([]int, error) {
 	return shape, nil
 }
 
+// parseResultTable parse out the table name from the INTO statment
+// as the following 3 cases:
+// db.table.class_col -> db.table # cut the column name
+// db.table -> db.table               # using the specified db
+// table -> table                     # using the default db
 func parseResultTable(intoStatement string) (string, error) {
 	resultTableParts := strings.Split(intoStatement, ".")
-	resultTable := ""
 	if len(resultTableParts) == 3 {
-		resultTable = strings.Join(resultTableParts[0:2], ".")
+		return strings.Join(resultTableParts[0:2], "."), nil
 	} else if len(resultTableParts) == 2 || len(resultTableParts) == 1 {
-		resultTable = intoStatement
+		return intoStatement, nil
 	} else {
 		return "", fmt.Errorf("error result table format, should be db.table.class_col or db.table or table")
 	}
-	return resultTable, nil
 }