remove special case idx.List(-1)

there is never a need to list data across ALL orgs in one request

Author: Dieterbe

idx/idx.go

@@ -124,7 +124,7 @@ type MetricIndex interface {
 	// the timestamp.
 	Find(int, string, int64) ([]Node, error)
 
-	// List returns all Archives for the passed OrgId, or for all organisations if -1 is provided.
+	// List returns all Archives for the passed OrgId and the public orgId
 	List(int) []Archive
 
 	// Prune deletes all metrics that haven't been seen since the given timestamp.

idx/memory/memory.go

@@ -977,26 +977,11 @@ func (m *MemoryIdx) List(orgId int) []idx.Archive {
 	m.RLock()
 	defer m.RUnlock()
 
-	orgs := make(map[int]struct{})
-	if orgId == -1 {
-		log.Info("memory-idx: returning all metricDefs for all orgs")
-		for org := range m.tree {
-			orgs[org] = struct{}{}
-		}
-		for org := range m.tags {
-			orgs[org] = struct{}{}
-		}
-	} else {
-		orgs[-1] = struct{}{}
-		orgs[orgId] = struct{}{}
-	}
-
 	defs := make([]idx.Archive, 0)
 	for _, def := range m.defById {
-		if _, ok := orgs[def.OrgId]; !ok {
-			continue
+		if def.OrgId == orgId || def.OrgId == idx.OrgIdPublic {
+			defs = append(defs, *def)
 		}
-		defs = append(defs, *def)
 	}
 
 	statListDuration.Value(time.Since(pre))

idx/memory/memory_test.go

@@ -506,7 +506,7 @@ func TestPruneTaggedSeries(t *testing.T) {
 	}
 
 	Convey("after populating index", t, func() {
-		defs := ix.List(-1)
+		defs := ix.List(1)
 		So(defs, ShouldHaveLength, 10)
 	})
 
@@ -523,7 +523,7 @@ func TestPruneTaggedSeries(t *testing.T) {
 	})
 
 	Convey("after purge", t, func() {
-		defs := ix.List(-1)
+		defs := ix.List(1)
 		So(defs, ShouldHaveLength, 5)
 		data := &schema.MetricData{
 			Name:     defs[0].Name,
@@ -638,7 +638,7 @@ func testPrune(t *testing.T) {
 		ix.AddOrUpdate(d, 1)
 	}
 	Convey("after populating index", t, func() {
-		defs := ix.List(-1)
+		defs := ix.List(1)
 		So(defs, ShouldHaveLength, 10)
 	})
 	Convey("When purging old series", t, func() {
@@ -654,7 +654,7 @@ func testPrune(t *testing.T) {
 
 	})
 	Convey("after purge", t, func() {
-		defs := ix.List(-1)
+		defs := ix.List(1)
 		So(defs, ShouldHaveLength, 5)
 		data := &schema.MetricData{
 			Name:     defs[0].Name,