crud: replace usage of optional types in crud with go-option

fixed #492

Author: New year

crud/insert.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/vmihailenco/msgpack/v5"
-    "github.com/tarantool/go-option"
 	"github.com/tarantool/go-tarantool/v3"
 )
 

crud/optional_adapter.go

@@ -2,6 +2,7 @@ package crud
 
 import (
 	"github.com/vmihailenco/msgpack/v5"
+	"github.com/tarantool/go-option"
 )
 
 const (
@@ -27,25 +28,25 @@ const (
 )
 
 // OptUint is an optional uint. Old local optional type. 
-type OptUint struct {
+/* type OptUint struct {
 	value uint
 	exist bool
-}
+} */
 
 // MakeOptUint creates an optional uint from value.
-func MakeOptUint(value uint) OptUint {
+/* func MakeOptUint(value uint) OptUint {
 	return OptUint{
 		value: value,
 		exist: true,
 	}
-}
+} */
 
-// Get returns the integer value or an error if not present.
+/* // Get returns the integer value or an error if not present.
 func (opt OptUint) Get() (uint, bool) {
-	return opt.value, opt.exist
+	return opt.value, opt.exist // Method Get() from go-options is same.
 }
-
-// OptInt is an optional int.
+ */
+/* // OptInt is an optional int.
 type OptInt struct {
 	value int
 	exist bool
@@ -119,10 +120,10 @@ func MakeOptBool(value bool) OptBool {
 // Get returns the boolean value or an error if not present.
 func (opt OptBool) Get() (bool, bool) {
 	return opt.value, opt.exist
-}
+} */
 
 // OptTuple is an optional tuple.
-type OptTuple struct {
+/* type OptTuple struct {
 	tuple interface{}
 }
 
@@ -135,15 +136,18 @@ func MakeOptTuple(tuple interface{}) OptTuple {
 func (o *OptTuple) Get() (interface{}, bool) {
 	return o.tuple, o.tuple != nil
 }
+ */
 
+ // Defining an alias for Generic[interface{}] to replace OptTuple
+ type OptAny = option.Generic[interface{}]
 // BaseOpts describes base options for CRUD operations.
 type BaseOpts struct {
 	// Timeout is a `vshard.call` timeout and vshard
 	// master discovery timeout (in seconds).
-	Timeout OptFloat64
+	Timeout option.Float64
 	// VshardRouter is cartridge vshard group name or
 	// vshard router instance.
-	VshardRouter OptString
+	VshardRouter option.String
 }
 
 // EncodeMsgpack provides custom msgpack encoder.
@@ -164,22 +168,22 @@ func (opts BaseOpts) EncodeMsgpack(enc *msgpack.Encoder) error {
 type SimpleOperationOpts struct {
 	// Timeout is a `vshard.call` timeout and vshard
 	// master discovery timeout (in seconds).
-	Timeout OptFloat64
+	Timeout option.Float64
 	// VshardRouter is cartridge vshard group name or
 	// vshard router instance.
-	VshardRouter OptString
+	VshardRouter option.String
 	// Fields is field names for getting only a subset of fields.
-	Fields OptTuple
+	Fields OptAny
 	// BucketId is a bucket ID.
-	BucketId OptUint
+	BucketId option.Uint64
 	// FetchLatestMetadata guarantees the up-to-date metadata (space format)
 	// in first return value, otherwise it may not take into account
 	// the latest migration of the data format. Performance overhead is up to 15%.
 	// Disabled by default.
-	FetchLatestMetadata OptBool
+	FetchLatestMetadata option.Bool
 	// Noreturn suppresses successfully processed data (first return value is `nil`).
 	// Disabled by default.
-	Noreturn OptBool
+	Noreturn option.Bool
 }
 
 // EncodeMsgpack provides custom msgpack encoder.
@@ -191,7 +195,7 @@ func (opts SimpleOperationOpts) EncodeMsgpack(enc *msgpack.Encoder) error {
 		noreturnOptName}
 	values := [optsCnt]interface{}{}
 	exists := [optsCnt]bool{}
-	values[0], exists[0] = opts.Timeout.Get()
+	values[0], exists[0] = opts.Timeout.Get() // Method Get() from go-options is same.
 	values[1], exists[1] = opts.VshardRouter.Get()
 	values[2], exists[2] = opts.Fields.Get()
 	values[3], exists[3] = opts.BucketId.Get()
@@ -206,25 +210,25 @@ func (opts SimpleOperationOpts) EncodeMsgpack(enc *msgpack.Encoder) error {
 type SimpleOperationObjectOpts struct {
 	// Timeout is a `vshard.call` timeout and vshard
 	// master discovery timeout (in seconds).
-	Timeout OptFloat64
+	Timeout option.Float64
 	// VshardRouter is cartridge vshard group name or
 	// vshard router instance.
-	VshardRouter OptString
+	VshardRouter option.String
 	// Fields is field names for getting only a subset of fields.
-	Fields OptTuple
+	Fields OptAny
 	// BucketId is a bucket ID.
-	BucketId OptUint
+	BucketId option.Unit64
 	// SkipNullabilityCheckOnFlatten is a parameter to allow
 	// setting null values to non-nullable fields.
-	SkipNullabilityCheckOnFlatten OptBool
+	SkipNullabilityCheckOnFlatten option.Bool
 	// FetchLatestMetadata guarantees the up-to-date metadata (space format)
 	// in first return value, otherwise it may not take into account
 	// the latest migration of the data format. Performance overhead is up to 15%.
 	// Disabled by default.
-	FetchLatestMetadata OptBool
+	FetchLatestMetadata option.Bool
 	// Noreturn suppresses successfully processed data (first return value is `nil`).
 	// Disabled by default.
-	Noreturn OptBool
+	Noreturn option.Bool
 }
 
 // EncodeMsgpack provides custom msgpack encoder.