refactor: propose id

Signed-off-by: LingKa <cnfty786@gmail.com>
xline-kv · Jan 11, 2024 · c1fb0e4 · c1fb0e4
1 parent b1a87f6
commit c1fb0e4
Show file tree

Hide file tree

Showing 15 changed files with 81 additions and 135 deletions.
diff --git a/client/auth.go b/client/auth.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/xline-kv/go-xline/api/xline"
+	"github.com/xline-kv/go-xline/api/gen/xline"
 	"golang.org/x/crypto/pbkdf2"
 )
 
@@ -488,11 +488,7 @@ func (c *authClient) RoleRevokePermission(role string, key, rangeEnd []byte) (*A
 
 // Send request using fast path
 func (c *authClient) handleReq(req *xlineapi.RequestWithToken, useFastPath bool) (*proposeRes, error) {
-	pid, err := c.curpClient.GenProposeID()
-	if err != nil {
-		return nil, err
-	}
-	cmd := xlineapi.Command{Request: req, ProposeId: pid}
+	cmd := xlineapi.Command{Request: req}
 
 	if useFastPath {
 		res, err := c.curpClient.Propose(&cmd, true)

diff --git a/client/client.go b/client/client.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"math/rand"
 
-	"github.com/xline-kv/go-xline/api/xline"
+	"github.com/xline-kv/go-xline/api/gen/xline"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )

diff --git a/client/cluster.go b/client/cluster.go
@@ -17,7 +17,7 @@ package client
 import (
 	"context"
 
-	"github.com/xline-kv/go-xline/api/xline"
+	"github.com/xline-kv/go-xline/api/gen/xline"
 	"google.golang.org/grpc"
 )
 

diff --git a/client/compare.go b/client/compare.go
@@ -14,7 +14,7 @@
 
 package client
 
-import "github.com/xline-kv/go-xline/api/xline"
+import "github.com/xline-kv/go-xline/api/gen/xline"
 
 type CompareTarget int
 type CompareResult int

diff --git a/client/error.go b/client/error.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	xlineapi "github.com/xline-kv/go-xline/api/xline"
+	"github.com/xline-kv/go-xline/api/gen/xline"
 )
 
 type CommandError struct {

diff --git a/client/kv.go b/client/kv.go
@@ -14,7 +14,7 @@
 
 package client
 
-import "github.com/xline-kv/go-xline/api/xline"
+import "github.com/xline-kv/go-xline/api/gen/xline"
 
 type KV interface {
 	// Put puts a key-value pair into xline.
@@ -77,19 +77,16 @@ func NewKV(curpClient Curp, token string) KV {
 // Put a key-value into the store
 func (c *kvClient) Put(key, val []byte, opts ...OpOption) (*PutResponse, error) {
 	op := OpPut(key, val, opts...)
+	// TODO: buildOpFromOp
 	krs := []*xlineapi.KeyRange{op.toKeyRange()}
 	req := xlineapi.RequestWithToken{
 		Token: &c.token,
 		RequestWrapper: &xlineapi.RequestWithToken_PutRequest{
 			PutRequest: op.toPutReq(),
 		},
 	}
-	pid, err := c.curpClient.GenProposeID()
-	if err != nil {
-		return nil, err
-	}
-	cmd := xlineapi.Command{Keys: krs, Request: &req, ProposeId: pid}
-	res, err := c.curpClient.Propose(&cmd, true)
+	cmd := &xlineapi.Command{Keys: krs, Request: &req}
+	res, err := c.curpClient.Propose(cmd, true)
 	if err != nil {
 		return nil, err
 	}
@@ -99,18 +96,15 @@ func (c *kvClient) Put(key, val []byte, opts ...OpOption) (*PutResponse, error)
 // Range a range of keys from the store
 func (c *kvClient) Range(key []byte, opt ...OpOption) (*RangeResponse, error) {
 	op := OpRange(key, opt...)
+	// TODO: buildOpFromOp
 	krs := []*xlineapi.KeyRange{op.toKeyRange()}
 	req := xlineapi.RequestWithToken{
 		Token: &c.token,
 		RequestWrapper: &xlineapi.RequestWithToken_RangeRequest{
 			RangeRequest: op.toRangeReq(),
 		},
 	}
-	pid, err := c.curpClient.GenProposeID()
-	if err != nil {
-		return nil, err
-	}
-	cmd := xlineapi.Command{Keys: krs, Request: &req, ProposeId: pid}
+	cmd := xlineapi.Command{Keys: krs, Request: &req}
 	res, err := c.curpClient.Propose(&cmd, true)
 	if err != nil {
 		return nil, err
@@ -121,18 +115,15 @@ func (c *kvClient) Range(key []byte, opt ...OpOption) (*RangeResponse, error) {
 // Delete a range of keys from the store
 func (c *kvClient) Delete(key string, opts ...OpOption) (*DeleteResponse, error) {
 	op := OpDelete(key, opts...)
+	// TODO: buildOpFromOp
 	krs := []*xlineapi.KeyRange{op.toKeyRange()}
 	req := xlineapi.RequestWithToken{
 		Token: &c.token,
 		RequestWrapper: &xlineapi.RequestWithToken_DeleteRangeRequest{
 			DeleteRangeRequest: op.toDeleteReq(),
 		},
 	}
-	pid, err := c.curpClient.GenProposeID()
-	if err != nil {
-		return nil, err
-	}
-	cmd := xlineapi.Command{Keys: krs, Request: &req, ProposeId: pid}
+	cmd := xlineapi.Command{Keys: krs, Request: &req}
 	res, err := c.curpClient.Propose(&cmd, false)
 	if err != nil {
 		return nil, err
@@ -152,17 +143,14 @@ func (c *kvClient) Txn() Txn {
 func (c *kvClient) Compact(rev int64, opts ...OpOption) (*CompactResponse, error) {
 	r := OpCompact(rev, opts...).toCompactReq()
 	useFastPath := r.Physical
+	// TODO: buildOpFromOp
 	req := xlineapi.RequestWithToken{
 		Token: &c.token,
 		RequestWrapper: &xlineapi.RequestWithToken_CompactionRequest{
 			CompactionRequest: r,
 		},
 	}
-	pid, err := c.curpClient.GenProposeID()
-	if err != nil {
-		return nil, err
-	}
-	cmd := xlineapi.Command{Request: &req, ProposeId: pid}
+	cmd := xlineapi.Command{Request: &req}
 	res, err := c.curpClient.Propose(&cmd, useFastPath)
 	if err != nil {
 		return nil, err

diff --git a/client/lease.go b/client/lease.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/xline-kv/go-xline/api/xline"
+	"github.com/xline-kv/go-xline/api/gen/xline"
 	"github.com/xline-kv/go-xline/xlog"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
@@ -101,11 +101,7 @@ func (c *leaseClient) Grant(ttl int64, opts ...LeaseOption) (*LeaseGrantResponse
 			LeaseGrantRequest: request,
 		},
 	}
-	pid, err := c.curpClient.GenProposeID()
-	if err != nil {
-		return nil, err
-	}
-	cmd := xlineapi.Command{Request: &requestWithToken, ProposeId: pid}
+	cmd := xlineapi.Command{Request: &requestWithToken}
 
 	res, err := c.curpClient.Propose(&cmd, true)
 	if err != nil {
@@ -122,11 +118,7 @@ func (c *leaseClient) Revoke(id int64) (*LeaseRevokeResponse, error) {
 			LeaseRevokeRequest: &xlineapi.LeaseRevokeRequest{ID: id},
 		},
 	}
-	pid, err := c.curpClient.GenProposeID()
-	if err != nil {
-		return nil, err
-	}
-	cmd := xlineapi.Command{Request: &requestWithToken, ProposeId: pid}
+	cmd := xlineapi.Command{Request: &requestWithToken}
 
 	res, err := c.curpClient.Propose(&cmd, true)
 	if err != nil {
@@ -213,11 +205,7 @@ func (c *leaseClient) Leases() (*LeaseLeasesResponse, error) {
 			LeaseLeasesRequest: &xlineapi.LeaseLeasesRequest{},
 		},
 	}
-	pid, err := c.curpClient.GenProposeID()
-	if err != nil {
-		return nil, err
-	}
-	cmd := xlineapi.Command{Request: &requestWithToken, ProposeId: pid}
+	cmd := xlineapi.Command{Request: &requestWithToken}
 
 	res, err := c.curpClient.Propose(&cmd, true)
 	if err != nil {

diff --git a/client/lock.go b/client/lock.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/xline-kv/go-xline/api/xline"
+	"github.com/xline-kv/go-xline/api/gen/xline"
 	"github.com/xline-kv/go-xline/xlog"
 	"go.uber.org/zap"
 )
@@ -69,13 +69,8 @@ func (c *lockClient) lockInner(
 			TxnRequest: &txn,
 		},
 	}
-	pid, err := c.curpClient.GenProposeID()
-	if err != nil {
-		return nil, err
-	}
 	cmd := xlineapi.Command{
-		Request:   &requestWithToken,
-		ProposeId: pid,
+		Request: &requestWithToken,
 	}
 	res, err := c.curpClient.Propose(&cmd, false)
 	if err != nil {
@@ -108,11 +103,7 @@ func (c *lockClient) lockInner(
 				RangeRequest: &rangeReq,
 			},
 		}
-		pid, err := c.curpClient.GenProposeID()
-		if err != nil {
-			return nil, err
-		}
-		cmd := xlineapi.Command{Request: &requestWithToken, ProposeId: pid}
+		cmd := xlineapi.Command{Request: &requestWithToken}
 
 		res, err := c.curpClient.Propose(&cmd, true)
 		if err == nil {
@@ -240,11 +231,7 @@ func (c *lockClient) waitDelete(pfx string, myRev int64) {
 				RangeRequest: &getReq,
 			},
 		}
-		pid, err := c.curpClient.GenProposeID()
-		if err != nil {
-			return
-		}
-		cmd := xlineapi.Command{Request: &requestWithToken, ProposeId: pid}
+		cmd := xlineapi.Command{Request: &requestWithToken}
 
 		res, err := c.curpClient.Propose(&cmd, false)
 		if err != nil {
@@ -297,11 +284,7 @@ func (c *lockClient) deleteKey(key []byte) (*xlineapi.ResponseHeader, error) {
 			DeleteRangeRequest: &delReq,
 		},
 	}
-	pid, err := c.curpClient.GenProposeID()
-	if err != nil {
-		return nil, err
-	}
-	cmd := xlineapi.Command{Request: &requestWithToken, ProposeId: pid}
+	cmd := xlineapi.Command{Request: &requestWithToken}
 
 	res, err := c.curpClient.Propose(&cmd, true)
 	if err != nil {

diff --git a/client/maintenance.go b/client/maintenance.go
@@ -3,7 +3,7 @@ package client
 import (
 	"context"
 
-	"github.com/xline-kv/go-xline/api/xline"
+	"github.com/xline-kv/go-xline/api/gen/xline"
 	"google.golang.org/grpc"
 )
 

diff --git a/client/op.go b/client/op.go
@@ -14,7 +14,7 @@
 
 package client
 
-import "github.com/xline-kv/go-xline/api/xline"
+import "github.com/xline-kv/go-xline/api/gen/xline"
 
 // Op represents an Operation that kv can execute.
 type Op struct {