GODRIVER-3522 Add support for the rawData option for time-series bucket access.

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "specifications"]
 	path = testdata/specifications
-	url = https://github.com/mongodb/specifications
+	url = https://github.com/qingyang-hu/specifications.git
+	branch = drivers3064

internal/integration/unified/collection_operation_execution.go

@@ -1500,6 +1500,8 @@ func createFindCursor(ctx context.Context, operation *operation) (*cursorResult,
 		case "maxAwaitTimeMS":
 			maxAwaitTimeMS := time.Duration(val.Int32()) * time.Millisecond
 			opts.SetMaxAwaitTime(maxAwaitTimeMS)
+		case "rawData":
+			opts.SetRawBucketsData(val.Boolean())
 		default:
 			return nil, fmt.Errorf("unrecognized find option %q", key)
 		}

mongo/bulk_write.go

@@ -39,6 +39,7 @@ type bulkWrite struct {
 	writeConcern             *writeconcern.WriteConcern
 	result                   BulkWriteResult
 	let                      interface{}
+	rawBucketsData           *bool
 }
 
 func (bw *bulkWrite) execute(ctx context.Context) error {
@@ -209,6 +210,10 @@ func (bw *bulkWrite) runInsert(ctx context.Context, batch bulkWriteBatch) (opera
 	}
 	op = op.Retry(retry)
 
+	if bw.rawBucketsData != nil {
+		op.RawBucketsData(*bw.rawBucketsData)
+	}
+
 	err := op.Execute(ctx)
 
 	return op.Result(), err
@@ -282,6 +287,10 @@ func (bw *bulkWrite) runDelete(ctx context.Context, batch bulkWriteBatch) (opera
 	}
 	op = op.Retry(retry)
 
+	if bw.rawBucketsData != nil {
+		op.RawBucketsData(*bw.rawBucketsData)
+	}
+
 	err := op.Execute(ctx)
 
 	return op.Result(), err
@@ -415,6 +424,10 @@ func (bw *bulkWrite) runUpdate(ctx context.Context, batch bulkWriteBatch) (opera
 	}
 	op = op.Retry(retry)
 
+	if bw.rawBucketsData != nil {
+		op.RawBucketsData(*bw.rawBucketsData)
+	}
+
 	err := op.Execute(ctx)
 
 	return op.Result(), err

mongo/client.go

@@ -956,6 +956,7 @@ func (c *Client) BulkWrite(ctx context.Context, writes []ClientBulkWrite,
 		client:                   c,
 		selector:                 selector,
 		writeConcern:             wc,
+		rawBucketsData:           bwo.RawBucketsData,
 	}
 	if bwo.VerboseResults == nil || !(*bwo.VerboseResults) {
 		op.errorsOnly = true

mongo/client_bulk_write.go

@@ -44,6 +44,7 @@ type clientBulkWrite struct {
 	client                   *Client
 	selector                 description.ServerSelector
 	writeConcern             *writeconcern.WriteConcern
+	rawBucketsData           *bool
 
 	result ClientBulkWriteResult
 }
@@ -143,6 +144,9 @@ func (bw *clientBulkWrite) newCommand() func([]byte, description.SelectedServer)
 			}
 			dst = bsoncore.AppendDocumentElement(dst, "let", let)
 		}
+		if bw.rawBucketsData != nil {
+			dst = bsoncore.AppendBooleanElement(dst, "rawData", *bw.rawBucketsData)
+		}
 		return dst, nil
 	}
 }

mongo/collection.go

@@ -244,6 +244,7 @@ func (coll *Collection) BulkWrite(ctx context.Context, models []WriteModel,
 		selector:                 selector,
 		writeConcern:             wc,
 		let:                      args.Let,
+		rawBucketsData:           args.RawBucketsData,
 	}
 
 	err = op.execute(ctx)
@@ -324,6 +325,9 @@ func (coll *Collection) insert(
 	if args.Ordered != nil {
 		op = op.Ordered(*args.Ordered)
 	}
+	if args.RawBucketsData != nil {
+		op = op.RawBucketsData(*args.RawBucketsData)
+	}
 	retry := driver.RetryNone
 	if coll.client.retryWrites {
 		retry = driver.RetryOncePerCommand
@@ -375,6 +379,9 @@ func (coll *Collection) InsertOne(ctx context.Context, document interface{},
 	if args.Comment != nil {
 		imOpts.SetComment(args.Comment)
 	}
+	if args.RawBucketsData != nil {
+		imOpts = imOpts.SetRawBucketsData(*args.RawBucketsData)
+	}
 	res, err := coll.insert(ctx, []interface{}{document}, imOpts)
 
 	rr, err := processWriteError(err)
@@ -534,6 +541,9 @@ func (coll *Collection) delete(
 		}
 		op = op.Let(let)
 	}
+	if args.RawBucketsData != nil {
+		op = op.RawBucketsData(*args.RawBucketsData)
+	}
 
 	// deleteMany cannot be retried
 	retryMode := driver.RetryNone
@@ -571,10 +581,11 @@ func (coll *Collection) DeleteOne(
 		return nil, fmt.Errorf("failed to construct options from builder: %w", err)
 	}
 	deleteOptions := &options.DeleteManyOptions{
-		Collation: args.Collation,
-		Comment:   args.Comment,
-		Hint:      args.Hint,
-		Let:       args.Let,
+		Collation:      args.Collation,
+		Comment:        args.Comment,
+		Hint:           args.Hint,
+		Let:            args.Let,
+		RawBucketsData: args.RawBucketsData,
 	}
 
 	return coll.delete(ctx, filter, true, rrOne, deleteOptions)
@@ -681,6 +692,9 @@ func (coll *Collection) updateOrReplace(
 		}
 		op = op.Comment(comment)
 	}
+	if args.RawBucketsData != nil {
+		op = op.RawBucketsData(*args.RawBucketsData)
+	}
 	retry := driver.RetryNone
 	// retryable writes are only enabled updateOne/replaceOne operations
 	if !multi && coll.client.retryWrites {
@@ -775,6 +789,7 @@ func (coll *Collection) UpdateOne(
 		Hint:                     args.Hint,
 		Upsert:                   args.Upsert,
 		Let:                      args.Let,
+		RawBucketsData:           args.RawBucketsData,
 	}
 
 	return coll.updateOrReplace(ctx, f, update, false, rrOne, true, args.Sort, updateOptions)
@@ -865,6 +880,7 @@ func (coll *Collection) ReplaceOne(
 		Hint:                     args.Hint,
 		Let:                      args.Let,
 		Comment:                  args.Comment,
+		RawBucketsData:           args.RawBucketsData,
 	}
 
 	return coll.updateOrReplace(ctx, f, r, false, rrOne, false, args.Sort, updateOptions)
@@ -1036,6 +1052,9 @@ func aggregate(a aggregateParams, opts ...options.Lister[options.AggregateOption
 		}
 		op.CustomOptions(customOptions)
 	}
+	if args.RawBucketsData != nil {
+		op = op.RawBucketsData(*args.RawBucketsData)
+	}
 
 	retry := driver.RetryNone
 	if a.retryRead && !hasOutputStage {
@@ -1124,6 +1143,9 @@ func (coll *Collection) CountDocuments(ctx context.Context, filter interface{},
 		}
 		op.Hint(hintVal)
 	}
+	if args.RawBucketsData != nil {
+		op = op.RawBucketsData(*args.RawBucketsData)
+	}
 	retry := driver.RetryNone
 	if coll.client.retryReads {
 		retry = driver.RetryOncePerCommand
@@ -1205,6 +1227,9 @@ func (coll *Collection) EstimatedDocumentCount(
 		}
 		op = op.Comment(comment)
 	}
+	if args.RawBucketsData != nil {
+		op = op.RawBucketsData(*args.RawBucketsData)
+	}
 
 	retry := driver.RetryNone
 	if coll.client.retryReads {
@@ -1294,6 +1319,9 @@ func (coll *Collection) Distinct(
 		}
 		op.Hint(hint)
 	}
+	if args.RawBucketsData != nil {
+		op = op.RawBucketsData(*args.RawBucketsData)
+	}
 	retry := driver.RetryNone
 	if coll.client.retryReads {
 		retry = driver.RetryOncePerCommand
@@ -1497,6 +1525,9 @@ func (coll *Collection) find(
 		}
 		op.Sort(sort)
 	}
+	if args.RawBucketsData != nil {
+		op = op.RawBucketsData(*args.RawBucketsData)
+	}
 	retry := driver.RetryNone
 	if coll.client.retryReads {
 		retry = driver.RetryOncePerCommand
@@ -1530,6 +1561,7 @@ func newFindArgsFromFindOneArgs(args *options.FindOneOptions) *options.FindOptio
 		v.ShowRecordID = args.ShowRecordID
 		v.Skip = args.Skip
 		v.Sort = args.Sort
+		v.RawBucketsData = args.RawBucketsData
 	}
 	return v
 }
@@ -1692,6 +1724,9 @@ func (coll *Collection) FindOneAndDelete(
 		}
 		op = op.Let(let)
 	}
+	if args.RawBucketsData != nil {
+		op = op.RawBucketsData(*args.RawBucketsData)
+	}
 
 	return coll.findAndModify(ctx, op)
 }
@@ -1789,6 +1824,9 @@ func (coll *Collection) FindOneAndReplace(
 		}
 		op = op.Let(let)
 	}
+	if args.RawBucketsData != nil {
+		op = op.RawBucketsData(*args.RawBucketsData)
+	}
 
 	return coll.findAndModify(ctx, op)
 }
@@ -1898,6 +1936,9 @@ func (coll *Collection) FindOneAndUpdate(
 		}
 		op = op.Let(let)
 	}
+	if args.RawBucketsData != nil {
+		op = op.RawBucketsData(*args.RawBucketsData)
+	}
 
 	return coll.findAndModify(ctx, op)
 }

mongo/options/aggregateoptions.go

@@ -26,6 +26,7 @@ type AggregateOptions struct {
 	Hint                     interface{}
 	Let                      interface{}
 	Custom                   bson.M
+	RawBucketsData           *bool
 }
 
 // AggregateOptionsBuilder contains options to configure aggregate operations.
@@ -163,3 +164,15 @@ func (ao *AggregateOptionsBuilder) SetCustom(c bson.M) *AggregateOptionsBuilder
 
 	return ao
 }
+
+// SetRawBucketsData sets the value for the RawBucketsData field. If true, it allows the CRUD operations to access timeseries
+// collections on the bucket-level. This option is only valid for MongoDB versions >= 9.0. The default value is false.
+func (ao *AggregateOptionsBuilder) SetRawBucketsData(rawBucketsData bool) *AggregateOptionsBuilder {
+	ao.Opts = append(ao.Opts, func(opts *AggregateOptions) error {
+		opts.RawBucketsData = &rawBucketsData
+
+		return nil
+	})
+
+	return ao
+}

mongo/options/bulkwriteoptions.go

@@ -18,6 +18,7 @@ type BulkWriteOptions struct {
 	Comment                  interface{}
 	Ordered                  *bool
 	Let                      interface{}
+	RawBucketsData           *bool
 }
 
 // BulkWriteOptionsBuilder contains options to configure bulk write operations.
@@ -92,3 +93,15 @@ func (b *BulkWriteOptionsBuilder) SetLet(let interface{}) *BulkWriteOptionsBuild
 
 	return b
 }
+
+// SetRawBucketsData sets the value for the RawBucketsData field. If true, it allows the CRUD operations to access timeseries
+// collections on the bucket-level. This option is only valid for MongoDB versions >= 9.0. The default value is false.
+func (b *BulkWriteOptionsBuilder) SetRawBucketsData(rawBucketsData bool) *BulkWriteOptionsBuilder {
+	b.Opts = append(b.Opts, func(opts *BulkWriteOptions) error {
+		opts.RawBucketsData = &rawBucketsData
+
+		return nil
+	})
+
+	return b
+}

mongo/options/clientbulkwriteoptions.go

@@ -19,6 +19,7 @@ type ClientBulkWriteOptions struct {
 	Ordered                  *bool
 	Let                      interface{}
 	WriteConcern             *writeconcern.WriteConcern
+	RawBucketsData           *bool
 	VerboseResults           *bool
 }
 
@@ -108,6 +109,18 @@ func (b *ClientBulkWriteOptionsBuilder) SetWriteConcern(wc *writeconcern.WriteCo
 	return b
 }
 
+// SetRawBucketsData sets the value for the RawBucketsData field. If true, it allows the CRUD operations to access timeseries
+// collections on the bucket-level. This option is only valid for MongoDB versions >= 9.0. The default value is false.
+func (b *ClientBulkWriteOptionsBuilder) SetRawBucketsData(rawBucketsData bool) *ClientBulkWriteOptionsBuilder {
+	b.Opts = append(b.Opts, func(opts *ClientBulkWriteOptions) error {
+		opts.RawBucketsData = &rawBucketsData
+
+		return nil
+	})
+
+	return b
+}
+
 // SetVerboseResults sets the value for the VerboseResults field. Specifies whether detailed
 // results for each successful operation should be included in the returned BulkWriteResult.
 // The defaults value is false.

mongo/options/countoptions.go

@@ -11,11 +11,12 @@ package options
 //
 // See corresponding setter methods for documentation.
 type CountOptions struct {
-	Collation *Collation
-	Comment   interface{}
-	Hint      interface{}
-	Limit     *int64
-	Skip      *int64
+	Collation      *Collation
+	Comment        interface{}
+	Hint           interface{}
+	Limit          *int64
+	Skip           *int64
+	RawBucketsData *bool
 }
 
 // CountOptionsBuilder contains options to configure count operations. Each
@@ -99,3 +100,15 @@ func (co *CountOptionsBuilder) SetSkip(i int64) *CountOptionsBuilder {
 
 	return co
 }
+
+// SetRawBucketsData sets the value for the RawBucketsData field. If true, it allows the CRUD operations to access timeseries
+// collections on the bucket-level. This option is only valid for MongoDB versions >= 9.0. The default value is false.
+func (co *CountOptionsBuilder) SetRawBucketsData(rawBucketsData bool) *CountOptionsBuilder {
+	co.Opts = append(co.Opts, func(opts *CountOptions) error {
+		opts.RawBucketsData = &rawBucketsData
+
+		return nil
+	})
+
+	return co
+}