WIP

Author: qingyang-hu

internal/integration/unified/collection_operation_execution.go

@@ -433,6 +433,8 @@ func executeDeleteOne(ctx context.Context, operation *operation) (*operationResu
 			opts.SetHint(hint)
 		case "let":
 			opts.SetLet(val.Document())
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, fmt.Errorf("unrecognized deleteOne option %q", key)
 		}
@@ -487,6 +489,8 @@ func executeDeleteMany(ctx context.Context, operation *operation) (*operationRes
 			opts.SetHint(hint)
 		case "let":
 			opts.SetLet(val.Document())
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, fmt.Errorf("unrecognized deleteMany option %q", key)
 		}
@@ -545,6 +549,8 @@ func executeDistinct(ctx context.Context, operation *operation) (*operationResul
 			// ensured an analogue exists, extend "skippedTestDescriptions" to avoid
 			// this error.
 			return nil, fmt.Errorf("the maxTimeMS collection option is not supported")
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, fmt.Errorf("unrecognized distinct option %q", key)
 		}
@@ -842,6 +848,8 @@ func executeFindOneAndDelete(ctx context.Context, operation *operation) (*operat
 			opts.SetSort(val.Document())
 		case "let":
 			opts.SetLet(val.Document())
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, fmt.Errorf("unrecognized findOneAndDelete option %q", key)
 		}
@@ -924,6 +932,8 @@ func executeFindOneAndReplace(ctx context.Context, operation *operation) (*opera
 			opts.SetSort(val.Document())
 		case "upsert":
 			opts.SetUpsert(val.Boolean())
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, fmt.Errorf("unrecognized findOneAndReplace option %q", key)
 		}
@@ -1016,6 +1026,8 @@ func executeFindOneAndUpdate(ctx context.Context, operation *operation) (*operat
 			}
 		case "upsert":
 			opts.SetUpsert(val.Boolean())
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, fmt.Errorf("unrecognized findOneAndUpdate option %q", key)
 		}
@@ -1062,6 +1074,8 @@ func executeInsertMany(ctx context.Context, operation *operation) (*operationRes
 			documents = bsonutil.RawToInterfaces(bsonutil.RawArrayToDocuments(val.Array())...)
 		case "ordered":
 			opts.SetOrdered(val.Boolean())
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, fmt.Errorf("unrecognized insertMany option %q", key)
 		}
@@ -1112,6 +1126,8 @@ func executeInsertOne(ctx context.Context, operation *operation) (*operationResu
 			opts.SetBypassDocumentValidation(val.Boolean())
 		case "comment":
 			opts.SetComment(val)
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, fmt.Errorf("unrecognized insertOne option %q", key)
 		}
@@ -1302,6 +1318,8 @@ func executeReplaceOne(ctx context.Context, operation *operation) (*operationRes
 			opts.SetUpsert(val.Boolean())
 		case "let":
 			opts.SetLet(val.Document())
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, fmt.Errorf("unrecognized replaceOne option %q", key)
 		}

internal/integration/unified/crud_helpers.go

@@ -67,6 +67,8 @@ func createUpdateManyArguments(args bson.Raw) (*updateArguments, *options.Update
 			}
 		case "upsert":
 			opts.SetUpsert(val.Boolean())
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, nil, fmt.Errorf("unrecognized update option %q", key)
 		}
@@ -125,6 +127,8 @@ func createUpdateOneArguments(args bson.Raw) (*updateArguments, *options.UpdateO
 			opts.SetUpsert(val.Boolean())
 		case "sort":
 			opts.SetSort(val.Document())
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, nil, fmt.Errorf("unrecognized update option %q", key)
 		}

x/mongo/driver/operation/delete.go

@@ -140,7 +140,8 @@ func (d *Delete) command(dst []byte, desc description.SelectedServer) ([]byte, e
 	if d.let != nil {
 		dst = bsoncore.AppendDocumentElement(dst, "let", d.let)
 	}
-	if d.rawBucketsData != nil {
+	// Set rawData for 8.2+ servers.
+	if d.rawBucketsData != nil && desc.WireVersion != nil && driverutil.VersionRangeIncludes(*desc.WireVersion, 27) {
 		dst = bsoncore.AppendBooleanElement(dst, "rawData", *d.rawBucketsData)
 	}
 	return dst, nil

x/mongo/driver/operation/distinct.go

@@ -131,7 +131,8 @@ func (d *Distinct) command(dst []byte, desc description.SelectedServer) ([]byte,
 	if d.query != nil {
 		dst = bsoncore.AppendDocumentElement(dst, "query", d.query)
 	}
-	if d.rawBucketsData != nil {
+	// Set rawData for 8.2+ servers.
+	if d.rawBucketsData != nil && desc.WireVersion != nil && driverutil.VersionRangeIncludes(*desc.WireVersion, 27) {
 		dst = bsoncore.AppendBooleanElement(dst, "rawData", *d.rawBucketsData)
 	}
 	return dst, nil

x/mongo/driver/operation/find.go

@@ -192,7 +192,8 @@ func (f *Find) command(dst []byte, desc description.SelectedServer) ([]byte, err
 	if f.tailable != nil {
 		dst = bsoncore.AppendBooleanElement(dst, "tailable", *f.tailable)
 	}
-	if f.rawBucketsData != nil {
+	// Set rawData for 8.2+ servers.
+	if f.rawBucketsData != nil && desc.WireVersion != nil && driverutil.VersionRangeIncludes(*desc.WireVersion, 27) {
 		dst = bsoncore.AppendBooleanElement(dst, "rawData", *f.rawBucketsData)
 	}
 	return dst, nil

x/mongo/driver/operation/find_and_modify.go

@@ -212,7 +212,8 @@ func (fam *FindAndModify) command(dst []byte, desc description.SelectedServer) (
 	if fam.let != nil {
 		dst = bsoncore.AppendDocumentElement(dst, "let", fam.let)
 	}
-	if fam.rawBucketsData != nil {
+	// Set rawData for 8.2+ servers.
+	if fam.rawBucketsData != nil && desc.WireVersion != nil && driverutil.VersionRangeIncludes(*desc.WireVersion, 27) {
 		dst = bsoncore.AppendBooleanElement(dst, "rawData", *fam.rawBucketsData)
 	}
 

x/mongo/driver/operation/insert.go

@@ -133,7 +133,8 @@ func (i *Insert) command(dst []byte, desc description.SelectedServer) ([]byte, e
 	if i.ordered != nil {
 		dst = bsoncore.AppendBooleanElement(dst, "ordered", *i.ordered)
 	}
-	if i.rawBucketsData != nil {
+	// Set rawData for 8.2+ servers.
+	if i.rawBucketsData != nil && desc.WireVersion != nil && driverutil.VersionRangeIncludes(*desc.WireVersion, 27) {
 		dst = bsoncore.AppendBooleanElement(dst, "rawData", *i.rawBucketsData)
 	}
 	return dst, nil

x/mongo/driver/operation/update.go

@@ -204,7 +204,8 @@ func (u *Update) command(dst []byte, desc description.SelectedServer) ([]byte, e
 	if u.let != nil {
 		dst = bsoncore.AppendDocumentElement(dst, "let", u.let)
 	}
-	if u.rawBucketsData != nil {
+	// Set rawData for 8.2+ servers.
+	if u.rawBucketsData != nil && desc.WireVersion != nil && driverutil.VersionRangeIncludes(*desc.WireVersion, 27) {
 		dst = bsoncore.AppendBooleanElement(dst, "rawData", *u.rawBucketsData)
 	}