fix: make it compile

oom-ai · Nov 12, 2021 · e030fcc · e030fcc
1 parent 19b6868
commit e030fcc
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 48 deletions.
diff --git a/featctl/cmd/get_historical_feature.go b/featctl/cmd/get_historical_feature.go
@@ -20,7 +20,7 @@ var getHistoricalFeatureCmd = &cobra.Command{
 	Short: "get historical features in a group",
 	PreRun: func(cmd *cobra.Command, args []string) {
 		if !cmd.Flags().Changed("revision") {
-			getHistoricalFeatureOpt.GroupRevision = nil
+			getHistoricalFeatureOpt.Revision = nil
 		}
 		if !cmd.Flags().Changed("limit") {
 			getHistoricalFeatureOpt.Limit = nil
@@ -54,5 +54,5 @@ func init() {
 	_ = getHistoricalFeatureCmd.MarkFlagRequired("group")
 
 	getHistoricalFeatureOpt.Limit = flags.Uint64P("limit", "l", 0, "max records to export")
-	getHistoricalFeatureOpt.GroupRevision = flags.Int64P("revision", "r", 0, "feature group revision")
+	getHistoricalFeatureOpt.Revision = flags.Int64P("revision", "r", 0, "feature group revision")
 }
diff --git a/featctl/cmd/sync.go b/featctl/cmd/sync.go
@@ -19,14 +19,6 @@ var syncCmd = &cobra.Command{
 		oomStore := mustOpenOomStore(ctx, oomStoreCfg)
 		defer oomStore.Close()
 
-		groupName := args[0]
-
-		group, err := oomStore.GetFeatureGroupByName(ctx, groupName)
-		if err != nil {
-			log.Fatalf("failed to get feature group name=%s: %v", groupName, err)
-		}
-		syncOpt.GroupID = group.ID
-
 		log.Println("syncing features ...")
 		if err := oomStore.Sync(ctx, syncOpt); err != nil {
 			log.Fatalf("failed sync features: %v\n", err)

diff --git a/pkg/oomstore/export.go b/pkg/oomstore/export.go
@@ -16,11 +16,8 @@ func (s *OomStore) ExportFeatureValues(ctx context.Context, opt types.ExportFeat
 	}
 
 	var dataTable string
-	if opt.GroupRevision == nil {
-		revision, err := s.GetRevision(ctx, metadatav2.GetRevisionOpt{
-			GroupID:  &opt.GroupID,
-			Revision: opt.GroupRevision,
-		})
+	if opt.Revision == nil {
+		revision, err := s.GetRevisionBy(ctx, opt.GroupID, *opt.Revision)
 		if err != nil {
 			return nil, nil, err
 		}

diff --git a/pkg/oomstore/export_test.go b/pkg/oomstore/export_test.go
@@ -64,9 +64,9 @@ func TestExportFeatureValues(t *testing.T) {
 		{
 			description: "provide revision",
 			opt: types.ExportFeatureValuesOpt{
-				GroupID:       1,
-				FeatureNames:  []string{"price"},
-				GroupRevision: &prevRevision,
+				GroupID:      1,
+				FeatureNames: []string{"price"},
+				Revision:     &prevRevision,
 			},
 			stream:   prepareTwoFeatureStream(),
 			expected: [][]interface{}{{"1234", "xiaomi", int64(100)}, {"1235", "apple", int64(200)}, {"1236", "huawei", int64(300)}, {"1237", "oneplus", int64(240)}},
@@ -83,11 +83,11 @@ func TestExportFeatureValues(t *testing.T) {
 			metadatav2Store.EXPECT().ListFeature(gomock.Any(), metadatav2.ListFeatureOpt{GroupID: &tc.opt.GroupID}).Return(features)
 
 			dt := dataTable
-			if tc.opt.GroupRevision != nil {
+			if tc.opt.Revision != nil {
 				dt = prevDataTable
 				metadatav2Store.EXPECT().GetRevision(gomock.Any(), metadatav2.GetRevisionOpt{
 					GroupID:  &tc.opt.GroupID,
-					Revision: tc.opt.GroupRevision,
+					Revision: tc.opt.Revision,
 				}).Return(&typesv2.Revision{
 					DataTable: prevDataTable,
 				}, nil)

diff --git a/pkg/oomstore/revision.go b/pkg/oomstore/revision.go
@@ -7,14 +7,14 @@ import (
 	"github.com/oom-ai/oomstore/pkg/oomstore/typesv2"
 )
 
-func (s *OomStore) ListRevision(ctx context.Context, id *int16) typesv2.RevisionList {
-	return s.metadatav2.ListRevision(ctx, metadatav2.ListRevisionOpt{GroupID: id})
+func (s *OomStore) ListRevision(ctx context.Context, groupID *int16) typesv2.RevisionList {
+	return s.metadatav2.ListRevision(ctx, metadatav2.ListRevisionOpt{GroupID: groupID})
 }
 
-func (s *OomStore) GetRevision(ctx context.Context, opt metadatav2.GetRevisionOpt) (*typesv2.Revision, error) {
-	return s.metadatav2.GetRevision(ctx, metadatav2.GetRevisionOpt{
-		GroupID:    opt.GroupID,
-		Revision:   opt.Revision,
-		RevisionID: opt.RevisionID,
-	})
+func (s *OomStore) GetRevision(ctx context.Context, id int32) (*typesv2.Revision, error) {
+	return s.metadatav2.GetRevision(ctx, id)
+}
+
+func (s *OomStore) GetRevisionBy(ctx context.Context, groupID int16, revision int64) (*typesv2.Revision, error) {
+	return s.metadatav2.GetRevisionBy(ctx, groupID, revision)
 }
diff --git a/pkg/oomstore/sync.go b/pkg/oomstore/sync.go
@@ -13,19 +13,12 @@ import (
 )
 
 func (s *OomStore) Sync(ctx context.Context, opt types.SyncOpt) error {
-	revision, err := s.GetRevision(ctx, metadatav2.GetRevisionOpt{
-		GroupID:    &opt.GroupID,
-		RevisionID: &opt.RevisionId,
-	})
-	if err != nil {
-		return err
-	}
-
-	group, err := s.GetFeatureGroup(ctx, opt.GroupID)
+	revision, err := s.GetRevision(ctx, opt.RevisionId)
 	if err != nil {
 		return err
 	}
 
+	group := revision.Group
 	if group.OnlineRevisionID != nil && *group.OnlineRevisionID == revision.ID {
 		return fmt.Errorf("online store already in the latest revision")
 	}
@@ -35,7 +28,7 @@ func (s *OomStore) Sync(ctx context.Context, opt types.SyncOpt) error {
 		return err
 	}
 
-	features := s.ListFeature(ctx, metadatav2.ListFeatureOpt{GroupID: &opt.GroupID})
+	features := s.ListFeature(ctx, metadatav2.ListFeatureOpt{GroupID: &group.ID})
 	if err != nil {
 		return err
 	}
@@ -60,9 +53,7 @@ func (s *OomStore) Sync(ctx context.Context, opt types.SyncOpt) error {
 
 	var previousRevision *typesv2.Revision
 	if group.OnlineRevisionID != nil {
-		previousRevision, err = s.metadatav2.GetRevision(ctx, metadatav2.GetRevisionOpt{
-			RevisionID: group.OnlineRevisionID,
-		})
+		previousRevision, err = s.metadatav2.GetRevision(ctx, *group.OnlineRevisionID)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/oomstore/sync_test.go b/pkg/oomstore/sync_test.go
@@ -49,7 +49,7 @@ func TestSync(t *testing.T) {
 			description: "user-defined revision, succeed",
 			opt: types.SyncOpt{
 				GroupID:    1,
-				RevisionId: 10,
+				RevisionID: 10,
 			},
 			group:            prepareGroup(int32Ptr(2)),
 			revision:         revision1,
@@ -94,7 +94,7 @@ func TestSync(t *testing.T) {
 
 			metadatav2Store.EXPECT().GetRevision(ctx, metadatav2.GetRevisionOpt{
 				GroupID:    &tc.opt.GroupID,
-				RevisionID: &tc.opt.RevisionId,
+				RevisionID: &tc.opt.RevisionID,
 			}).Return(&tc.revision, nil)
 			if tc.expectedError == nil {
 				offlineStore.EXPECT().Export(ctx, offline.ExportOpt{

diff --git a/pkg/oomstore/types/options.go b/pkg/oomstore/types/options.go
@@ -35,10 +35,10 @@ type CreateFeatureGroupOpt struct {
 }
 
 type ExportFeatureValuesOpt struct {
-	GroupID       int16
-	GroupRevision *int64
-	FeatureNames  []string
-	Limit         *uint64
+	GroupID      int16
+	Revision     *int64
+	FeatureNames []string
+	Limit        *uint64
 }
 
 type ImportBatchFeaturesOpt struct {
@@ -80,7 +80,6 @@ type UpdateFeatureGroupOpt struct {
 }
 
 type SyncOpt struct {
-	GroupID    int16
 	RevisionId int32
 }