From e0bf37da40e7f08921a7cd61e814f44020cfbc86 Mon Sep 17 00:00:00 2001 From: Linh Vo Date: Tue, 20 Jun 2017 21:37:27 -0500 Subject: [PATCH] check same rowID for same frame in actions --- input_definition.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/input_definition.go b/input_definition.go index cb15732ca..f05ccb64a 100644 --- a/input_definition.go +++ b/input_definition.go @@ -94,19 +94,19 @@ func (i *InputDefinition) LoadDefinition(pb *internal.InputDefinition) error { } numPrimaryKey := 0 - countRowID := make(map[uint64]bool) + countRowID := make(map[string]uint64) for _, field := range pb.Fields { var actions []Action for _, action := range field.Actions { if err := i.ValidateAction(action); err != nil { return err } - if action.RowID != 0 { - _, ok := countRowID[action.RowID] - if !ok { - countRowID[action.RowID] = true - } else { + if action.RowID != 0 && action.Frame != ""{ + val, ok := countRowID[action.Frame] + if ok && val == action.RowID { return fmt.Errorf("duplicate rowID with other field: %s", action.RowID) + } else { + countRowID[action.Frame] = action.RowID } } actions = append(actions, Action{