Add alps branch (sql-machine-learning#305)

* add alps branch

* defer log info

sql/alps_submitter.go

@@ -239,7 +239,6 @@ func resolveExpression(e interface{}) (interface{}, error) {
  default:
  return nil, fmt.Errorf("not supported expr in ALPS submitter: %s", headName)
  }
- return nil, nil
 }
 
 func transformToIntList(list []interface{}) ([]int, error) {
@@ -331,7 +330,12 @@ func generateEstimatorCreator(estimator string, attrs []*attribute) (string, err
 }
 
 func genALPS(w io.Writer, pr *extendedSelect, fts fieldTypes, db *DB) error {
- // TODO
+ // TODO(uuleon): codegen alps
+ return nil
+}
+
+func submitALPS(w *PipeWriter, pr *extendedSelect, db *DB) error {
+ // TODO(uuleon): codegen & exec alps
  return nil
 }
 

sql/executor.go

@@ -176,6 +176,7 @@ func runExtendedSQL(slct string, db *DB, pr *extendedSelect) *PipeReader {
  err := func() error {
  startAt := time.Now()
  log.Infof("Starting runExtendedSQL:%s", slct)
+ defer log.Infof("runExtendedSQL finished, elapsed:%v", time.Since(startAt))
 
  // NOTE: the temporary directory must be in a host directory
  // which can be mounted to Docker containers. If I don't
@@ -190,13 +191,15 @@ func runExtendedSQL(slct string, db *DB, pr *extendedSelect) *PipeReader {
  }
  defer os.RemoveAll(cwd)
 
+ // FIXME(tony): temporary branch to alps
+ if os.Getenv("SQLFLOW_submitter") == "alps" {
+ return submitALPS(wr, pr, db)
+ }
+
  if pr.train {
- e = train(pr, slct, db, cwd, wr)
- } else {
- e = pred(pr, db, cwd, wr)
+ return train(pr, slct, db, cwd, wr)
  }
- log.Infof("runExtendedSQL finished, elapsed:%v", time.Since(startAt))
- return e
+ return pred(pr, db, cwd, wr)
  }()
 
  if err != nil {