From 3e0640934e86fa8fab2cb3c501b9820bb465c184 Mon Sep 17 00:00:00 2001 From: tamayika Date: Fri, 12 Jan 2024 20:17:56 +0900 Subject: [PATCH] fix wrong block tag setting --- hack/cmds/gen.go | 2 +- internal/cmds/gen_stream.go | 8 ++++---- internal/cmds/gen_timeseries.go | 26 +++++++++++++------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/hack/cmds/gen.go b/hack/cmds/gen.go index ffe923cb..b68dd8e7 100644 --- a/hack/cmds/gen.go +++ b/hack/cmds/gen.go @@ -803,7 +803,7 @@ func printBuilder(w io.Writer, parent, next goStruct) { for _, cmd := range next.BuildDef.Command { if cmd == "BLOCK" { - fmt.Fprintf(w, "\tc.cf = int16(blockTag)\n") + fmt.Fprintf(w, "\tc.cf |= int16(blockTag)\n") break } } diff --git a/internal/cmds/gen_stream.go b/internal/cmds/gen_stream.go index ab759bcb..13089611 100644 --- a/internal/cmds/gen_stream.go +++ b/internal/cmds/gen_stream.go @@ -1047,7 +1047,7 @@ func (c Xread) Count(count int64) XreadCount { } func (c Xread) Block(milliseconds int64) XreadBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "BLOCK", strconv.FormatInt(milliseconds, 10)) return (XreadBlock)(c) } @@ -1067,7 +1067,7 @@ func (c XreadBlock) Streams() XreadStreams { type XreadCount Incomplete func (c XreadCount) Block(milliseconds int64) XreadBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "BLOCK", strconv.FormatInt(milliseconds, 10)) return (XreadBlock)(c) } @@ -1156,7 +1156,7 @@ func (c XreadgroupBlock) Streams() XreadgroupStreams { type XreadgroupCount Incomplete func (c XreadgroupCount) Block(milliseconds int64) XreadgroupBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "BLOCK", strconv.FormatInt(milliseconds, 10)) return (XreadgroupBlock)(c) } @@ -1179,7 +1179,7 @@ func (c XreadgroupGroup) Count(count int64) XreadgroupCount { } func (c XreadgroupGroup) Block(milliseconds int64) XreadgroupBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "BLOCK", strconv.FormatInt(milliseconds, 10)) return (XreadgroupBlock)(c) } diff --git a/internal/cmds/gen_timeseries.go b/internal/cmds/gen_timeseries.go index d492fe85..0cd4cdaa 100644 --- a/internal/cmds/gen_timeseries.go +++ b/internal/cmds/gen_timeseries.go @@ -25,7 +25,7 @@ func (c TsAdd) Key(key string) TsAddKey { type TsAddChunkSize Incomplete func (c TsAddChunkSize) OnDuplicateBlock() TsAddOnDuplicateBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "ON_DUPLICATE", "BLOCK") return (TsAddOnDuplicateBlock)(c) } @@ -73,7 +73,7 @@ func (c TsAddEncodingCompressed) ChunkSize(size int64) TsAddChunkSize { } func (c TsAddEncodingCompressed) OnDuplicateBlock() TsAddOnDuplicateBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "ON_DUPLICATE", "BLOCK") return (TsAddOnDuplicateBlock)(c) } @@ -121,7 +121,7 @@ func (c TsAddEncodingUncompressed) ChunkSize(size int64) TsAddChunkSize { } func (c TsAddEncodingUncompressed) OnDuplicateBlock() TsAddOnDuplicateBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "ON_DUPLICATE", "BLOCK") return (TsAddOnDuplicateBlock)(c) } @@ -270,7 +270,7 @@ func (c TsAddRetention) ChunkSize(size int64) TsAddChunkSize { } func (c TsAddRetention) OnDuplicateBlock() TsAddOnDuplicateBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "ON_DUPLICATE", "BLOCK") return (TsAddOnDuplicateBlock)(c) } @@ -340,7 +340,7 @@ func (c TsAddValue) ChunkSize(size int64) TsAddChunkSize { } func (c TsAddValue) OnDuplicateBlock() TsAddOnDuplicateBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "ON_DUPLICATE", "BLOCK") return (TsAddOnDuplicateBlock)(c) } @@ -401,7 +401,7 @@ func (c TsAlter) Key(key string) TsAlterKey { type TsAlterChunkSize Incomplete func (c TsAlterChunkSize) DuplicatePolicyBlock() TsAlterDuplicatePolicyBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "DUPLICATE_POLICY", "BLOCK") return (TsAlterDuplicatePolicyBlock)(c) } @@ -526,7 +526,7 @@ func (c TsAlterKey) ChunkSize(size int64) TsAlterChunkSize { } func (c TsAlterKey) DuplicatePolicyBlock() TsAlterDuplicatePolicyBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "DUPLICATE_POLICY", "BLOCK") return (TsAlterDuplicatePolicyBlock)(c) } @@ -586,7 +586,7 @@ func (c TsAlterRetention) ChunkSize(size int64) TsAlterChunkSize { } func (c TsAlterRetention) DuplicatePolicyBlock() TsAlterDuplicatePolicyBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "DUPLICATE_POLICY", "BLOCK") return (TsAlterDuplicatePolicyBlock)(c) } @@ -647,7 +647,7 @@ func (c TsCreate) Key(key string) TsCreateKey { type TsCreateChunkSize Incomplete func (c TsCreateChunkSize) DuplicatePolicyBlock() TsCreateDuplicatePolicyBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "DUPLICATE_POLICY", "BLOCK") return (TsCreateDuplicatePolicyBlock)(c) } @@ -767,7 +767,7 @@ func (c TsCreateEncodingCompressed) ChunkSize(size int64) TsCreateChunkSize { } func (c TsCreateEncodingCompressed) DuplicatePolicyBlock() TsCreateDuplicatePolicyBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "DUPLICATE_POLICY", "BLOCK") return (TsCreateDuplicatePolicyBlock)(c) } @@ -815,7 +815,7 @@ func (c TsCreateEncodingUncompressed) ChunkSize(size int64) TsCreateChunkSize { } func (c TsCreateEncodingUncompressed) DuplicatePolicyBlock() TsCreateDuplicatePolicyBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "DUPLICATE_POLICY", "BLOCK") return (TsCreateDuplicatePolicyBlock)(c) } @@ -878,7 +878,7 @@ func (c TsCreateKey) ChunkSize(size int64) TsCreateChunkSize { } func (c TsCreateKey) DuplicatePolicyBlock() TsCreateDuplicatePolicyBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "DUPLICATE_POLICY", "BLOCK") return (TsCreateDuplicatePolicyBlock)(c) } @@ -948,7 +948,7 @@ func (c TsCreateRetention) ChunkSize(size int64) TsCreateChunkSize { } func (c TsCreateRetention) DuplicatePolicyBlock() TsCreateDuplicatePolicyBlock { - c.cf = int16(blockTag) + c.cf |= int16(blockTag) c.cs.s = append(c.cs.s, "DUPLICATE_POLICY", "BLOCK") return (TsCreateDuplicatePolicyBlock)(c) }