Move sort types and constants to filters package

datadope-io · Jul 8, 2020 · ac34145 · ac34145
1 parent 2ece159
commit ac34145
Show file tree

Hide file tree

Showing 18 changed files with 165 additions and 151 deletions.
diff --git a/common/types.go b/common/types.go
@@ -17,16 +17,6 @@
 
 package common
 
-// SortOrder describes ascending or descending order
-type SortOrder string
-
-const (
-	// SortAscending sorting order
-	SortAscending SortOrder = "ASC"
-	// SortDescending sorting order
-	SortDescending SortOrder = "DESC"
-)
-
 // Metric defines a common metric interface
 type Metric interface {
 	// part of the Getter interface

diff --git a/flow/client.go b/flow/client.go
@@ -20,7 +20,6 @@ package flow
 import (
 	"github.com/golang/protobuf/proto"
 
-	"github.com/skydive-project/skydive/common"
 	"github.com/skydive-project/skydive/config"
 	"github.com/skydive-project/skydive/graffiti/filters"
 	"github.com/skydive-project/skydive/graffiti/logging"
@@ -60,7 +59,7 @@ func (f *WSTableClient) lookupFlows(flowset chan *FlowSet, host string, flowSear
 	context := MergeContext{
 		Sort:      flowSearchQuery.Sort,
 		SortBy:    flowSearchQuery.SortBy,
-		SortOrder: common.SortOrder(flowSearchQuery.SortOrder),
+		SortOrder: flowSearchQuery.SortOrder,
 		Dedup:     flowSearchQuery.Dedup,
 		DedupBy:   flowSearchQuery.DedupBy,
 	}
@@ -92,7 +91,7 @@ func (f *WSTableClient) LookupFlows(flowSearchQuery filters.SearchQuery) (*FlowS
 	context := MergeContext{
 		Sort:      flowSearchQuery.Sort,
 		SortBy:    flowSearchQuery.SortBy,
-		SortOrder: common.SortOrder(flowSearchQuery.SortOrder),
+		SortOrder: flowSearchQuery.SortOrder,
 		Dedup:     flowSearchQuery.Dedup,
 		DedupBy:   flowSearchQuery.DedupBy,
 	}
@@ -122,7 +121,7 @@ func (f *WSTableClient) LookupFlowsByNodes(hnmap topology.HostNodeTIDMap, flowSe
 	context := MergeContext{
 		Sort:      flowSearchQuery.Sort,
 		SortBy:    flowSearchQuery.SortBy,
-		SortOrder: common.SortOrder(flowSearchQuery.SortOrder),
+		SortOrder: flowSearchQuery.SortOrder,
 		Dedup:     flowSearchQuery.Dedup,
 		DedupBy:   flowSearchQuery.DedupBy,
 	}

diff --git a/flow/flow.pb_easyjson.go b/flow/flow.pb_easyjson.go
diff --git a/flow/set.go b/flow/set.go
@@ -18,7 +18,6 @@
 package flow
 
 import (
-	"github.com/skydive-project/skydive/common"
 	"github.com/skydive-project/skydive/graffiti/filters"
 	"github.com/skydive-project/skydive/graffiti/getter"
 )
@@ -27,7 +26,7 @@ import (
 type MergeContext struct {
 	Sort      bool
 	SortBy    string
-	SortOrder common.SortOrder
+	SortOrder filters.SortOrder
 	Dedup     bool
 	DedupBy   string
 }
@@ -202,7 +201,7 @@ func (fs *FlowSet) mergeSortedFlows(left, right []*Flow, context MergeContext) (
 		if err != nil {
 			return nil, err
 		}
-		if context.SortOrder != common.SortAscending {
+		if context.SortOrder != filters.SortOrder_Ascending {
 			cv = !cv
 		}
 
@@ -281,8 +280,8 @@ func (fs *FlowSet) Dedup(field string) error {
 }
 
 // Sort flows in a FlowSet
-func (fs *FlowSet) Sort(order common.SortOrder, orberBy string) {
-	context := MergeContext{Sort: true, SortBy: orberBy, SortOrder: order}
+func (fs *FlowSet) Sort(order filters.SortOrder, orderBy string) {
+	context := MergeContext{Sort: true, SortBy: orderBy, SortOrder: order}
 	fs.Flows = fs.sortFlows(fs.Flows, context)
 }
 

diff --git a/flow/storage/orientdb/orientdb.go b/flow/storage/orientdb/orientdb.go
@@ -22,7 +22,6 @@ package orientdb
 import (
 	"encoding/json"
 	"fmt"
-	"strings"
 
 	"github.com/google/gopacket/layers"
 	"github.com/skydive-project/skydive/common"
@@ -267,8 +266,8 @@ func (c *Storage) SearchRawPackets(fsq filters.SearchQuery, packetFilter *filter
 
 	if fsq.Sort {
 		sql += " ORDER BY " + fsq.SortBy
-		if fsq.SortOrder != "" {
-			sql += " " + strings.ToUpper(fsq.SortOrder)
+		if fsq.SortOrder == filters.SortOrder_Descending {
+			sql += " DESC"
 		}
 	}
 
@@ -308,8 +307,8 @@ func (c *Storage) SearchMetrics(fsq filters.SearchQuery, metricFilter *filters.F
 
 	if fsq.Sort {
 		sql += " ORDER BY " + fsq.SortBy
-		if fsq.SortOrder != "" {
-			sql += " " + strings.ToUpper(fsq.SortOrder)
+		if fsq.SortOrder == filters.SortOrder_Descending {
+			sql += " DESC"
 		}
 	}
 

diff --git a/flow/table.go b/flow/table.go
@@ -27,7 +27,6 @@ import (
 	"github.com/hashicorp/golang-lru/simplelru"
 	"github.com/safchain/insanelock"
 
-	"github.com/skydive-project/skydive/common"
 	"github.com/skydive-project/skydive/config"
 	"github.com/skydive-project/skydive/graffiti/filters"
 	"github.com/skydive-project/skydive/graffiti/logging"
@@ -200,7 +199,7 @@ func (ft *Table) getFlows(query *filters.SearchQuery) *FlowSet {
 	}
 
 	if query.Sort {
-		flowset.Sort(common.SortOrder(query.SortOrder), query.SortBy)
+		flowset.Sort(query.SortOrder, query.SortBy)
 	}
 
 	if query.Dedup {

diff --git a/flow/table_test.go b/flow/table_test.go
@@ -23,7 +23,6 @@ import (
 
 	"github.com/google/gopacket/layers"
 
-	"github.com/skydive-project/skydive/common"
 	"github.com/skydive-project/skydive/config"
 	"github.com/skydive-project/skydive/graffiti/filters"
 )
@@ -100,7 +99,7 @@ func TestGetFlowsWithFilters(t *testing.T) {
 	// sort test
 	searchQuery.Sort = true
 	searchQuery.SortBy = "Network.A"
-	searchQuery.SortOrder = string(common.SortAscending)
+	searchQuery.SortOrder = filters.SortOrder_Ascending
 
 	flows = table.getFlows(searchQuery).Flows
 
@@ -112,7 +111,7 @@ func TestGetFlowsWithFilters(t *testing.T) {
 		last = f.Network.A
 	}
 
-	searchQuery.SortOrder = string(common.SortDescending)
+	searchQuery.SortOrder = filters.SortOrder_Descending
 
 	flows = table.getFlows(searchQuery).Flows