Skip to content

Commit d1c21b1

Browse files
timothy-kim-mongotimothy-kim-mongo
committed
GODRIVER-2701 PR Changes
1 parent 5cefa42 commit d1c21b1

File tree

4 files changed

+144
-146
lines changed

4 files changed

+144
-146
lines changed

‎mongo/index_view.go‎

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -403,42 +403,20 @@ func (iv IndexView) drop(ctx context.Context, index any, opts ...*options.DropIn
403403

404404
// TODO(GODRIVER-3038): This operation should pass CSE to the DropIndexes
405405
// Crypt setter to be applied to the operation.
406+
op := operation.NewDropIndexes(index).Session(sess).WriteConcern(wc).CommandMonitor(iv.coll.client.monitor).
407+
ServerSelector(selector).ClusterClock(iv.coll.client.clock).
408+
Database(iv.coll.db.name).Collection(iv.coll.name).
409+
Deployment(iv.coll.client.deployment).ServerAPI(iv.coll.client.serverAPI).
410+
Timeout(iv.coll.client.timeout).MaxTime(dio.MaxTime)
406411

407-
var results operation.DropIndexesResult
408-
409-
switch indexVal := index.(type) {
410-
case string:
411-
// Convert index to string
412-
op := operation.NewDropIndexes(indexVal).Session(sess).WriteConcern(wc).CommandMonitor(iv.coll.client.monitor).
413-
ServerSelector(selector).ClusterClock(iv.coll.client.clock).
414-
Database(iv.coll.db.name).Collection(iv.coll.name).
415-
Deployment(iv.coll.client.deployment).ServerAPI(iv.coll.client.serverAPI).
416-
Timeout(iv.coll.client.timeout).MaxTime(dio.MaxTime)
417-
err = op.Execute(ctx)
418-
if err != nil {
419-
return nil, replaceErrors(err)
420-
}
421-
results = op.Result()
422-
case bsoncore.Document:
423-
// Convert index to bsoncore.Document
424-
op := operation.NewDropIndexes(indexVal).Session(sess).WriteConcern(wc).CommandMonitor(iv.coll.client.monitor).
425-
ServerSelector(selector).ClusterClock(iv.coll.client.clock).
426-
Database(iv.coll.db.name).Collection(iv.coll.name).
427-
Deployment(iv.coll.client.deployment).ServerAPI(iv.coll.client.serverAPI).
428-
Timeout(iv.coll.client.timeout).MaxTime(dio.MaxTime)
429-
err = op.Execute(ctx)
430-
if err != nil {
431-
return nil, replaceErrors(err)
432-
}
433-
results = op.Result()
434-
default:
435-
// Handle unexpected type
436-
return nil, ErrInvalidIndexType
412+
err = op.Execute(ctx)
413+
if err != nil {
414+
return nil, replaceErrors(err)
437415
}
438416

439417
// TODO: it's weird to return a bson.Raw here because we have to convert the result back to BSON
440418
ridx, res := bsoncore.AppendDocumentStart(nil)
441-
res = bsoncore.AppendInt32Element(res, "nIndexesWas", results.NIndexesWas)
419+
res = bsoncore.AppendInt32Element(res, "nIndexesWas", op.Result().NIndexesWas)
442420
res, _ = bsoncore.AppendDocumentEnd(res, ridx)
443421
return res, nil
444422
}
@@ -462,12 +440,12 @@ func (iv IndexView) DropOne(ctx context.Context, name string, opts ...*options.D
462440
return iv.drop(ctx, name, opts...)
463441
}
464442

465-
// DropKeyOne executes a dropIndexes operation to drop an index on the collection. If the operation succeeds, this returns
443+
// DropWithKey executes a dropIndexes operation to drop an index on the collection. If the operation succeeds, this returns
466444
// a BSON document in the form {nIndexesWas: <int32>}. The "nIndexesWas" field in the response contains the number of
467445
// indexes that existed prior to the drop.
468446
//
469447
// The key parameter should be the keySpecDocument of the index to drop.
470-
func (iv IndexView) DropKeyOne(ctx context.Context, keySpecDocument interface{}, opts ...*options.DropIndexesOptions) (bson.Raw, error) {
448+
func (iv IndexView) DropWithKey(ctx context.Context, keySpecDocument interface{}, opts ...*options.DropIndexesOptions) (bson.Raw, error) {
471449
doc, err := marshal(keySpecDocument, iv.coll.bsonOpts, iv.coll.registry)
472450
if err != nil {
473451
return nil, err

‎mongo/integration/index_view_test.go‎

Lines changed: 96 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/google/go-cmp/cmp"
1616
"go.mongodb.org/mongo-driver/bson"
1717
"go.mongodb.org/mongo-driver/internal/assert"
18+
"go.mongodb.org/mongo-driver/internal/require"
1819
"go.mongodb.org/mongo-driver/mongo"
1920
"go.mongodb.org/mongo-driver/mongo/integration/mtest"
2021
"go.mongodb.org/mongo-driver/mongo/options"
@@ -607,36 +608,109 @@ func TestIndexView(t *testing.T) {
607608
}
608609
assert.Nil(mt, cursor.Err(), "cursor error: %v", cursor.Err())
609610
})
610-
mt.Run("dropKey one", func(mt *mtest.T) {
611-
iv := mt.Coll.Indexes()
612-
indexNames, err := iv.CreateMany(context.Background(), []mongo.IndexModel{
611+
mt.Run("drop with key", func(mt *mtest.T) {
612+
tests := []struct {
613+
name string
614+
models []mongo.IndexModel
615+
index any
616+
}{
613617
{
614-
Keys: bson.Raw(bsoncore.NewDocumentBuilder().AppendInt32("_id", 1).Build()),
618+
name: "custom index name and unique indexes",
619+
models: []mongo.IndexModel{
620+
{
621+
Keys: bson.D{{"_id", 1}},
622+
},
623+
{
624+
Keys: bson.D{{"username", 1}},
625+
Options: options.Index().SetUnique(true).SetName("myidx"),
626+
},
627+
},
628+
index: bson.D{{"username", 1}},
615629
},
616630
{
617-
Keys: bson.Raw(bsoncore.NewDocumentBuilder().AppendInt32("username", 1).Build()),
618-
Options: options.Index().SetUnique(true).SetName("myidx"),
631+
name: "normal generated index name",
632+
models: []mongo.IndexModel{
633+
{
634+
Keys: bson.D{{"_id", 1}},
635+
},
636+
{
637+
Keys: bson.D{{"foo", -1}},
638+
},
639+
},
640+
index: bson.D{{"foo", -1}},
641+
},
642+
{
643+
name: "compound index",
644+
models: []mongo.IndexModel{
645+
{
646+
Keys: bson.D{{"_id", 1}},
647+
},
648+
{
649+
Keys: bson.D{{"foo", 1}, {"bar", 1}},
650+
},
651+
},
652+
index: bson.D{{"foo", 1}, {"bar", 1}},
653+
},
654+
/*{
655+
name: "clustered indexes",
656+
models: []mongo.IndexModel{
657+
{
658+
Keys: bson.Raw(bsoncore.NewDocumentBuilder().AppendInt32("foo", 1).Build()),
659+
},
660+
{
661+
Keys: map[string]interface{}{"key": bson.D{{"_id", 1}}},
662+
},
663+
},
664+
index: map[string]interface{}{"key": bson.D{{"_id", 1}}},
665+
},*/
666+
{
667+
name: "text index",
668+
models: []mongo.IndexModel{
669+
{
670+
Keys: bson.D{{"_id", 1}},
671+
},
672+
{
673+
Keys: bson.D{{"plot", "text"}},
674+
},
675+
},
676+
index: map[string]interface{}{"_fts": "text", "_ftsx": 1},
677+
//index: map[string]interface{}{"plot": "text"},
619678
},
620-
})
621-
622-
key := map[string]interface{}{
623-
"username": 1,
624679
}
625-
assert.Nil(mt, err, "CreateMany error: %v", err)
626-
assert.Equal(mt, 2, len(indexNames), "expected 2 index names, got %v", len(indexNames))
627680

628-
_, err = iv.DropKeyOne(context.Background(), key)
629-
assert.Nil(mt, err, "DropOne error: %v", err)
681+
for _, test := range tests {
682+
mt.Run(test.name, func(mt *mtest.T) {
683+
iv := mt.Coll.Indexes()
684+
indexNames, err := iv.CreateMany(context.Background(), test.models)
630685

631-
cursor, err := iv.List(context.Background())
632-
assert.Nil(mt, err, "List error: %v", err)
633-
for cursor.Next(context.Background()) {
634-
var idx index
635-
err = cursor.Decode(&idx)
636-
assert.Nil(mt, err, "Decode error: %v (document %v)", err, cursor.Current)
637-
assert.NotEqual(mt, indexNames[1], idx.Name, "found index %v after dropping", indexNames[1])
686+
assert.NoError(mt, err)
687+
assert.Equal(mt, 2, len(indexNames), "expected 2 index names, got %v", len(indexNames))
688+
689+
// List existing indexes
690+
cursor, err := mt.Coll.Indexes().List(context.Background())
691+
require.NoError(t, err)
692+
693+
var indexes []bson.M
694+
err = cursor.All(context.Background(), &indexes)
695+
require.NoError(t, err)
696+
697+
t.Logf("Existing indexes: %v", indexes)
698+
//////
699+
700+
_, err = iv.DropWithKey(context.Background(), test.index)
701+
assert.Nil(mt, err, "DropOne error: %v", err)
702+
703+
cursor, err = iv.List(context.Background())
704+
assert.Nil(mt, err, "List error: %v", err)
705+
for cursor.Next(context.Background()) {
706+
var idx index
707+
err = cursor.Decode(&idx)
708+
assert.Nil(mt, err, "Decode error: %v (document %v)", err, cursor.Current)
709+
assert.NotEqual(mt, indexNames[1], idx.Name, "found index %v after dropping", indexNames[1])
710+
}
711+
assert.Nil(mt, cursor.Err(), "cursor error: %v", cursor.Err())
712+
})
638713
}
639-
assert.Nil(mt, cursor.Err(), "cursor error: %v", cursor.Err())
640714
})
641715
mt.Run("drop all", func(mt *mtest.T) {
642716
iv := mt.Coll.Indexes()

‎mongo/integration/main.go‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)