Merge pull request #32 from blacktear23/rain-dev

Update kvql version

Author: c4pt0r

go.mod

@@ -5,7 +5,7 @@ go 1.21.1
 require (
 	github.com/AlecAivazis/survey/v2 v2.2.16
 	github.com/abiosoft/ishell v2.0.0+incompatible
-	github.com/c4pt0r/kvql v0.0.0-20240430104934-7b545befa94b
+	github.com/c4pt0r/kvql v0.0.0-20240509061143-2e732b17190f
 	github.com/c4pt0r/log v0.0.0-20211004143616-aa6380016a47
 	github.com/fatih/color v1.12.0
 	github.com/magiconair/properties v1.8.0

go.sum

@@ -54,8 +54,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
-github.com/c4pt0r/kvql v0.0.0-20240430104934-7b545befa94b h1:Jq0/cYshzIxkmMinqo/8HpCFI/vNnWrIDOoozT7Hkwg=
-github.com/c4pt0r/kvql v0.0.0-20240430104934-7b545befa94b/go.mod h1:ksAcL0FG13v+9UVAznpGjkIh2yB3qUSkgoNR4aPrl9w=
+github.com/c4pt0r/kvql v0.0.0-20240509061143-2e732b17190f h1:v83DkTOSXdNJBi3iZIIfrlh5SXxA/MXGM+lBP5EWOX8=
+github.com/c4pt0r/kvql v0.0.0-20240509061143-2e732b17190f/go.mod h1:ksAcL0FG13v+9UVAznpGjkIh2yB3qUSkgoNR4aPrl9w=
 github.com/c4pt0r/log v0.0.0-20211004143616-aa6380016a47 h1:I7bb8MbleLvoW6scHXngCQaroNa9slYTaYOaQEsv2TQ=
 github.com/c4pt0r/log v0.0.0-20211004143616-aa6380016a47/go.mod h1:N78ACK7UQq5KjTLWQPw2A7UuzX712vN9akunb8ydlck=
 github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5 h1:BjkPE3785EwPhhyuFkbINB+2a1xATwk8SNDWnJiD41g=

kvcmds/cmd_explain.go

@@ -3,8 +3,8 @@ package kvcmds
 import (
 	"context"
 
-	"github.com/c4pt0r/tcli"
 	"github.com/c4pt0r/kvql"
+	"github.com/c4pt0r/tcli"
 	"github.com/c4pt0r/tcli/client"
 	"github.com/c4pt0r/tcli/query"
 	"github.com/c4pt0r/tcli/utils"
@@ -41,7 +41,7 @@ func (c ExplainCmd) Handler() func(ctx context.Context) {
 				return nil
 			}
 			sql := getQueryString(ic)
-			qtxn := query.NewQueryTxn(client.GetTiKVClient())
+			qtxn := query.NewQueryStorage(client.GetTiKVClient())
 			opt := kvql.NewOptimizer(sql)
 			plan, err := opt.BuildPlan(qtxn)
 			if err != nil {

kvcmds/cmd_query.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 
 	"github.com/abiosoft/ishell"
+	"github.com/c4pt0r/kvql"
 	"github.com/c4pt0r/tcli"
 	"github.com/c4pt0r/tcli/client"
-	"github.com/c4pt0r/kvql"
 	"github.com/c4pt0r/tcli/query"
 	"github.com/c4pt0r/tcli/utils"
 )
@@ -79,7 +79,7 @@ func (c QueryCmd) Handler() func(ctx context.Context) {
 				return nil
 			}
 			sql := getQueryString(ic)
-			qtxn := query.NewQueryTxn(client.GetTiKVClient())
+			qtxn := query.NewQueryStorage(client.GetTiKVClient())
 			opt := kvql.NewOptimizer(sql)
 			plan, err := opt.BuildPlan(qtxn)
 			if err != nil {

query/query_txn.go

@@ -12,22 +12,22 @@ import (
 )
 
 var (
-	_ kvql.Txn    = (*queryTxn)(nil)
-	_ kvql.Cursor = (*queryCursor)(nil)
+	_ kvql.Storage = (*queryStorage)(nil)
+	_ kvql.Cursor  = (*queryCursor)(nil)
 )
 
-type queryTxn struct {
+type queryStorage struct {
 	client client.Client
 }
 
-func NewQueryTxn(client client.Client) kvql.Txn {
-	return &queryTxn{
+func NewQueryStorage(client client.Client) kvql.Storage {
+	return &queryStorage{
 		client: client,
 	}
 }
 
-func (t *queryTxn) Get(key []byte) ([]byte, error) {
-	kv, err := t.client.Get(context.TODO(), client.Key(key))
+func (s *queryStorage) Get(key []byte) ([]byte, error) {
+	kv, err := s.client.Get(context.TODO(), client.Key(key))
 	if err != nil {
 		if err.Error() == "not exist" {
 			return nil, nil
@@ -37,41 +37,41 @@ func (t *queryTxn) Get(key []byte) ([]byte, error) {
 	return kv.V, nil
 }
 
-func (t *queryTxn) Put(key []byte, value []byte) error {
-	return t.client.Put(context.TODO(), client.KV{K: key, V: value})
+func (s *queryStorage) Put(key []byte, value []byte) error {
+	return s.client.Put(context.TODO(), client.KV{K: key, V: value})
 }
 
-func (t *queryTxn) BatchPut(kvs []kvql.KVPair) error {
-	var kvs2 []client.KV
-	for _, kv := range kvs {
-		kvs2 = append(kvs2, client.KV{K: kv.Key, V: kv.Value})
+func (s *queryStorage) BatchPut(kvs []kvql.KVPair) error {
+	tkvs := make([]client.KV, len(kvs))
+	for i, kv := range kvs {
+		tkvs[i] = client.KV{K: kv.Key, V: kv.Value}
 	}
-	return t.client.BatchPut(context.TODO(), kvs2)
+	return s.client.BatchPut(context.TODO(), tkvs)
 }
 
-func (t *queryTxn) Delete(key []byte) error {
-	return t.client.Delete(context.TODO(), key)
+func (s *queryStorage) Delete(key []byte) error {
+	return s.client.Delete(context.TODO(), key)
 }
 
-func (t *queryTxn) BatchDelete(keys [][]byte) error {
-	var kvs []client.KV
-	for _, k := range keys {
-		kvs = append(kvs, client.KV{K: k})
+func (s *queryStorage) BatchDelete(keys [][]byte) error {
+	tkvs := make([]client.KV, len(keys))
+	for i, key := range keys {
+		tkvs[i] = client.KV{K: key}
 	}
-	return t.client.BatchDelete(context.TODO(), kvs)
+	return s.client.BatchDelete(context.TODO(), tkvs)
 }
 
-func (t *queryTxn) Cursor() (kvql.Cursor, error) {
+func (s *queryStorage) Cursor() (kvql.Cursor, error) {
 	return &queryCursor{
-		txn:     t,
+		storage: s,
 		batch:   nil,
 		prefix:  []byte{},
 		iterPos: 0,
 	}, nil
 }
 
 type queryCursor struct {
-	txn         *queryTxn
+	storage     *queryStorage
 	batch       client.KVS
 	batchSize   int
 	prefix      []byte
@@ -86,7 +86,7 @@ func (c *queryCursor) loadBatch() error {
 	scanOpt.Set(tcli.ScanOptCountOnly, "false")
 	scanOpt.Set(tcli.ScanOptStrictPrefix, "false")
 	qctx := utils.ContextWithProp(context.TODO(), scanOpt)
-	kvs, n, err := c.txn.client.Scan(qctx, c.prefix)
+	kvs, n, err := c.storage.client.Scan(qctx, c.prefix)
 	if err != nil {
 		return err
 	}