Clean up code

Signed-off-by: Kevin Zhang <[email protected]>
feast-dev · feast-ci-bot · Mar 29, 2022 · Mar 23, 2022 · Mar 23, 2022 · Mar 24, 2022
commit eb8a3208d807da32e105fdfb74db2833719ff9bd
@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/feast-dev/feast/go/internal/feast"
+	"github.com/feast-dev/feast/go/internal/test"
 	"github.com/feast-dev/feast/go/protos/feast/serving"
 	"github.com/feast-dev/feast/go/protos/feast/types"
 	"github.com/stretchr/testify/assert"
@@ -68,7 +69,8 @@ func getClient(ctx context.Context, basePath string) (serving.ServingServiceClie
 func TestGetFeastServingInfo(t *testing.T) {
 	ctx := context.Background()
 	// Pregenerated using `feast init`.
-	client, closer := getClient(ctx, "../../internal/test")
+	dir := "../../internal/test"
+	client, closer := getClient(ctx, dir)
 	defer closer()
 	response, err := client.GetFeastServingInfo(ctx, &serving.GetFeastServingInfoRequest{})
 	assert.Nil(t, err)
@@ -78,7 +80,8 @@ func TestGetFeastServingInfo(t *testing.T) {
 func TestGetOnlineFeaturesSqlite(t *testing.T) {
 	ctx := context.Background()
 	// Pregenerated using `feast init`.
-	client, closer := getClient(ctx, "../../internal/test")
+	dir := "../../internal/test"
+	client, closer := getClient(ctx, dir)
 	defer closer()
 	entities := make(map[string]*types.RepeatedValue)
 	entities["driver_id"] = &types.RepeatedValue{
@@ -105,12 +108,26 @@ func TestGetOnlineFeaturesSqlite(t *testing.T) {
 	expectedFeatureNamesResp := []string{"driver_id", "conv_rate", "acc_rate", "avg_daily_trips"}
 	assert.Nil(t, err)
 	assert.NotNil(t, response)
+	rows, err := test.ReadParquet(filepath.Join(dir, "feature_repo", "data", "driver_stats.parquet"))
+	assert.Nil(t, err)
+	entityKeys := map[int64]bool{1001: true, 1003: true, 1005: true}
+	correctFeatures := test.GetLatestFeatures(rows, entityKeys)
+	expectedConvRateValues := []*types.Value{}
+	expectedAccRateValues := []*types.Value{}
+	expectedAvgDailyTripsValues := []*types.Value{}
+
+	for _, key := range []int64{1001, 1003, 1005} {
+		expectedConvRateValues = append(expectedConvRateValues, &types.Value{Val: &types.Value_FloatVal{FloatVal: correctFeatures[key].Conv_rate}})
+		expectedAccRateValues = append(expectedAccRateValues, &types.Value{Val: &types.Value_FloatVal{FloatVal: correctFeatures[key].Acc_rate}})
+		expectedAvgDailyTripsValues = append(expectedAvgDailyTripsValues, &types.Value{Val: &types.Value_Int64Val{Int64Val: int64(correctFeatures[key].Avg_daily_trips)}})
+	}
+	// Columnar so get in column format row by row should have column names of all features
+	assert.Equal(t, len(response.Results), 4)
 
-	// Columnar so first column should have column names of all features
 	assert.True(t, reflect.DeepEqual(response.Results[0].Values, expectedEntityValuesResp))
+	assert.True(t, reflect.DeepEqual(response.Results[1].Values, expectedConvRateValues))
+	assert.True(t, reflect.DeepEqual(response.Results[2].Values, expectedAccRateValues))
+	assert.True(t, reflect.DeepEqual(response.Results[3].Values, expectedAvgDailyTripsValues))
+
 	assert.True(t, reflect.DeepEqual(response.Metadata.FeatureNames.Val, expectedFeatureNamesResp))
-	assert.Equal(t, len(response.Results), 4)
-	for _, row := range response.Results {
-		assert.Greater(t, len(row.Values), 0)
-	}
 }
@@ -52,15 +52,12 @@ func getOnlineStoreType(onlineStoreConfig map[string]interface{}) (string, bool)
 func NewOnlineStore(config *RepoConfig) (OnlineStore, error) {
 	onlineStoreType, ok := getOnlineStoreType(config.OnlineStore)
 	if !ok {
-		return nil, fmt.Errorf("could not get online store type from online store config: %+v", config.OnlineStore)
+		onlineStore, err := NewSqliteOnlineStore(config.Project, config, config.OnlineStore)
+		return onlineStore, err
 	}
 	if onlineStoreType == "redis" {
 		onlineStore, err := NewRedisOnlineStore(config.Project, config.OnlineStore)
 		return onlineStore, err
-	}
-	if onlineStoreType == "sqlite" {
-		onlineStore, err := NewSqliteOnlineStore(config.Project, config, config.OnlineStore)
-		return onlineStore, err
 	} else {
 		return nil, fmt.Errorf("%s online store type is currently not supported; only redis and sqlite are supported", onlineStoreType)
 	}

diff --git a/go/internal/feast/registry.go b/go/internal/feast/registry.go
@@ -3,7 +3,6 @@ package feast
 import (
 	"errors"
 	"fmt"
-	"log"
 	"net/url"
 	"sync"
 	"time"
@@ -38,8 +37,6 @@ type Registry struct {
 }
 
 func NewRegistry(registryConfig *RegistryConfig, repoPath string) (*Registry, error) {
-	log.Println("registry")
-	log.Println(registryConfig)
 	registryStoreType := registryConfig.RegistryStoreType
 	registryPath := registryConfig.Path
 	r := &Registry{
@@ -91,11 +88,9 @@ func (r *Registry) refresh() error {
 func (r *Registry) getRegistryProto() (*core.Registry, error) {
 	expired := r.cachedRegistry == nil || (r.cachedRegistryProtoTtl > 0 && time.Now().After(r.cachedRegistryProtoLastUpdated.Add(r.cachedRegistryProtoTtl)))
 	if !expired {
-		log.Println("Expired?")
 		return r.cachedRegistry, nil
 	}
 	registryProto, err := r.registryStore.GetRegistryProto()
-	log.Println(registryProto)
 	if err != nil {
 		return registryProto, err
 	}

@@ -148,6 +148,9 @@ func initializeConnection(db_path string) (*sql.DB, error) {
 }
 
 func hashSerializedEntityKey(serializedEntityKey *[]byte) string {
+	if serializedEntityKey == nil {
+		return ""
+	}
 	h := sha1.New()
 	h.Write(*serializedEntityKey)
 	sha1_hash := hex.EncodeToString(h.Sum(nil))

@@ -2,9 +2,11 @@ package feast
 
 import (
 	"context"
+	"path/filepath"
 	"reflect"
 	"testing"
 
+	"github.com/feast-dev/feast/go/internal/test"
 	"github.com/feast-dev/feast/go/protos/feast/types"
 	"github.com/stretchr/testify/assert"
 )
@@ -17,7 +19,6 @@ func TestSqliteSetup(t *testing.T) {
 	assert.Equal(t, "data/registry.db", config.GetRegistryConfig().Path)
 	assert.Equal(t, "local", config.Provider)
 	assert.Equal(t, map[string]interface{}{
-		"type": "sqlite",
 		"path": "data/online_store.db",
 	}, config.OnlineStore)
 	assert.Empty(t, config.OfflineStore)
@@ -57,16 +58,15 @@ func TestSqliteOnlineRead(t *testing.T) {
 			returnedFeatureNames = append(returnedFeatureNames, featureVector[idx].reference.FeatureName)
 		}
 	}
-	expectedFeatureValues := []*types.Value{
-		{Val: &types.Value_FloatVal{FloatVal: 0.78135854}},
-		{Val: &types.Value_FloatVal{FloatVal: 0.38527268}},
-		{Val: &types.Value_Int64Val{Int64Val: 755}},
-		{Val: &types.Value_FloatVal{FloatVal: 0.49661186}},
-		{Val: &types.Value_FloatVal{FloatVal: 0.9440974}},
-		{Val: &types.Value_Int64Val{Int64Val: 169}},
-		{Val: &types.Value_FloatVal{FloatVal: 0.80762655}},
-		{Val: &types.Value_FloatVal{FloatVal: 0.71510273}},
-		{Val: &types.Value_Int64Val{Int64Val: 545}},
+	rows, err := test.ReadParquet(filepath.Join(dir, "data", "driver_stats.parquet"))
+	assert.Nil(t, err)
+	entities := map[int64]bool{1005: true, 1001: true, 1003: true}
+	correctFeatures := test.GetLatestFeatures(rows, entities)
+	expectedFeatureValues := []*types.Value{}
+	for _, key := range []int64{1005, 1001, 1003} {
+		expectedFeatureValues = append(expectedFeatureValues, &types.Value{Val: &types.Value_FloatVal{FloatVal: correctFeatures[key].Conv_rate}})
+		expectedFeatureValues = append(expectedFeatureValues, &types.Value{Val: &types.Value_FloatVal{FloatVal: correctFeatures[key].Acc_rate}})
+		expectedFeatureValues = append(expectedFeatureValues, &types.Value{Val: &types.Value_Int64Val{Int64Val: int64(correctFeatures[key].Avg_daily_trips)}})
 	}
 	expectedFeatureNames := []string{"conv_rate", "acc_rate", "avg_daily_trips", "conv_rate", "acc_rate", "avg_daily_trips", "conv_rate", "acc_rate", "avg_daily_trips"}
 	assert.True(t, reflect.DeepEqual(expectedFeatureValues, returnedFeatureValues))