WIP

Author: qingyang-hu

internal/integration/unified/collection_operation_execution.go

@@ -125,6 +125,8 @@ func executeBulkWrite(ctx context.Context, operation *operation) (*operationResu
 			}
 		case "let":
 			opts.SetLet(val.Document())
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, fmt.Errorf("unrecognized bulkWrite option %q", key)
 		}
@@ -202,6 +204,8 @@ func executeCountDocuments(ctx context.Context, operation *operation) (*operatio
 			return nil, fmt.Errorf("the maxTimeMS collection option is not supported")
 		case "skip":
 			opts.SetSkip(int64(val.Int32()))
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, fmt.Errorf("unrecognized countDocuments option %q", key)
 		}
@@ -696,6 +700,8 @@ func executeEstimatedDocumentCount(ctx context.Context, operation *operation) (*
 			// 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 estimatedDocumentCount option %q", key)
 		}

x/mongo/driver/operation/aggregate.go

@@ -160,7 +160,8 @@ func (a *Aggregate) command(dst []byte, desc description.SelectedServer) ([]byte
 	if a.let != nil {
 		dst = bsoncore.AppendDocumentElement(dst, "let", a.let)
 	}
-	if a.rawBucketsData != nil {
+	// Set rawData for 8.2+ servers.
+	if a.rawBucketsData != nil && desc.WireVersion != nil && driverutil.VersionRangeIncludes(*desc.WireVersion, 27) {
 		dst = bsoncore.AppendBooleanElement(dst, "rawData", *a.rawBucketsData)
 	}
 	for optionName, optionValue := range a.customOptions {

x/mongo/driver/operation/count.go

@@ -140,15 +140,16 @@ func (c *Count) Execute(ctx context.Context) error {
 	return err
 }
 
-func (c *Count) command(dst []byte, _ description.SelectedServer) ([]byte, error) {
+func (c *Count) command(dst []byte, desc description.SelectedServer) ([]byte, error) {
 	dst = bsoncore.AppendStringElement(dst, "count", c.collection)
 	if c.query != nil {
 		dst = bsoncore.AppendDocumentElement(dst, "query", c.query)
 	}
 	if c.comment.Type != bsoncore.Type(0) {
 		dst = bsoncore.AppendValueElement(dst, "comment", c.comment)
 	}
-	if c.rawBucketsData != nil {
+	// Set rawData for 8.2+ servers.
+	if c.rawBucketsData != nil && desc.WireVersion != nil && driverutil.VersionRangeIncludes(*desc.WireVersion, 27) {
 		dst = bsoncore.AppendBooleanElement(dst, "rawData", *c.rawBucketsData)
 	}
 	return dst, nil