make "public org" explicit + optimize find in case orgIdPublic passed

Author: Dieterbe

idx/cassandra/cassandra_test.go

@@ -125,7 +125,7 @@ func TestGetAddKey(t *testing.T) {
 	ix := New()
 	initForTests(ix)
 
-	publicSeries := getMetricData(-1, 2, 5, 10, "metric.public")
+	publicSeries := getMetricData(idx.OrgIdPublic, 2, 5, 10, "metric.public")
 	org1Series := getMetricData(1, 2, 5, 10, "metric.org1")
 	org2Series := getMetricData(2, 2, 5, 10, "metric.org2")
 
@@ -138,7 +138,7 @@ func TestGetAddKey(t *testing.T) {
 			Convey(fmt.Sprintf("Then listing metrics for OrgId %d", orgId), func() {
 				defs := ix.List(orgId)
 				numSeries := len(series)
-				if orgId != -1 {
+				if orgId != idx.OrgIdPublic {
 					numSeries += 5
 				}
 				So(defs, ShouldHaveLength, numSeries)
@@ -258,7 +258,7 @@ func TestAddToWriteQueue(t *testing.T) {
 func TestFind(t *testing.T) {
 	ix := New()
 	initForTests(ix)
-	for _, s := range getMetricData(-1, 2, 5, 10, "metric.demo") {
+	for _, s := range getMetricData(idx.OrgIdPublic, 2, 5, 10, "metric.demo") {
 		ix.AddOrUpdate(s, 1)
 	}
 	for _, s := range getMetricData(1, 2, 5, 10, "metric.demo") {

idx/idx.go

@@ -13,6 +13,8 @@ import (
 	schema "gopkg.in/raintank/schema.v1"
 )
 
+const OrgIdPublic = -1
+
 var (
 	BothBranchAndLeaf  = errors.New("node can't be both branch and leaf")
 	BranchUnderLeaf    = errors.New("can't add branch under leaf")
@@ -118,7 +120,7 @@ type MetricIndex interface {
 
 	// Find searches the index.  The method is passed an OrgId, a query
 	// pattern and a unix timestamp. Searches should return all nodes that match for
-	// the given OrgId and OrgId -1.  The pattern should be handled in the same way
+	// the given OrgId and OrgIdPublic.  The pattern should be handled in the same way
 	// Graphite would. see https://graphite.readthedocs.io/en/latest/render_api.html#paths-and-wildcards
 	// And the unix stimestamp is used to ignore series that have been stale since
 	// the timestamp.

idx/memory/memory.go

@@ -836,15 +836,17 @@ func (m *MemoryIdx) Find(orgId int, pattern string, from int64) ([]idx.Node, err
 	if err != nil {
 		return nil, err
 	}
-	publicNodes, err := m.find(-1, pattern)
-	if err != nil {
-		return nil, err
+	if orgId != idx.OrgIdPublic {
+		publicNodes, err := m.find(idx.OrgIdPublic, pattern)
+		if err != nil {
+			return nil, err
+		}
+		matchedNodes = append(matchedNodes, publicNodes...)
 	}
-	matchedNodes = append(matchedNodes, publicNodes...)
 	log.Debug("memory-idx: %d nodes matching pattern %s found", len(matchedNodes), pattern)
 	results := make([]idx.Node, 0)
 	seen := make(map[string]struct{})
-	// if there are public (orgId -1) and private leaf nodes with the same series
+	// if there are public (orgId OrgIdPublic) and private leaf nodes with the same series
 	// path, then the public metricDefs will be excluded.
 	for _, n := range matchedNodes {
 		if _, ok := seen[n.Path]; !ok {

idx/memory/memory_test.go

@@ -86,7 +86,7 @@ func testGetAddKey(t *testing.T) {
 	ix := New()
 	ix.Init()
 
-	publicSeries := getMetricData(-1, 2, 5, 10, "metric.public", false)
+	publicSeries := getMetricData(idx.OrgIdPublic, 2, 5, 10, "metric.public", false)
 	org1Series := getMetricData(1, 2, 5, 10, "metric.org1", false)
 	org2Series := getMetricData(2, 2, 5, 10, "metric.org2", false)
 
@@ -99,7 +99,7 @@ func testGetAddKey(t *testing.T) {
 			Convey(fmt.Sprintf("Then listing metrics for OrgId %d", orgId), func() {
 				defs := ix.List(orgId)
 				numSeries := len(series)
-				if orgId != -1 {
+				if orgId != idx.OrgIdPublic {
 					numSeries += 5
 				}
 				So(defs, ShouldHaveLength, numSeries)
@@ -128,7 +128,7 @@ func TestFind(t *testing.T) {
 func testFind(t *testing.T) {
 	ix := New()
 	ix.Init()
-	for _, s := range getMetricData(-1, 2, 5, 10, "metric.demo", false) {
+	for _, s := range getMetricData(idx.OrgIdPublic, 2, 5, 10, "metric.demo", false) {
 		s.Time = 10 * 86400
 		ix.AddOrUpdate(s, 1)
 	}
@@ -256,7 +256,7 @@ func testDelete(t *testing.T) {
 	ix := New()
 	ix.Init()
 
-	publicSeries := getMetricData(-1, 2, 5, 10, "metric.public", false)
+	publicSeries := getMetricData(idx.OrgIdPublic, 2, 5, 10, "metric.public", false)
 	org1Series := getMetricData(1, 2, 5, 10, "metric.org1", false)
 
 	for _, s := range publicSeries {
@@ -271,7 +271,7 @@ func TestDeleteTagged(t *testing.T) {
 	ix := New()
 	ix.Init()
 
-	publicSeries := getMetricData(-1, 2, 5, 10, "metric.public", true)
+	publicSeries := getMetricData(idx.OrgIdPublic, 2, 5, 10, "metric.public", true)
 	org1Series := getMetricData(1, 2, 5, 10, "metric.org1", true)
 
 	for _, s := range publicSeries {