Merge pull request #21708 from fuweid/gogo-part-4-update-events

client/v3: move Event helper methods into pb package

Author: serathius

api/mvccpb/extension.go

@@ -0,0 +1,25 @@
+// Copyright 2026 The etcd Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package mvccpb
+
+// IsCreate returns true if the event tells that the key is newly created.
+func (e *Event) IsCreate() bool {
+	return e.GetType() == PUT && e.GetKv().GetCreateRevision() == e.GetKv().GetModRevision()
+}
+
+// IsModify returns true if the event tells that a new value is put on existing key.
+func (e *Event) IsModify() bool {
+	return e.GetType() == PUT && e.GetKv().GetCreateRevision() != e.GetKv().GetModRevision()
+}

client/v3/watch.go

@@ -46,7 +46,7 @@ const (
 	InvalidWatchID = -1
 )
 
-type Event mvccpb.Event
+type Event = mvccpb.Event
 
 type WatchChan <-chan WatchResponse
 
@@ -116,16 +116,6 @@ type WatchResponse struct {
 	CancelReason string
 }
 
-// IsCreate returns true if the event tells that the key is newly created.
-func (e *Event) IsCreate() bool {
-	return e.Type == EventTypePut && e.Kv.CreateRevision == e.Kv.ModRevision
-}
-
-// IsModify returns true if the event tells that a new value is put on existing key.
-func (e *Event) IsModify() bool {
-	return e.Type == EventTypePut && e.Kv.CreateRevision != e.Kv.ModRevision
-}
-
 // Err is the error value if this WatchResponse holds an error.
 func (wr *WatchResponse) Err() error {
 	switch {
@@ -719,14 +709,10 @@ func (w *watchGRPCStream) nextResume() *watcherStream {
 
 // dispatchEvent sends a WatchResponse to the appropriate watcher stream
 func (w *watchGRPCStream) dispatchEvent(pbresp *pb.WatchResponse) bool {
-	events := make([]*Event, len(pbresp.Events))
-	for i, ev := range pbresp.Events {
-		events[i] = (*Event)(ev)
-	}
 	// TODO: return watch ID?
 	wr := &WatchResponse{
 		Header:          ensureWatchHeader(pbresp.Header),
-		Events:          events,
+		Events:          pbresp.Events,
 		CompactRevision: pbresp.CompactRevision,
 		Created:         pbresp.Created,
 		Canceled:        pbresp.Canceled,

etcdctl/ctlv3/command/printer_protobuf.go

@@ -19,7 +19,6 @@ import (
 	"os"
 
 	pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-	mvccpb "go.etcd.io/etcd/api/v3/mvccpb"
 	v3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/v3/cobrautl"
 )
@@ -37,13 +36,9 @@ func newPBPrinter() printer {
 }
 
 func (p *pbPrinter) Watch(r v3.WatchResponse) {
-	evs := make([]*mvccpb.Event, len(r.Events))
-	for i, ev := range r.Events {
-		evs[i] = (*mvccpb.Event)(ev)
-	}
 	wr := pb.WatchResponse{
 		Header:          r.Header,
-		Events:          evs,
+		Events:          r.Events,
 		CompactRevision: r.CompactRevision,
 		Canceled:        r.Canceled,
 		Created:         r.Created,

server/proxy/grpcproxy/watcher.go

@@ -68,7 +68,7 @@ func (w *watcher) send(wr clientv3.WatchResponse) {
 
 	var lastRev int64
 	for i := range wr.Events {
-		ev := (*mvccpb.Event)(wr.Events[i])
+		ev := wr.Events[i]
 		if ev.Kv.ModRevision < w.nextrev {
 			continue
 		}