You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2022/08/29 18:01:10 UTC
[beam] branch master updated: Fix linting violations (#22934)
This is an automated email from the ASF dual-hosted git repository.
damccorm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new b68d38e32c2 Fix linting violations (#22934)
b68d38e32c2 is described below
commit b68d38e32c2aac51170da16c4d9c479420754009
Author: Danny McCormick <da...@google.com>
AuthorDate: Mon Aug 29 14:01:03 2022 -0400
Fix linting violations (#22934)
---
sdks/go/pkg/beam/core/runtime/exec/fullvalue.go | 4 ++--
sdks/go/pkg/beam/core/runtime/exec/sideinput_test.go | 10 +++++-----
sdks/go/pkg/beam/core/runtime/graphx/translate.go | 12 ++++++------
sdks/go/pkg/beam/core/state/state.go | 2 +-
sdks/go/pkg/beam/pardo.go | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sdks/go/pkg/beam/core/runtime/exec/fullvalue.go b/sdks/go/pkg/beam/core/runtime/exec/fullvalue.go
index e89179ce7d7..acc94d8667f 100644
--- a/sdks/go/pkg/beam/core/runtime/exec/fullvalue.go
+++ b/sdks/go/pkg/beam/core/runtime/exec/fullvalue.go
@@ -205,7 +205,7 @@ type singleUseReStream struct {
// Open returns the Stream from the start of the in-memory reader. Returns error if called twice.
func (n *singleUseReStream) Open() (Stream, error) {
if n.r == nil {
- return nil, errors.New("decodeReStream opened twice!")
+ return nil, errors.New("decodeReStream opened twice")
}
ret := &decodeStream{r: n.r, d: n.d, size: n.size}
n.r = nil
@@ -270,7 +270,7 @@ type singleUseMultiChunkReStream struct {
// Open returns the Stream from the start of the in-memory ReStream. Returns error if called twice.
func (n *singleUseMultiChunkReStream) Open() (Stream, error) {
if n.r == nil {
- return nil, errors.New("decodeReStream opened twice!")
+ return nil, errors.New("decodeReStream opened twice")
}
ret := &decodeMultiChunkStream{r: n.r, d: n.d, open: n.open}
n.r = nil
diff --git a/sdks/go/pkg/beam/core/runtime/exec/sideinput_test.go b/sdks/go/pkg/beam/core/runtime/exec/sideinput_test.go
index d045c9e36dd..ad329006ccd 100644
--- a/sdks/go/pkg/beam/core/runtime/exec/sideinput_test.go
+++ b/sdks/go/pkg/beam/core/runtime/exec/sideinput_test.go
@@ -149,27 +149,27 @@ func (t *testStateReader) OpenBagUserStateClearer(ctx context.Context, id Stream
}
// OpenMultimapUserStateReader opens a byte stream for reading user multimap state.
-func (s *testStateReader) OpenMultimapUserStateReader(ctx context.Context, id StreamID, userStateID string, key []byte, w []byte, mk []byte) (io.ReadCloser, error) {
+func (t *testStateReader) OpenMultimapUserStateReader(ctx context.Context, id StreamID, userStateID string, key []byte, w []byte, mk []byte) (io.ReadCloser, error) {
return nil, nil
}
// OpenMultimapUserStateAppender opens a byte stream for appending user multimap state.
-func (s *testStateReader) OpenMultimapUserStateAppender(ctx context.Context, id StreamID, userStateID string, key []byte, w []byte, mk []byte) (io.Writer, error) {
+func (t *testStateReader) OpenMultimapUserStateAppender(ctx context.Context, id StreamID, userStateID string, key []byte, w []byte, mk []byte) (io.Writer, error) {
return nil, nil
}
// OpenMultimapUserStateClearer opens a byte stream for clearing user multimap state by key.
-func (s *testStateReader) OpenMultimapUserStateClearer(ctx context.Context, id StreamID, userStateID string, key []byte, w []byte, mk []byte) (io.Writer, error) {
+func (t *testStateReader) OpenMultimapUserStateClearer(ctx context.Context, id StreamID, userStateID string, key []byte, w []byte, mk []byte) (io.Writer, error) {
return nil, nil
}
// OpenMultimapKeysUserStateReader opens a byte stream for reading the keys of user multimap state.
-func (s *testStateReader) OpenMultimapKeysUserStateReader(ctx context.Context, id StreamID, userStateID string, key []byte, w []byte) (io.ReadCloser, error) {
+func (t *testStateReader) OpenMultimapKeysUserStateReader(ctx context.Context, id StreamID, userStateID string, key []byte, w []byte) (io.ReadCloser, error) {
return nil, nil
}
// OpenMultimapKeysUserStateClearer opens a byte stream for clearing all keys of user multimap state.
-func (s *testStateReader) OpenMultimapKeysUserStateClearer(ctx context.Context, id StreamID, userStateID string, key []byte, w []byte) (io.Writer, error) {
+func (t *testStateReader) OpenMultimapKeysUserStateClearer(ctx context.Context, id StreamID, userStateID string, key []byte, w []byte) (io.Writer, error) {
return nil, nil
}
diff --git a/sdks/go/pkg/beam/core/runtime/graphx/translate.go b/sdks/go/pkg/beam/core/runtime/graphx/translate.go
index b9add46eefe..72c5e2d01e1 100644
--- a/sdks/go/pkg/beam/core/runtime/graphx/translate.go
+++ b/sdks/go/pkg/beam/core/runtime/graphx/translate.go
@@ -468,7 +468,7 @@ func (m *marshaller) addMultiEdge(edge NamedEdge) ([]string, error) {
stateSpecs := make(map[string]*pipepb.StateSpec)
for _, ps := range edge.Edge.DoFn.PipelineState() {
coderID := ""
- c, ok := edge.Edge.StateCoders[UserStateCoderId(ps)]
+ c, ok := edge.Edge.StateCoders[UserStateCoderID(ps)]
if ok {
coderID, err = m.coders.Add(c)
if err != nil {
@@ -476,7 +476,7 @@ func (m *marshaller) addMultiEdge(edge NamedEdge) ([]string, error) {
}
}
keyCoderID := ""
- if c, ok := edge.Edge.StateCoders[UserStateKeyCoderId(ps)]; ok {
+ if c, ok := edge.Edge.StateCoders[UserStateKeyCoderID(ps)]; ok {
keyCoderID, err = m.coders.Add(c)
if err != nil {
return handleErr(err)
@@ -1414,12 +1414,12 @@ func UpdateDefaultEnvWorkerType(typeUrn string, pyld []byte, p *pipepb.Pipeline)
return errors.Errorf("unable to find dependency with %q role in environment with ID %q,", URNArtifactGoWorkerRole, defaultEnvId)
}
-// UserStateCoderId returns the coder id of a user state
-func UserStateCoderId(ps state.PipelineState) string {
+// UserStateCoderID returns the coder id of a user state
+func UserStateCoderID(ps state.PipelineState) string {
return fmt.Sprintf("val_%v", ps.StateKey())
}
-// UserStateKeyCoderId returns the key coder id of a user state
-func UserStateKeyCoderId(ps state.PipelineState) string {
+// UserStateKeyCoderID returns the key coder id of a user state
+func UserStateKeyCoderID(ps state.PipelineState) string {
return fmt.Sprintf("key_%v", ps.StateKey())
}
diff --git a/sdks/go/pkg/beam/core/state/state.go b/sdks/go/pkg/beam/core/state/state.go
index 70050598cca..44b7a193b75 100644
--- a/sdks/go/pkg/beam/core/state/state.go
+++ b/sdks/go/pkg/beam/core/state/state.go
@@ -539,7 +539,7 @@ func (s Map[K, V]) StateType() TypeEnum {
return TypeMap
}
-// MakeValueState is a factory function to create an instance of ValueState with the given key.
+// MakeMapState is a factory function to create an instance of MapState with the given key.
func MakeMapState[K comparable, V any](k string) Map[K, V] {
return Map[K, V]{
Key: k,
diff --git a/sdks/go/pkg/beam/pardo.go b/sdks/go/pkg/beam/pardo.go
index 3d1d2b45f32..ad50a23dacb 100644
--- a/sdks/go/pkg/beam/pardo.go
+++ b/sdks/go/pkg/beam/pardo.go
@@ -103,7 +103,7 @@ func TryParDo(s Scope, dofn interface{}, col PCollection, opts ...Option) ([]PCo
if err != nil {
return nil, addParDoCtx(err, s)
}
- edge.StateCoders[graphx.UserStateCoderId(ps)] = c
+ edge.StateCoders[graphx.UserStateCoderID(ps)] = c
}
if kct := ps.KeyCoderType(); kct != nil {
kT := typex.New(kct)
@@ -111,7 +111,7 @@ func TryParDo(s Scope, dofn interface{}, col PCollection, opts ...Option) ([]PCo
if err != nil {
return nil, addParDoCtx(err, s)
}
- edge.StateCoders[graphx.UserStateKeyCoderId(ps)] = kc
+ edge.StateCoders[graphx.UserStateKeyCoderID(ps)] = kc
}
}
}