common: moved TimeSlice to graph package

Author: lebauce

common/types.go

@@ -50,17 +50,6 @@ func UnixMillis(t time.Time) int64 {
 	return t.UTC().UnixNano() / 1000000
 }
 
-// TimeSlice defines a time boudary values
-type TimeSlice struct {
-	Start int64 `json:"Start"`
-	Last  int64 `json:"Last"`
-}
-
-// NewTimeSlice creates a new TimeSlice based on Start and Last
-func NewTimeSlice(s, l int64) *TimeSlice {
-	return &TimeSlice{Start: s, Last: l}
-}
-
 // Metric defines a common metric interface
 type Metric interface {
 	// part of the Getter interface

graffiti/graph/filters.go

@@ -59,12 +59,23 @@ func NewFilterForEdge(parent Identifier, child Identifier) *filters.Filter {
 	)
 }
 
+// TimeSlice defines a time boudary values
+type TimeSlice struct {
+	Start int64 `json:"Start"`
+	Last  int64 `json:"Last"`
+}
+
+// NewTimeSlice creates a new TimeSlice based on Start and Last
+func NewTimeSlice(s, l int64) *TimeSlice {
+	return &TimeSlice{Start: s, Last: l}
+}
+
 // filterForTimeSlice creates a filter based on a time slice between
 // startName and endName. time.Now() is used as reference if t == nil
-func filterForTimeSlice(t *common.TimeSlice, startName, endName string) *filters.Filter {
+func filterForTimeSlice(t *TimeSlice, startName, endName string) *filters.Filter {
 	if t == nil {
 		u := common.UnixMillis(time.Now())
-		t = common.NewTimeSlice(u, u)
+		t = NewTimeSlice(u, u)
 	}
 
 	return filters.NewAndFilter(
@@ -76,7 +87,7 @@ func filterForTimeSlice(t *common.TimeSlice, startName, endName string) *filters
 	)
 }
 
-func getTimeFilter(t *common.TimeSlice) *filters.Filter {
+func getTimeFilter(t *TimeSlice) *filters.Filter {
 	if t == nil {
 		return filters.NewNullFilter("ArchivedAt")
 	}

graffiti/graph/graph.go

@@ -131,7 +131,7 @@ type PersistentBackend interface {
 
 // Context describes within time slice
 type Context struct {
-	TimeSlice *common.TimeSlice
+	TimeSlice *TimeSlice
 	TimePoint bool
 }
 

graffiti/graph/traversal/traversal.go

@@ -556,7 +556,7 @@ func (t *GraphTraversal) Context(s ...interface{}) *GraphTraversal {
 
 	g, err := t.Graph.CloneWithContext(graph.Context{
 		TimePoint: len(s) == 1,
-		TimeSlice: common.NewTimeSlice(common.UnixMillis(at.Add(-duration)), common.UnixMillis(at)),
+		TimeSlice: graph.NewTimeSlice(common.UnixMillis(at.Add(-duration)), common.UnixMillis(at)),
 	})
 	if err != nil {
 		return &GraphTraversal{error: err}

graffiti/messages/messages.go

@@ -21,7 +21,6 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/skydive-project/skydive/common"
 	"github.com/skydive-project/skydive/graffiti/graph"
 	ws "github.com/skydive-project/skydive/graffiti/websocket"
 )
@@ -86,7 +85,7 @@ func (s *SyncRequestMsg) UnmarshalJSON(b []byte) error {
 	}
 
 	if raw.Time != 0 {
-		s.TimeSlice = common.NewTimeSlice(raw.Time, raw.Time)
+		s.TimeSlice = graph.NewTimeSlice(raw.Time, raw.Time)
 	}
 	s.GremlinFilter = raw.GremlinFilter
 

gremlin/traversal/flows.go

@@ -838,7 +838,7 @@ func captureAllowedNodes(nodes []*graph.Node) []*graph.Node {
 	return allowed
 }
 
-func (s *FlowGremlinTraversalStep) addTimeFilter(fsq *filters.SearchQuery, timeContext *common.TimeSlice) {
+func (s *FlowGremlinTraversalStep) addTimeFilter(fsq *filters.SearchQuery, timeContext *graph.TimeSlice) {
 	var timeFilter *filters.Filter
 	tr := filters.Range{
 		// When we query the flows on the agents, we get the flows that have not