Changed argument to generic ID, skip tests on Enterprise

commands_test.go

@@ -5888,11 +5888,11 @@ var _ = Describe("Commands", func() {
 			Expect(err).To(Equal(redis.Nil))
 		})
 
-		It("should XRead LastEntry", func() {
+		It("should XRead LastEntry", Label("NonRedisEnterprise"), func() {
 			res, err := client.XRead(ctx, &redis.XReadArgs{
-				Streams:   []string{"stream"},
-				Count:     2, // we expect 1 message
-				LastEntry: true,
+				Streams: []string{"stream"},
+				Count:   2, // we expect 1 message
+				ID:      "+",
 			}).Result()
 			Expect(err).NotTo(HaveOccurred())
 			Expect(res).To(Equal([]redis.XStream{
@@ -5905,10 +5905,10 @@ var _ = Describe("Commands", func() {
 			}))
 		})
 
-		It("should XRead LastEntry from two streams", func() {
+		It("should XRead LastEntry from two streams", Label("NonRedisEnterprise"), func() {
 			res, err := client.XRead(ctx, &redis.XReadArgs{
-				Streams:   []string{"stream", "stream"},
-				LastEntry: true,
+				Streams: []string{"stream", "stream"},
+				ID:      "+",
 			}).Result()
 			Expect(err).NotTo(HaveOccurred())
 			Expect(res).To(Equal([]redis.XStream{
@@ -5927,7 +5927,7 @@ var _ = Describe("Commands", func() {
 			}))
 		})
 
-		It("should XRead LastEntry blocks", func() {
+		It("should XRead LastEntry blocks", Label("NonRedisEnterprise"), func() {
 			start := time.Now()
 			go func() {
 				defer GinkgoRecover()
@@ -5943,9 +5943,9 @@ var _ = Describe("Commands", func() {
 			}()
 
 			res, err := client.XRead(ctx, &redis.XReadArgs{
-				Streams:   []string{"empty"},
-				Block:     500 * time.Millisecond,
-				LastEntry: true,
+				Streams: []string{"empty"},
+				Block:   500 * time.Millisecond,
+				ID:      "+",
 			}).Result()
 			Expect(err).NotTo(HaveOccurred())
 			// Ensure that the XRead call with LastEntry option blocked for at least 100ms.

stream_commands.go

@@ -134,10 +134,10 @@ func (c cmdable) XRevRangeN(ctx context.Context, stream, start, stop string, cou
 }
 
 type XReadArgs struct {
-	Streams   []string // list of streams and ids, e.g. stream1 stream2 id1 id2
-	Count     int64
-	Block     time.Duration
-	LastEntry bool
+	Streams []string // list of streams and ids, e.g. stream1 stream2 id1 id2
+	Count   int64
+	Block   time.Duration
+	ID      string
 }
 
 func (c cmdable) XRead(ctx context.Context, a *XReadArgs) *XStreamSliceCmd {
@@ -160,9 +160,9 @@ func (c cmdable) XRead(ctx context.Context, a *XReadArgs) *XStreamSliceCmd {
 	for _, s := range a.Streams {
 		args = append(args, s)
 	}
-	if a.LastEntry {
+	if a.ID != "" {
 		for range a.Streams {
-			args = append(args, "+")
+			args = append(args, a.ID)
 		}
 	}