From 1f1cd2bff6ce62c6485fd76aa9527ab0cd60d6a9 Mon Sep 17 00:00:00 2001 From: yinpeng Date: Sat, 22 Mar 2025 17:04:37 +0800 Subject: [PATCH 1/2] fix typos --- admin/admin.go | 2 +- consumer/interceptor.go | 2 +- consumer/pull_consumer.go | 2 +- consumer/push_consumer.go | 2 +- examples/consumer/interceptor/main.go | 2 +- examples/producer/rpc/async/main.go | 2 +- examples/producer/rpc/sync/main.go | 2 +- examples/producer/transaction/main.go | 4 ++-- internal/remote/codec_test.go | 8 ++++---- internal/remote/remote_client_test.go | 16 ++++++++-------- primitive/message.go | 6 +++--- producer/interceptor.go | 2 +- producer/producer.go | 6 +++--- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/admin/admin.go b/admin/admin.go index a92a25c7..bd3628ff 100644 --- a/admin/admin.go +++ b/admin/admin.go @@ -108,7 +108,7 @@ func NewAdmin(opts ...AdminOption) (*admin, error) { cli := internal.GetOrNewRocketMQClient(defaultOpts.ClientOptions, nil) if cli == nil { - return nil, fmt.Errorf("GetOrNewRocketMQClient faild") + return nil, fmt.Errorf("GetOrNewRocketMQClient failed") } defaultOpts.Namesrv = cli.GetNameSrv() //log.Printf("Client: %#v", namesrv.srvs) diff --git a/consumer/interceptor.go b/consumer/interceptor.go index 7878809a..bca6b60a 100644 --- a/consumer/interceptor.go +++ b/consumer/interceptor.go @@ -46,7 +46,7 @@ func newTraceInterceptor(dispatcher internal.TraceDispatcher) primitive.Intercep return func(ctx context.Context, req, reply interface{}, next primitive.Invoker) error { if dispatcher == nil { - return fmt.Errorf("GetOrNewRocketMQClient faild") + return fmt.Errorf("GetOrNewRocketMQClient failed") } consumerCtx, exist := primitive.GetConsumerCtx(ctx) if !exist || len(consumerCtx.Msgs) == 0 { diff --git a/consumer/pull_consumer.go b/consumer/pull_consumer.go index 95920615..58524005 100644 --- a/consumer/pull_consumer.go +++ b/consumer/pull_consumer.go @@ -118,7 +118,7 @@ func NewPullConsumer(options ...Option) (*defaultPullConsumer, error) { allocate: defaultOpts.Strategy, } if dc.client == nil { - return nil, fmt.Errorf("GetOrNewRocketMQClient faild") + return nil, fmt.Errorf("GetOrNewRocketMQClient failed") } defaultOpts.Namesrv = dc.client.GetNameSrv() diff --git a/consumer/push_consumer.go b/consumer/push_consumer.go index e6ec3e50..acd2b181 100644 --- a/consumer/push_consumer.go +++ b/consumer/push_consumer.go @@ -106,7 +106,7 @@ func NewPushConsumer(opts ...Option) (*pushConsumer, error) { option: defaultOpts, } if dc.client == nil { - return nil, fmt.Errorf("GetOrNewRocketMQClient faild") + return nil, fmt.Errorf("GetOrNewRocketMQClient failed") } defaultOpts.Namesrv = dc.client.GetNameSrv() diff --git a/examples/consumer/interceptor/main.go b/examples/consumer/interceptor/main.go index 83f43b09..04d7f4bf 100644 --- a/examples/consumer/interceptor/main.go +++ b/examples/consumer/interceptor/main.go @@ -59,7 +59,7 @@ func main() { func UserFistInterceptor() primitive.Interceptor { return func(ctx context.Context, req, reply interface{}, next primitive.Invoker) error { msgCtx, _ := primitive.GetConsumerCtx(ctx) - fmt.Printf("msgCtx: %v, mehtod: %s", msgCtx, primitive.GetMethod(ctx)) + fmt.Printf("msgCtx: %v, method: %s", msgCtx, primitive.GetMethod(ctx)) msgs := req.([]*primitive.MessageExt) fmt.Printf("user first interceptor before invoke: %v\n", msgs) diff --git a/examples/producer/rpc/async/main.go b/examples/producer/rpc/async/main.go index c0ce57b9..77d0e149 100644 --- a/examples/producer/rpc/async/main.go +++ b/examples/producer/rpc/async/main.go @@ -53,7 +53,7 @@ func main() { fmt.Printf("request to <%s> fail, err:%v \n", topic, respErr) return } - fmt.Printf("Requst to %s cost:%d ms responseMsg:%s\n", topic, time.Since(now)/time.Millisecond, responseMsg.String()) + fmt.Printf("Request to %s cost:%d ms responseMsg:%s\n", topic, time.Since(now)/time.Millisecond, responseMsg.String()) } err = p.RequestAsync(context.Background(), ttl, f, msg) if err != nil { diff --git a/examples/producer/rpc/sync/main.go b/examples/producer/rpc/sync/main.go index e42199f8..d3c71fea 100644 --- a/examples/producer/rpc/sync/main.go +++ b/examples/producer/rpc/sync/main.go @@ -53,7 +53,7 @@ func main() { fmt.Printf("Request message error: %s\n", err) return } - fmt.Printf("Requst to %s cost:%d ms responseMsg:%s\n", topic, time.Since(now)/time.Millisecond, responseMsg.String()) + fmt.Printf("Request to %s cost:%d ms responseMsg:%s\n", topic, time.Since(now)/time.Millisecond, responseMsg.String()) err = p.Shutdown() if err != nil { diff --git a/examples/producer/transaction/main.go b/examples/producer/transaction/main.go index 919c6a5c..d56e9c8f 100644 --- a/examples/producer/transaction/main.go +++ b/examples/producer/transaction/main.go @@ -49,7 +49,7 @@ func (dl *DemoListener) ExecuteLocalTransaction(msg *primitive.Message) primitiv dl.localTrans.Store(msg.TransactionId, primitive.LocalTransactionState(status+1)) fmt.Printf("dl") - return primitive.UnkonwnState + return primitive.UnknownState } func (dl *DemoListener) CheckLocalTransaction(msg *primitive.MessageExt) primitive.LocalTransactionState { @@ -69,7 +69,7 @@ func (dl *DemoListener) CheckLocalTransaction(msg *primitive.MessageExt) primiti return primitive.RollbackMessageState case 3: fmt.Printf("checkLocalTransaction unknown: %v\n", msg) - return primitive.UnkonwnState + return primitive.UnknownState default: fmt.Printf("checkLocalTransaction default COMMIT_MESSAGE: %v\n", msg) return primitive.CommitMessageState diff --git a/internal/remote/codec_test.go b/internal/remote/codec_test.go index 60f78696..47dddedc 100644 --- a/internal/remote/codec_test.go +++ b/internal/remote/codec_test.go @@ -298,10 +298,10 @@ func TestCommandJsonEncodeDecode(t *testing.T) { t.Errorf("wrong command version. want=%d, got=%d", cmd.Version, newCmd.Version) } if newCmd.Opaque != cmd.Opaque { - t.Errorf("wrong command version. want=%d, got=%d", cmd.Opaque, newCmd.Opaque) + t.Errorf("wrong command opaque. want=%d, got=%d", cmd.Opaque, newCmd.Opaque) } if newCmd.Flag != cmd.Flag { - t.Errorf("wrong commad flag. want=%d, got=%d", cmd.Flag, newCmd.Flag) + t.Errorf("wrong command flag. want=%d, got=%d", cmd.Flag, newCmd.Flag) } if newCmd.Remark != cmd.Remark { t.Errorf("wrong command remakr. want=%s, got=%s", cmd.Remark, newCmd.Remark) @@ -335,10 +335,10 @@ func TestCommandRocketMQEncodeDecode(t *testing.T) { t.Errorf("wrong command version. want=%d, got=%d", cmd.Version, newCmd.Version) } if newCmd.Opaque != cmd.Opaque { - t.Errorf("wrong command version. want=%d, got=%d", cmd.Opaque, newCmd.Opaque) + t.Errorf("wrong command opaque. want=%d, got=%d", cmd.Opaque, newCmd.Opaque) } if newCmd.Flag != cmd.Flag { - t.Errorf("wrong commad flag. want=%d, got=%d", cmd.Flag, newCmd.Flag) + t.Errorf("wrong command flag. want=%d, got=%d", cmd.Flag, newCmd.Flag) } if newCmd.Remark != cmd.Remark { t.Errorf("wrong command remakr. want=%s, got=%s", cmd.Remark, newCmd.Remark) diff --git a/internal/remote/remote_client_test.go b/internal/remote/remote_client_test.go index b7171c44..45949b37 100644 --- a/internal/remote/remote_client_test.go +++ b/internal/remote/remote_client_test.go @@ -36,7 +36,7 @@ func TestNewResponseFuture(t *testing.T) { t.Errorf("wrong ResponseFuture's opaque. want=%d, got=%d", 10, future.Opaque) } if future.Err != nil { - t.Errorf("wrong RespnseFuture's Err. want=, got=%v", future.Err) + t.Errorf("wrong ResponseFuture's Err. want=, got=%v", future.Err) } if future.callback != nil { t.Errorf("wrong ResponseFuture's callback. want=, got!=") @@ -104,7 +104,7 @@ func TestResponseFutureWaitResponse(t *testing.T) { t.Errorf("wrong ResponseFuture waitResponse error: %v", err) } else { if r != responseRemotingCommand { - t.Errorf("wrong ResponseFuture waitResposne result. want=%v, got=%v", + t.Errorf("wrong ResponseFuture waitResponse result. want=%v, got=%v", responseRemotingCommand, r) } } @@ -190,7 +190,7 @@ func TestInvokeSync(t *testing.T) { for scanner.Scan() { receivedRemotingCommand, err := decode(scanner.Bytes()) if err != nil { - t.Errorf("failed to decode RemotingCommnad. %s", err) + t.Errorf("failed to decode RemotingCommand. %s", err) } if clientSendRemtingCommand.Code != receivedRemotingCommand.Code { t.Errorf("wrong code. want=%d, got=%d", receivedRemotingCommand.Code, @@ -202,7 +202,7 @@ func TestInvokeSync(t *testing.T) { } _, err = conn.Write(body) if err != nil { - t.Fatalf("failed to write body to conneciton.") + t.Fatalf("failed to write body to connection.") } goto done } @@ -220,10 +220,10 @@ func TestInvokeAsync(t *testing.T) { for i := 0; i < cnt; i++ { go func(index int) { time.Sleep(time.Duration(rand.Intn(100)) * time.Millisecond) - t.Logf("[Send: %d] asychronous message", index) + t.Logf("[Send: %d] asynchronous message", index) sendRemotingCommand := randomNewRemotingCommand() err := client.InvokeAsync(context.Background(), addr, sendRemotingCommand, func(r *ResponseFuture) { - t.Logf("[Receive: %d] asychronous message response", index) + t.Logf("[Receive: %d] asynchronous message response", index) if string(sendRemotingCommand.Body) != string(r.ResponseCommand.Body) { t.Errorf("wrong response message. want=%s, got=%s", string(sendRemotingCommand.Body), string(r.ResponseCommand.Body)) @@ -313,7 +313,7 @@ func TestInvokeAsyncTimeout(t *testing.T) { for scanner.Scan() { t.Logf("receive request.") _, err := decode(scanner.Bytes()) - assert.Nil(t, err, "failed to decode RemotingCommnad.") + assert.Nil(t, err, "failed to decode RemotingCommand.") time.Sleep(5 * time.Second) // force client timeout goto done @@ -358,7 +358,7 @@ func TestInvokeOneWay(t *testing.T) { for scanner.Scan() { receivedRemotingCommand, err := decode(scanner.Bytes()) if err != nil { - t.Errorf("failed to decode RemotingCommnad. %s", err) + t.Errorf("failed to decode RemotingCommand. %s", err) } if clientSendRemtingCommand.Code != receivedRemotingCommand.Code { t.Errorf("wrong code. want=%d, got=%d", receivedRemotingCommand.Code, diff --git a/primitive/message.go b/primitive/message.go index 8b390c49..789fb44e 100644 --- a/primitive/message.go +++ b/primitive/message.go @@ -56,8 +56,8 @@ const ( PropertyUniqueClientMessageIdKeyIndex = "UNIQ_KEY" PropertyMaxReconsumeTimes = "MAX_RECONSUME_TIMES" PropertyConsumeStartTime = "CONSUME_START_TIME" - PropertyTranscationPreparedQueueOffset = "TRAN_PREPARED_QUEUE_OFFSET" - PropertyTranscationCheckTimes = "TRANSACTION_CHECK_TIMES" + PropertyTransactionPreparedQueueOffset = "TRAN_PREPARED_QUEUE_OFFSET" + PropertyTransactionCheckTimes = "TRANSACTION_CHECK_TIMES" PropertyCheckImmunityTimeInSeconds = "CHECK_IMMUNITY_TIME_IN_SECONDS" PropertyShardingKey = "SHARDING_KEY" PropertyTransactionID = "__transactionId__" @@ -451,7 +451,7 @@ type LocalTransactionState int const ( CommitMessageState LocalTransactionState = iota + 1 RollbackMessageState - UnkonwnState + UnknownState ) type TransactionListener interface { diff --git a/producer/interceptor.go b/producer/interceptor.go index 956bfecf..ee6d7690 100644 --- a/producer/interceptor.go +++ b/producer/interceptor.go @@ -49,7 +49,7 @@ func newTraceInterceptor(dispatcher internal.TraceDispatcher) primitive.Intercep return func(ctx context.Context, req, reply interface{}, next primitive.Invoker) error { if dispatcher == nil { - return fmt.Errorf("GetOrNewRocketMQClient faild") + return fmt.Errorf("GetOrNewRocketMQClient failed") } beginT := time.Now() producerCtx, ok := primitive.GetProducerCtx(ctx) diff --git a/producer/producer.go b/producer/producer.go index 2cbeff68..2e55576c 100644 --- a/producer/producer.go +++ b/producer/producer.go @@ -72,7 +72,7 @@ func NewDefaultProducer(opts ...Option) (*defaultProducer, error) { } producer.client = internal.GetOrNewRocketMQClient(defaultOpts.ClientOptions, producer.callbackCh) if producer.client == nil { - return nil, fmt.Errorf("GetOrNewRocketMQClient faild") + return nil, fmt.Errorf("GetOrNewRocketMQClient failed") } defaultOpts.Namesrv = producer.client.GetNameSrv() @@ -714,7 +714,7 @@ func (tp *transactionProducer) SendMessageInTransaction(ctx context.Context, msg if err != nil { return nil, err } - localTransactionState := primitive.UnkonwnState + localTransactionState := primitive.UnknownState switch rsp.Status { case primitive.SendOK: if len(rsp.TransactionID) > 0 { @@ -785,7 +785,7 @@ func (tp *transactionProducer) transactionState(state primitive.LocalTransaction return primitive.TransactionCommitType case primitive.RollbackMessageState: return primitive.TransactionRollbackType - case primitive.UnkonwnState: + case primitive.UnknownState: return primitive.TransactionNotType default: return primitive.TransactionNotType From 2f864aaca18b7fdcca7fd73797910cf70f94fe27 Mon Sep 17 00:00:00 2001 From: yinpeng Date: Sat, 22 Mar 2025 17:37:01 +0800 Subject: [PATCH 2/2] fix typos --- internal/remote/remote_client_test.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/remote/remote_client_test.go b/internal/remote/remote_client_test.go index 45949b37..866febec 100644 --- a/internal/remote/remote_client_test.go +++ b/internal/remote/remote_client_test.go @@ -145,9 +145,9 @@ func TestCreateScanner(t *testing.T) { func TestInvokeSync(t *testing.T) { addr := ":3004" - clientSendRemtingCommand := NewRemotingCommand(10, nil, []byte("Hello RocketMQ")) + clientSendRemotingCommand := NewRemotingCommand(10, nil, []byte("Hello RocketMQ")) serverSendRemotingCommand := NewRemotingCommand(20, nil, []byte("Welcome native")) - serverSendRemotingCommand.Opaque = clientSendRemtingCommand.Opaque + serverSendRemotingCommand.Opaque = clientSendRemotingCommand.Opaque serverSendRemotingCommand.Flag = ResponseType var wg sync.WaitGroup wg.Add(1) @@ -159,7 +159,7 @@ func TestInvokeSync(t *testing.T) { go func() { clientSend.Wait() receiveCommand, err := client.InvokeSync(context.Background(), addr, - clientSendRemtingCommand) + clientSendRemotingCommand) if err != nil { t.Fatalf("failed to invoke synchronous. %s", err) } else { @@ -192,9 +192,9 @@ func TestInvokeSync(t *testing.T) { if err != nil { t.Errorf("failed to decode RemotingCommand. %s", err) } - if clientSendRemtingCommand.Code != receivedRemotingCommand.Code { + if clientSendRemotingCommand.Code != receivedRemotingCommand.Code { t.Errorf("wrong code. want=%d, got=%d", receivedRemotingCommand.Code, - clientSendRemtingCommand.Code) + clientSendRemotingCommand.Code) } body, err := encode(serverSendRemotingCommand) if err != nil { @@ -275,9 +275,9 @@ done: func TestInvokeAsyncTimeout(t *testing.T) { addr := ":3002" - clientSendRemtingCommand := NewRemotingCommand(10, nil, []byte("Hello RocketMQ")) + clientSendRemotingCommand := NewRemotingCommand(10, nil, []byte("Hello RocketMQ")) serverSendRemotingCommand := NewRemotingCommand(20, nil, []byte("Welcome native")) - serverSendRemotingCommand.Opaque = clientSendRemtingCommand.Opaque + serverSendRemotingCommand.Opaque = clientSendRemotingCommand.Opaque serverSendRemotingCommand.Flag = ResponseType var wg sync.WaitGroup @@ -290,7 +290,7 @@ func TestInvokeAsyncTimeout(t *testing.T) { clientSend.Wait() ctx, cancel := context.WithTimeout(context.Background(), time.Duration(10*time.Second)) defer cancel() - err := client.InvokeAsync(ctx, addr, clientSendRemtingCommand, + err := client.InvokeAsync(ctx, addr, clientSendRemotingCommand, func(r *ResponseFuture) { assert.NotNil(t, r.Err) assert.Equal(t, errors.ErrRequestTimeout, r.Err) @@ -325,7 +325,7 @@ done: func TestInvokeOneWay(t *testing.T) { addr := ":3008" - clientSendRemtingCommand := NewRemotingCommand(10, nil, []byte("Hello RocketMQ")) + clientSendRemotingCommand := NewRemotingCommand(10, nil, []byte("Hello RocketMQ")) var wg sync.WaitGroup wg.Add(1) @@ -335,7 +335,7 @@ func TestInvokeOneWay(t *testing.T) { clientSend.Add(1) go func() { clientSend.Wait() - err := client.InvokeOneWay(context.Background(), addr, clientSendRemtingCommand) + err := client.InvokeOneWay(context.Background(), addr, clientSendRemotingCommand) if err != nil { t.Fatalf("failed to invoke synchronous. %s", err) } @@ -360,9 +360,9 @@ func TestInvokeOneWay(t *testing.T) { if err != nil { t.Errorf("failed to decode RemotingCommand. %s", err) } - if clientSendRemtingCommand.Code != receivedRemotingCommand.Code { + if clientSendRemotingCommand.Code != receivedRemotingCommand.Code { t.Errorf("wrong code. want=%d, got=%d", receivedRemotingCommand.Code, - clientSendRemtingCommand.Code) + clientSendRemotingCommand.Code) } goto done }