You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lo...@apache.org on 2020/06/05 18:38:47 UTC
[beam] branch revert-11925-beam9615 created (now 09f286c)
This is an automated email from the ASF dual-hosted git repository.
lostluck pushed a change to branch revert-11925-beam9615
in repository https://gitbox.apache.org/repos/asf/beam.git.
at 09f286c Revert "[BEAM-9615] Add string coder utility functions. (#11925)"
This branch includes the following new commits:
new 09f286c Revert "[BEAM-9615] Add string coder utility functions. (#11925)"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[beam] 01/01: Revert "[BEAM-9615] Add string coder utility
functions. (#11925)"
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lostluck pushed a commit to branch revert-11925-beam9615
in repository https://gitbox.apache.org/repos/asf/beam.git
commit 09f286ca917b4decfd1085b12845fa970ecb1918
Author: Robert Burke <lo...@users.noreply.github.com>
AuthorDate: Fri Jun 5 11:38:32 2020 -0700
Revert "[BEAM-9615] Add string coder utility functions. (#11925)"
This reverts commit 2e13367e92a51ff3299a9e9e4cba6f2576e82038.
---
sdks/go/pkg/beam/core/graph/coder/stringutf8.go | 83 --------------
.../pkg/beam/core/graph/coder/stringutf8_test.go | 122 ---------------------
2 files changed, 205 deletions(-)
diff --git a/sdks/go/pkg/beam/core/graph/coder/stringutf8.go b/sdks/go/pkg/beam/core/graph/coder/stringutf8.go
deleted file mode 100644
index 2294435..0000000
--- a/sdks/go/pkg/beam/core/graph/coder/stringutf8.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You 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 coder
-
-import (
- "io"
- "strings"
-
- "github.com/apache/beam/sdks/go/pkg/beam/core/util/ioutilx"
-)
-
-const bufCap = 64
-
-// EncodeStringUTF8LP encodes a UTF string with a length prefix.
-func EncodeStringUTF8LP(s string, w io.Writer) error {
- if err := EncodeVarInt(int64(len(s)), w); err != nil {
- return err
- }
- return encodeStringUTF8(s, w)
-}
-
-// encodeStringUTF8 encodes a string.
-func encodeStringUTF8(s string, w io.Writer) error {
- l := len(s)
- var b [bufCap]byte
- i := 0
- for l-i > bufCap {
- n := i + bufCap
- copy(b[:], s[i:n])
- if _, err := ioutilx.WriteUnsafe(w, b[:]); err != nil {
- return err
- }
- i = n
- }
- n := l - i
- copy(b[:n], s[i:])
- ioutilx.WriteUnsafe(w, b[:n])
- return nil
-}
-
-// decodeStringUTF8 reads l bytes and produces a string.
-func decodeStringUTF8(l int64, r io.Reader) (string, error) {
- var builder strings.Builder
- var b [bufCap]byte
- i := l
- for i > bufCap {
- err := ioutilx.ReadNBufUnsafe(r, b[:])
- if err != nil {
- return "", err
- }
- i -= bufCap
- builder.Write(b[:])
- }
- err := ioutilx.ReadNBufUnsafe(r, b[:i])
- if err != nil {
- return "", err
- }
- builder.Write(b[:i])
-
- return builder.String(), nil
-}
-
-// DecodeStringUTF8LP decodes a length prefixed utf8 string.
-func DecodeStringUTF8LP(r io.Reader) (string, error) {
- l, err := DecodeVarInt(r)
- if err != nil {
- return "", err
- }
- return decodeStringUTF8(l, r)
-}
diff --git a/sdks/go/pkg/beam/core/graph/coder/stringutf8_test.go b/sdks/go/pkg/beam/core/graph/coder/stringutf8_test.go
deleted file mode 100644
index 75857e8..0000000
--- a/sdks/go/pkg/beam/core/graph/coder/stringutf8_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You 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 coder
-
-import (
- "bytes"
- "encoding/base64"
- "io"
- "strings"
- "testing"
- "unicode/utf8"
-)
-
-var testValues = []string{
- "",
- "a",
- "13",
- "hello",
- "a longer string with spaces and all that",
- "a string with a \n newline",
- "スタリング",
- "I am the very model of a modern major general.\nI've information animal, vegetable, and mineral",
-}
-
-// Base64 encoded versions of the above strings, without the length prefix.
-var testEncodings = []string{
- "",
- "YQ",
- "MTM",
- "aGVsbG8",
- "YSBsb25nZXIgc3RyaW5nIHdpdGggc3BhY2VzIGFuZCBhbGwgdGhhdA",
- "YSBzdHJpbmcgd2l0aCBhIAogbmV3bGluZQ",
- "44K544K_44Oq44Oz44Kw",
- "SSBhbSB0aGUgdmVyeSBtb2RlbCBvZiBhIG1vZGVybiBtYWpvciBnZW5lcmFsLgpJJ3ZlIGluZm9ybWF0aW9uIGFuaW1hbCwgdmVnZXRhYmxlLCBhbmQgbWluZXJhbA",
-}
-
-// TestLen serves as a verification that string lengths
-// match their equivalent byte lengths, and not their rune
-// representation.
-func TestLen(t *testing.T) {
- runeCount := []int{0, 1, 2, 5, 40, 25, 5, 94}
- for i, s := range testValues {
- if got, want := len(s), len([]byte(s)); got != want {
- t.Errorf("string and []byte len do not match. got %v, want %v", got, want)
- }
- if got, want := utf8.RuneCountInString(s), runeCount[i]; got != want {
- t.Errorf("Rune count of %q change len do not match. got %v, want %v", s, got, want)
- }
- }
-}
-
-func TestEncodeStringUTF8(t *testing.T) {
- for i, s := range testValues {
- s := s
- want := testEncodings[i]
- t.Run(s, func(t *testing.T) {
- var b strings.Builder
- base64enc := base64.NewEncoder(base64.RawURLEncoding, &b)
-
- if err := encodeStringUTF8(s, base64enc); err != nil {
- t.Fatal(err)
- }
- base64enc.Close()
- got := b.String()
- if got != want {
- t.Errorf("encodeStringUTF8(%q) = %q, want %q", s, got, want)
- }
- })
- }
-}
-
-func TestDecodeStringUTF8(t *testing.T) {
- for i, s := range testEncodings {
- s := s
- want := testValues[i]
- t.Run(want, func(t *testing.T) {
- b := bytes.NewBufferString(s)
- base64dec := base64.NewDecoder(base64.RawURLEncoding, b)
-
- got, err := decodeStringUTF8(int64(len(want)), base64dec)
- if err != nil && err != io.EOF {
- t.Fatal(err)
- }
- if got != want {
- t.Errorf("decodeStringUTF8(%q) = %q, want %q", s, got, want)
- }
- })
- }
-}
-
-func TestEncodeDecodeStringUTF8LP(t *testing.T) {
- for _, s := range testValues {
- want := s
- t.Run(want, func(t *testing.T) {
- var build strings.Builder
- if err := EncodeStringUTF8LP(want, &build); err != nil {
- t.Fatal(err)
- }
- buf := bytes.NewBufferString(build.String())
- got, err := DecodeStringUTF8LP(buf)
- if err != nil && err != io.EOF {
- t.Fatal(err)
- }
- if got != want {
- t.Errorf("decodeStringUTF8(%q) = %q, want %q", s, got, want)
- }
- })
- }
-}