utils: CommitStatsCalculator, quick and dirty fixes

Signed-off-by: Máximo Cuadros <[email protected]>

Author: mcuadros

internal/function/commit_stats.go

@@ -3,9 +3,9 @@ package function
 import (
 	"fmt"
 	"reflect"
-	"time"
 
 	"github.com/src-d/gitbase"
+	"github.com/src-d/gitbase/internal/utils"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
 	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
@@ -41,8 +41,6 @@ func (f *CommitStats) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	span, ctx := ctx.Span("gitbase.CommitStats")
 	defer span.Finish()
 
-	s := time.Now()
-
 	val, err := f.Child.Eval(ctx, row)
 	if err != nil {
 		return nil, err
@@ -67,10 +65,8 @@ func (f *CommitStats) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, err
 	}
 
-	csc := NewCommitStatsCalculator(r, c)
-	fmt.Println(csc.Do())
-
-	return csc, nil
+	csc := utils.NewCommitStatsCalculator(r.Repository, c)
+	return csc.Do()
 }
 
 func resolveRepo(ctx *sql.Context, r sql.Row) (*gitbase.Repository, error) {

internal/utils/commit_stats.go

@@ -99,6 +99,14 @@ func (c *CommitStatsCalculator) doChange(ch *object.Change) (*Stats, error) {
 			return nil, err
 		}
 
+		if src == nil {
+			src = make(FileInfo)
+		}
+
+		if dst == nil {
+			dst = make(FileInfo)
+		}
+
 		dst.Sub(src)
 		fi = dst
 	}
@@ -143,6 +151,9 @@ func NewFileInfo(f *object.Blob) (FileInfo, error) {
 	if err != nil {
 		return ff, err
 	}
+
+	defer ioutil.CheckClose(r, &err)
+
 	gocloc.AnalyzeReader("", languages.Langs["Go"], r, &gocloc.ClocOptions{
 		OnBlank:   ff.AddBlank,
 		OnCode:    ff.AddCode,