Merge pull request #372 from mcarmonaa/fix/uast-function-not-fail

internal/function: don't fail if the uast function can't parse a blob

Author: ajnavarro

internal/function/uast.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/sirupsen/logrus"
 	"github.com/src-d/gitbase"
 	"gopkg.in/bblfsh/client-go.v2/tools"
 	"gopkg.in/bblfsh/sdk.v1/protocol"
@@ -197,11 +198,12 @@ func (f UAST) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 
 	resp, err := client.Parse(ctx, lang, bytes)
 	if err != nil {
-		return nil, ErrParseBlob.New(err)
+		logrus.Warn(ErrParseBlob.New(err))
+		return nil, nil
 	}
 
 	if resp.Status != protocol.Ok {
-		return nil, ErrParseBlob.New(strings.Join(resp.Errors, "\n"))
+		logrus.Warn(ErrParseBlob.New(strings.Join(resp.Errors, "\n")))
 	}
 
 	var nodes []*uast.Node

internal/function/uast_test.go

@@ -52,32 +52,26 @@ func TestUAST(t *testing.T) {
 		fn       *UAST
 		row      sql.Row
 		expected interface{}
-		err      *errors.Kind
 	}{
-		{"blob is nil", fn3, sql.NewRow(nil, nil, nil), nil, nil},
-		{"lang is nil", fn3, sql.NewRow([]byte{}, nil, nil), nil, nil},
-		{"xpath is nil", fn3, sql.NewRow([]byte{}, "Ruby", nil), nil, nil},
-		{"only blob, can't infer language", fn1, sql.NewRow([]byte(testCode)), nil, ErrParseBlob},
-		{"blob with unsupported lang", fn2, sql.NewRow([]byte(testCode), "YAML"), nil, nil},
-		{"blob with lang", fn2, sql.NewRow([]byte(testCode), "Python"), uast, nil},
-		{"blob with lang and xpath", fn3, sql.NewRow([]byte(testCode), "Python", testXPath), filteredNodes, nil},
+		{"blob is nil", fn3, sql.NewRow(nil, nil, nil), nil},
+		{"lang is nil", fn3, sql.NewRow([]byte{}, nil, nil), nil},
+		{"xpath is nil", fn3, sql.NewRow([]byte{}, "Ruby", nil), nil},
+		{"only blob, can't infer language", fn1, sql.NewRow([]byte(testCode)), nil},
+		{"blob with unsupported lang", fn2, sql.NewRow([]byte(testCode), "YAML"), nil},
+		{"blob with lang", fn2, sql.NewRow([]byte(testCode), "Python"), uast},
+		{"blob with lang and xpath", fn3, sql.NewRow([]byte(testCode), "Python", testXPath), filteredNodes},
 	}
 
 	for _, tt := range testCases {
 		t.Run(tt.name, func(t *testing.T) {
 			require := require.New(t)
 			result, err := tt.fn.Eval(ctx, tt.row)
-			if tt.err != nil {
-				require.Error(err)
-				require.True(tt.err.Is(err))
-			} else {
-				require.NoError(err)
+			require.NoError(err)
 
-				if _, ok := tt.expected.([]interface{}); ok {
-					assertUASTBlobs(t, tt.expected, result)
-				} else {
-					require.Equal(tt.expected, result)
-				}
+			if _, ok := tt.expected.([]interface{}); ok {
+				assertUASTBlobs(t, tt.expected, result)
+			} else {
+				require.Equal(tt.expected, result)
 			}
 		})
 	}