Remove type from upload/deviceDataSets indexes.

Author: lostlevels

data/store/mongo/mongo_data_set.go

@@ -33,17 +33,14 @@ func (d *DataSetRepository) EnsureIndexes() error {
 			Keys: bson.D{
 				{Key: "_userId", Value: 1},
 				{Key: "_active", Value: 1},
-				{Key: "type", Value: 1},
 				{Key: "time", Value: -1},
 			},
 			Options: options.Index().
-				SetBackground(true).
 				SetName("UserIdTypeWeighted_v2"),
 		},
 		{
 			Keys: bson.D{
 				{Key: "origin.id", Value: 1},
-				{Key: "type", Value: 1},
 				{Key: "deletedTime", Value: -1},
 				{Key: "_active", Value: 1},
 			},
@@ -59,15 +56,14 @@ func (d *DataSetRepository) EnsureIndexes() error {
 				SetUnique(true).
 				SetName("UniqueUploadId"),
 		},
+		// TODO UploadId and UniqueUploadId is always unique in deviceDataSets so remove one or the other.
 		{
 			Keys: bson.D{
 				{Key: "uploadId", Value: 1},
-				{Key: "type", Value: 1},
 				{Key: "deletedTime", Value: -1},
 				{Key: "_active", Value: 1},
 			},
 			Options: options.Index().
-				SetBackground(true).
 				SetName("UploadId"),
 		},
 		{
@@ -79,14 +75,25 @@ func (d *DataSetRepository) EnsureIndexes() error {
 				{Key: "_deduplicator.hash", Value: 1},
 			},
 			Options: options.Index().
-				SetBackground(true).
 				SetPartialFilterExpression(bson.D{
 					{Key: "_active", Value: true},
 					{Key: "_deduplicator.hash", Value: bson.D{{Key: "$exists", Value: true}}},
 					{Key: "deviceId", Value: bson.D{{Key: "$exists", Value: true}}},
 				}).
 				SetName("DeduplicatorHash"),
 		},
+		{
+			Keys: bson.D{
+				{Key: "_userId", Value: 1},
+				{Key: "_active", Value: 1},
+				{Key: "client.name", Value: 1},
+			},
+			Options: options.Index().
+				SetPartialFilterExpression(bson.D{
+					{Key: "client.name", Value: bson.D{{Key: "$exists", Value: true}}},
+				}).
+				SetName("ClientName"),
+		},
 	})
 }
 
@@ -260,7 +267,6 @@ func (d *DataSetRepository) ListUserDataSets(ctx context.Context, userID string,
 	selector := bson.M{
 		"_active": true,
 		"_userId": userID,
-		"type":    "upload",
 	}
 	if filter.ClientName != nil {
 		selector["client.name"] = *filter.ClientName
@@ -314,7 +320,6 @@ func (d *DataSetRepository) GetDataSetsForUserByID(ctx context.Context, userID s
 	selector := bson.M{
 		"_active": true,
 		"_userId": userID,
-		"type":    "upload",
 	}
 	if !filter.Deleted {
 		selector["deletedTime"] = bson.M{"$exists": false}