WIP

Author: qingyang-hu

mongo/client.go

@@ -426,8 +426,6 @@ func (c *Client) StartSession(opts ...*options.SessionOptions) (Session, error)
 		return nil, replaceErrors(err)
 	}
 
-	// Writes are not retryable on standalones, so let operation determine whether to retry
-	sess.RetryWrite = false
 	sess.RetryRead = c.retryReads
 
 	return &sessionImpl{

mongo/client_bulk_write.go

@@ -27,7 +27,7 @@ import (
 
 // bulkWrite performs a bulkwrite operation
 type clientBulkWrite struct {
-	models                   []interface{}
+	models                   []clientWriteModel
 	errorsOnly               bool
 	ordered                  *bool
 	bypassDocumentValidation *bool
@@ -46,11 +46,12 @@ func (bw *clientBulkWrite) execute(ctx context.Context) error {
 		return errors.New("empty write models")
 	}
 	batches := &modelBatches{
-		session: bw.session,
-		client:  bw.client,
-		ordered: bw.ordered,
-		models:  bw.models,
-		result:  &bw.result,
+		session:   bw.session,
+		client:    bw.client,
+		ordered:   bw.ordered,
+		models:    bw.models,
+		result:    &bw.result,
+		retryMode: driver.RetryOnce,
 	}
 	err := driver.Operation{
 		CommandFn:         bw.newCommand(),
@@ -142,7 +143,7 @@ type modelBatches struct {
 	client  *Client
 
 	ordered *bool
-	models  []interface{}
+	models  []clientWriteModel
 
 	offset int
 
@@ -222,17 +223,14 @@ func (mb *modelBatches) appendBatches(fn functionSet, dst []byte, maxCount, maxD
 	mb.newIDMap = make(map[int]interface{})
 
 	nsMap := make(map[string]int)
-	getNsIndex := func(namespace string) (int, bsoncore.Document) {
-		idx, doc := bsoncore.AppendDocumentStart(nil)
-		doc = bsoncore.AppendStringElement(doc, "ns", namespace)
-		doc, _ = bsoncore.AppendDocumentEnd(doc, idx)
-
-		if v, ok := nsMap[namespace]; ok {
-			return v, doc
+	getNsIndex := func(namespace string) (int, bool) {
+		v, ok := nsMap[namespace]
+		if ok {
+			return v, ok
 		}
 		nsIdx := len(nsMap)
 		nsMap[namespace] = nsIdx
-		return nsIdx, doc
+		return nsIdx, ok
 	}
 
 	canRetry := true
@@ -249,12 +247,13 @@ func (mb *modelBatches) appendBatches(fn functionSet, dst []byte, maxCount, maxD
 			break
 		}
 
-		var nsIdx int
-		var ns, doc bsoncore.Document
+		ns := mb.models[i].namespace
+		nsIdx, exists := getNsIndex(ns)
+
+		var doc bsoncore.Document
 		var err error
-		switch model := mb.models[i].(type) {
+		switch model := mb.models[i].model.(type) {
 		case *ClientInsertOneModel:
-			nsIdx, ns = getNsIndex(model.Namespace)
 			mb.cursorHandlers[i] = mb.appendInsertResult
 			var id interface{}
 			id, doc, err = (&clientInsertDoc{
@@ -266,7 +265,6 @@ func (mb *modelBatches) appendBatches(fn functionSet, dst []byte, maxCount, maxD
 			}
 			mb.newIDMap[i] = id
 		case *ClientUpdateOneModel:
-			nsIdx, ns = getNsIndex(model.Namespace)
 			mb.cursorHandlers[i] = mb.appendUpdateResult
 			doc, err = (&clientUpdateDoc{
 				namespace:      nsIdx,
@@ -281,7 +279,6 @@ func (mb *modelBatches) appendBatches(fn functionSet, dst []byte, maxCount, maxD
 			}).marshal(mb.client.bsonOpts, mb.client.registry)
 		case *ClientUpdateManyModel:
 			canRetry = false
-			nsIdx, ns = getNsIndex(model.Namespace)
 			mb.cursorHandlers[i] = mb.appendUpdateResult
 			doc, err = (&clientUpdateDoc{
 				namespace:      nsIdx,
@@ -295,7 +292,6 @@ func (mb *modelBatches) appendBatches(fn functionSet, dst []byte, maxCount, maxD
 				checkDollarKey: true,
 			}).marshal(mb.client.bsonOpts, mb.client.registry)
 		case *ClientReplaceOneModel:
-			nsIdx, ns = getNsIndex(model.Namespace)
 			mb.cursorHandlers[i] = mb.appendUpdateResult
 			doc, err = (&clientUpdateDoc{
 				namespace:      nsIdx,
@@ -309,7 +305,6 @@ func (mb *modelBatches) appendBatches(fn functionSet, dst []byte, maxCount, maxD
 				checkDollarKey: false,
 			}).marshal(mb.client.bsonOpts, mb.client.registry)
 		case *ClientDeleteOneModel:
-			nsIdx, ns = getNsIndex(model.Namespace)
 			mb.cursorHandlers[i] = mb.appendDeleteResult
 			doc, err = (&clientDeleteDoc{
 				namespace: nsIdx,
@@ -320,7 +315,6 @@ func (mb *modelBatches) appendBatches(fn functionSet, dst []byte, maxCount, maxD
 			}).marshal(mb.client.bsonOpts, mb.client.registry)
 		case *ClientDeleteManyModel:
 			canRetry = false
-			nsIdx, ns = getNsIndex(model.Namespace)
 			mb.cursorHandlers[i] = mb.appendDeleteResult
 			doc, err = (&clientDeleteDoc{
 				namespace: nsIdx,
@@ -343,7 +337,12 @@ func (mb *modelBatches) appendBatches(fn functionSet, dst []byte, maxCount, maxD
 		}
 
 		dst = fn.appendDocument(dst, strconv.Itoa(n), doc)
-		nsDst = fn.appendDocument(nsDst, strconv.Itoa(n), ns)
+		if !exists {
+			idx, doc := bsoncore.AppendDocumentStart(nil)
+			doc = bsoncore.AppendStringElement(doc, "ns", ns)
+			doc, _ = bsoncore.AppendDocumentEnd(doc, idx)
+			nsDst = fn.appendDocument(nsDst, strconv.Itoa(n), doc)
+		}
 		n++
 	}
 	if n == 0 {
@@ -356,7 +355,7 @@ func (mb *modelBatches) appendBatches(fn functionSet, dst []byte, maxCount, maxD
 
 	mb.retryMode = driver.RetryNone
 	if mb.client.retryWrites && canRetry {
-		mb.retryMode = driver.RetryOncePerCommand
+		mb.retryMode = driver.RetryOnce
 	}
 	return n, dst, nil
 }
@@ -430,7 +429,7 @@ func (mb *modelBatches) processResponse(ctx context.Context, resp bsoncore.Docum
 		if int(cur.Idx) >= len(mb.cursorHandlers) {
 			continue
 		}
-		ok = ok && mb.cursorHandlers[int(cur.Idx)](&cur, cursor.Current)
+		ok = mb.cursorHandlers[int(cur.Idx)](&cur, cursor.Current) && ok
 	}
 	err = cursor.Err()
 	if err != nil {
@@ -456,32 +455,51 @@ func (mb *modelBatches) processResponse(ctx context.Context, resp bsoncore.Docum
 }
 
 func (mb *modelBatches) appendDeleteResult(cur *cursorInfo, raw bson.Raw) bool {
+	if err := cur.extractError(); err != nil {
+		err.Raw = raw
+		if mb.writeErrors == nil {
+			mb.writeErrors = make(map[int]WriteError)
+		}
+		mb.writeErrors[int(cur.Idx)] = *err
+		return false
+	}
+
 	if mb.result.DeleteResults == nil {
 		mb.result.DeleteResults = make(map[int]ClientDeleteResult)
 	}
 	mb.result.DeleteResults[int(cur.Idx)] = ClientDeleteResult{int64(cur.N)}
+
+	return true
+}
+
+func (mb *modelBatches) appendInsertResult(cur *cursorInfo, raw bson.Raw) bool {
 	if err := cur.extractError(); err != nil {
 		err.Raw = raw
+		if mb.writeErrors == nil {
+			mb.writeErrors = make(map[int]WriteError)
+		}
 		mb.writeErrors[int(cur.Idx)] = *err
 		return false
 	}
-	return true
-}
 
-func (mb *modelBatches) appendInsertResult(cur *cursorInfo, raw bson.Raw) bool {
 	if mb.result.InsertResults == nil {
 		mb.result.InsertResults = make(map[int]ClientInsertResult)
 	}
 	mb.result.InsertResults[int(cur.Idx)] = ClientInsertResult{mb.newIDMap[int(cur.Idx)]}
+
+	return true
+}
+
+func (mb *modelBatches) appendUpdateResult(cur *cursorInfo, raw bson.Raw) bool {
 	if err := cur.extractError(); err != nil {
 		err.Raw = raw
+		if mb.writeErrors == nil {
+			mb.writeErrors = make(map[int]WriteError)
+		}
 		mb.writeErrors[int(cur.Idx)] = *err
 		return false
 	}
-	return true
-}
 
-func (mb *modelBatches) appendUpdateResult(cur *cursorInfo, raw bson.Raw) bool {
 	if mb.result.UpdateResults == nil {
 		mb.result.UpdateResults = make(map[int]ClientUpdateResult)
 	}
@@ -495,11 +513,7 @@ func (mb *modelBatches) appendUpdateResult(cur *cursorInfo, raw bson.Raw) bool {
 		result.UpsertedID = cur.Upserted.ID
 	}
 	mb.result.UpdateResults[int(cur.Idx)] = result
-	if err := cur.extractError(); err != nil {
-		err.Raw = raw
-		mb.writeErrors[int(cur.Idx)] = *err
-		return false
-	}
+
 	return true
 }