fixes

Author: qingyang-hu

internal/integration/unified/bulkwrite_helpers.go

@@ -103,11 +103,7 @@ func createBulkWriteModel(rawModel bson.Raw) (mongo.WriteModel, error) {
 					return nil, fmt.Errorf("error creating update: %w", err)
 				}
 			case "sort":
-				sort, err := createSort(val)
-				if err != nil {
-					return nil, fmt.Errorf("error creating sort: %w", err)
-				}
-				uom.SetSort(sort)
+				uom.SetSort(val.Document())
 			case "upsert":
 				uom.SetUpsert(val.Boolean())
 			default:
@@ -256,11 +252,7 @@ func createBulkWriteModel(rawModel bson.Raw) (mongo.WriteModel, error) {
 				}
 				rom.SetHint(hint)
 			case "sort":
-				sort, err := createSort(val)
-				if err != nil {
-					return nil, fmt.Errorf("error creating sort: %w", err)
-				}
-				rom.SetSort(sort)
+				rom.SetSort(val.Document())
 			case "replacement":
 				replacement = val.Document()
 			case "upsert":

internal/integration/unified/collection_operation_execution.go

@@ -1292,11 +1292,7 @@ func executeReplaceOne(ctx context.Context, operation *operation) (*operationRes
 			}
 			opts.SetHint(hint)
 		case "sort":
-			sort, err := createSort(val)
-			if err != nil {
-				return nil, fmt.Errorf("error creating sort: %w", err)
-			}
-			opts.SetSort(sort)
+			opts.SetSort(val.Document())
 		case "replacement":
 			replacement = val.Document()
 		case "upsert":

internal/integration/unified/crud_helpers.go

@@ -214,15 +214,3 @@ func createHint(val bson.RawValue) (interface{}, error) {
 	}
 	return hint, nil
 }
-
-func createSort(val bson.RawValue) (interface{}, error) {
-	var sort interface{}
-
-	switch val.Type {
-	case bson.TypeEmbeddedDocument:
-		sort = val.Document()
-	default:
-		return nil, fmt.Errorf("unrecognized sort value type %s", val.Type)
-	}
-	return sort, nil
-}

mongo/bulk_write_models.go

@@ -178,7 +178,7 @@ func (rom *ReplaceOneModel) SetUpsert(upsert bool) *ReplaceOneModel {
 // matched by the sort order will be replaced. This option is only valid for MongoDB versions >= 8.0. The driver will
 // return an error if the sort parameter is a multi-key map. The default value is nil.
 func (rom *ReplaceOneModel) SetSort(sort interface{}) *ReplaceOneModel {
-	rom.Sort = &sort
+	rom.Sort = sort
 	return rom
 }