.github/workflows/tag-subpkg.yml

@@ -0,0 +1,39 @@
+name: Tag Prefix Workflow
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  tag-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "GitHub Actions"
+
+      - name: Push Additional Tags with Dynamic Prefixes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          ORIGINAL_TAG=${GITHUB_REF#refs/tags/}
+          # Find directories containing go.mod, extract directory names, and push tags with these names as prefixes
+          find . -maxdepth 2 -type f -name "go.mod" | while read -r line; do
+            DIR_NAME=$(dirname "$line")
+            PREFIX=${DIR_NAME#"./"} # Remove leading "./"
+          
+            # Check if PREFIX is not empty and not the root directory
+            if [[ -n "$PREFIX" && "$PREFIX" != "." ]]; then
+              NEW_TAG="${PREFIX}/${ORIGINAL_TAG}"
+              echo "Creating and pushing tag: $NEW_TAG"
+              git tag $NEW_TAG $ORIGINAL_TAG
+              git push origin $NEW_TAG
+            else
+              echo "Skipping root directory"
+            fi
+          done

NOTICE

@@ -1,2 +1,2 @@
 rueidis
-Copyright 2021 Rueian (https://github.com/rueian)
+Copyright 2024 Rueian (https://github.com/rueian)

README.md

@@ -452,21 +452,6 @@ client.Do(ctx, client.B().FtSearch().Index("idx").Query("@f:v").Build()).AsFtSea
 client.Do(ctx, client.B().Geosearch().Key("k").Fromlonlat(1, 1).Bybox(1).Height(1).Km().Build()).AsGeosearch()
 ```
 
-## Supporting Go mod 1.18
-
-To support the old Go 1.18 at least until Go 1.21 comes, there will be a special build tagged with `-go1.18` for each release.
-
-Such releases remove `RedisResult.AsBytes()` and other related functionalities provided by later go versions.
-
-```
-# go.mod
-module mymodule
-
-go 1.18
-
-require github.com/redis/rueidis v1.0.27-go1.18
-```
-
 ## Contributing
 
 Contributions are welcome, including [issues](https://github.com/redis/rueidis/issues), [pull requests](https://github.com/redis/rueidis/pulls), and [discussions](https://github.com/redis/rueidis/discussions).

go.mod

@@ -2,15 +2,6 @@ module github.com/redis/rueidis
 
 go 1.20
 
-require (
-	github.com/oklog/ulid/v2 v2.1.0
-	go.opentelemetry.io/otel v1.21.0
-	go.opentelemetry.io/otel/metric v1.21.0
-	go.opentelemetry.io/otel/sdk v1.21.0
-	go.opentelemetry.io/otel/sdk/metric v1.21.0
-	go.opentelemetry.io/otel/trace v1.21.0
-)
-
 require (
 	github.com/onsi/ginkgo/v2 v2.12.1
 	github.com/onsi/gomega v1.28.0
@@ -20,7 +11,6 @@ require (
 
 require (
 	github.com/go-logr/logr v1.3.0 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect

go.sum

@@ -2,11 +2,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
 github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
@@ -20,28 +17,15 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/oklog/ulid/v2 v2.1.0 h1:+9lhoxAP56we25tyYETBBY1YLA2SaoLvUFgrP2miPJU=
-github.com/oklog/ulid/v2 v2.1.0/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
 github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA=
 github.com/onsi/ginkgo/v2 v2.12.1/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
 github.com/onsi/gomega v1.28.0 h1:i2rg/p9n/UqIDAMFUJ6qIUUMcsqOuUHgbpbu235Vr1c=
 github.com/onsi/gomega v1.28.0/go.mod h1:A1H2JE76sI14WIP57LMKj7FVfCHx3g3BcZVjJG8bjX8=
-github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
-go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
-go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
-go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
-go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
-go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
-go.opentelemetry.io/otel/sdk/metric v1.21.0 h1:smhI5oD714d6jHE6Tie36fPx4WDFIg+Y6RfAY4ICcR0=
-go.opentelemetry.io/otel/sdk/metric v1.21.0/go.mod h1:FJ8RAsoPGv/wYMgBdUJXOm+6pzFY3YdljnXtv1SBE8Q=
-go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
-go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
 go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo=
 go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=

om/go.mod

@@ -0,0 +1,12 @@
+module github.com/redis/rueidis/om
+
+go 1.20
+
+replace github.com/redis/rueidis => ../
+
+require (
+	github.com/oklog/ulid/v2 v2.1.0
+	github.com/redis/rueidis v1.0.28
+)
+
+require golang.org/x/sys v0.14.0 // indirect

om/go.sum

@@ -0,0 +1,10 @@
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/oklog/ulid/v2 v2.1.0 h1:+9lhoxAP56we25tyYETBBY1YLA2SaoLvUFgrP2miPJU=
+github.com/oklog/ulid/v2 v2.1.0/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
+github.com/onsi/gomega v1.28.0 h1:i2rg/p9n/UqIDAMFUJ6qIUUMcsqOuUHgbpbu235Vr1c=
+github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

pipe.go

@@ -20,7 +20,7 @@ import (
 )
 
 const LibName = "rueidis"
-const LibVer = "1.0.27"
+const LibVer = "1.0.28"
 
 var noHello = regexp.MustCompile("unknown command .?(HELLO|hello).?")
 
@@ -846,7 +846,7 @@ func (p *pipe) Do(ctx context.Context, cmd Completed) (resp RedisResult) {
 	} else {
 		resp = newErrResult(p.Error())
 	}
-	if left := atomic.AddInt32(&p.waits, -1); state == 0 && waits == 1 && left != 0 {
+	if left := atomic.AddInt32(&p.waits, -1); state == 0 && left != 0 {
 		p.background()
 	}
 	atomic.AddInt32(&p.recvs, 1)
@@ -856,23 +856,23 @@ queue:
 	ch := p.queue.PutOne(cmd)
 	if ctxCh := ctx.Done(); ctxCh == nil {
 		resp = <-ch
-		atomic.AddInt32(&p.waits, -1)
-		atomic.AddInt32(&p.recvs, 1)
 	} else {
 		select {
 		case resp = <-ch:
-			atomic.AddInt32(&p.waits, -1)
-			atomic.AddInt32(&p.recvs, 1)
 		case <-ctxCh:
-			resp = newErrResult(ctx.Err())
-			go func(ch chan RedisResult) {
-				<-ch
-				atomic.AddInt32(&p.waits, -1)
-				atomic.AddInt32(&p.recvs, 1)
-			}(ch)
+			goto abort
 		}
 	}
+	atomic.AddInt32(&p.waits, -1)
+	atomic.AddInt32(&p.recvs, 1)
 	return resp
+abort:
+	go func(ch chan RedisResult) {
+		<-ch
+		atomic.AddInt32(&p.waits, -1)
+		atomic.AddInt32(&p.recvs, 1)
+	}(ch)
+	return newErrResult(ctx.Err())
 }
 
 func (p *pipe) DoMulti(ctx context.Context, multi ...Completed) *redisresults {
@@ -888,7 +888,6 @@ func (p *pipe) DoMulti(ctx context.Context, multi ...Completed) *redisresults {
 
 	isOptIn := multi[0].IsOptIn() // len(multi) > 0 should have already been checked by upper layer
 	noReply := 0
-	isBlock := false
 
 	for _, cmd := range multi {
 		if cmd.NoReply() {
@@ -910,23 +909,19 @@ func (p *pipe) DoMulti(ctx context.Context, multi ...Completed) *redisresults {
 
 	for _, cmd := range multi {
 		if cmd.IsBlock() {
-			isBlock = true
+			atomic.AddInt32(&p.blcksig, 1)
+			defer func() {
+				for _, r := range resp.s {
+					if r.err != nil {
+						return
+					}
+				}
+				atomic.AddInt32(&p.blcksig, -1)
+			}()
 			break
 		}
 	}
 
-	if isBlock {
-		atomic.AddInt32(&p.blcksig, 1)
-		defer func() {
-			for _, r := range resp.s {
-				if r.err != nil {
-					return
-				}
-			}
-			atomic.AddInt32(&p.blcksig, -1)
-		}()
-	}
-
 	waits := atomic.AddInt32(&p.waits, 1) // if this is 1, and background worker is not started, no need to queue
 	state := atomic.LoadInt32(&p.state)
 
@@ -954,7 +949,7 @@ func (p *pipe) DoMulti(ctx context.Context, multi ...Completed) *redisresults {
 			resp.s[i] = err
 		}
 	}
-	if left := atomic.AddInt32(&p.waits, -1); state == 0 && waits == 1 && left != 0 {
+	if left := atomic.AddInt32(&p.waits, -1); state == 0 && left != 0 {
 		p.background()
 	}
 	atomic.AddInt32(&p.recvs, 1)
@@ -1000,10 +995,8 @@ func (p *pipe) syncDo(dl time.Time, dlOk bool, cmd Completed) (resp RedisResult)
 
 	var msg RedisMessage
 	err := writeCmd(p.w, cmd.Commands())
-	if err == nil {
-		if err = p.w.Flush(); err == nil {
-			msg, err = syncRead(p.r)
-		}
+	if err = p.w.Flush(); err == nil {
+		msg, err = syncRead(p.r)
 	}
 	if err != nil {
 		if errors.Is(err, os.ErrDeadlineExceeded) {
@@ -1022,6 +1015,7 @@ func (p *pipe) syncDoMulti(dl time.Time, dlOk bool, resp []RedisResult, multi []
 	} else if p.timeout > 0 {
 		for _, cmd := range multi {
 			if cmd.IsBlock() {
+				p.conn.SetDeadline(time.Time{})
 				goto process
 			}
 		}
@@ -1032,7 +1026,6 @@ func (p *pipe) syncDoMulti(dl time.Time, dlOk bool, resp []RedisResult, multi []
 process:
 	var err error
 	var msg RedisMessage
-
 	for _, cmd := range multi {
 		_ = writeCmd(p.w, cmd.Commands())
 	}

resp.go

@@ -172,34 +172,30 @@ func readS(i *bufio.Reader) (string, error) {
 	return BinaryString(bs), nil
 }
 
-func readI(i *bufio.Reader) (int64, error) {
-	var v int64
-	var neg bool
-	for {
-		c, err := i.ReadByte()
-		if err != nil {
-			return 0, err
-		}
-		switch {
-		case c >= '0' && c <= '9':
-			v = v*10 + int64(c-'0')
-		case c == '\r':
-			_, err = i.Discard(1)
-			if neg {
-				return v * -1, err
-			}
-			return v, err
-		case c == '-':
-			neg = true
-		case c == '?':
-			if _, err = i.Discard(2); err == nil {
-				err = errChunked
-			}
-			return 0, err
-		default:
+func readI(i *bufio.Reader) (v int64, err error) {
+	bs, err := i.ReadSlice('\n')
+	if err != nil {
+		return 0, err
+	}
+	if len(bs) < 3 {
+		return 0, errors.New(unexpectedNoCRLF)
+	}
+	if bs[0] == '?' {
+		return 0, errChunked
+	}
+	var s = int64(1)
+	if bs[0] == '-' {
+		s = -1
+		bs = bs[1:]
+	}
+	for _, c := range bs[:len(bs)-2] {
+		if d := int64(c - '0'); d >= 0 && d <= 9 {
+			v = v*10 + d
+		} else {
 			return 0, errors.New(unexpectedNumByte + strconv.Itoa(int(c)))
 		}
 	}
+	return v * s, nil
 }
 
 func readB(i *bufio.Reader) (string, error) {

rueidis.go

@@ -295,10 +295,10 @@ type AuthCredentials struct {
 // It will first try to connect as cluster client. If the len(ClientOption.InitAddress) == 1 and
 // the address does not enable cluster mode, the NewClient() will use single client instead.
 func NewClient(option ClientOption) (client Client, err error) {
-	if option.ReadBufferEachConn <= 0 {
+	if option.ReadBufferEachConn < 32 { // the buffer should be able to hold an int64 string at least
 		option.ReadBufferEachConn = DefaultReadBuffer
 	}
-	if option.WriteBufferEachConn <= 0 {
+	if option.WriteBufferEachConn < 32 {
 		option.WriteBufferEachConn = DefaultWriteBuffer
 	}
 	if option.CacheSizeEachConn <= 0 {

rueidisaside/go.mod

@@ -0,0 +1,12 @@
+module github.com/redis/rueidis/rueidisaside
+
+go 1.20
+
+replace github.com/redis/rueidis => ../
+
+require (
+	github.com/oklog/ulid/v2 v2.1.0
+	github.com/redis/rueidis v1.0.28
+)
+
+require golang.org/x/sys v0.14.0 // indirect

rueidisaside/go.sum

@@ -0,0 +1,10 @@
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/oklog/ulid/v2 v2.1.0 h1:+9lhoxAP56we25tyYETBBY1YLA2SaoLvUFgrP2miPJU=
+github.com/oklog/ulid/v2 v2.1.0/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
+github.com/onsi/gomega v1.28.0 h1:i2rg/p9n/UqIDAMFUJ6qIUUMcsqOuUHgbpbu235Vr1c=
+github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=