github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Revert "Use jsoniteer for faster json encoding/decoding"

Browse Source 
This reverts commit 4233b87b89.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2018-01-29 15:47:48 -05:00
parent c6a7d10568
commit d179c61231
11 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
remotes/docker/schema1/converter.go
View File

@@ -5,6 +5,7 @@ import (
"compress/gzip"
"context"
"encoding/base64"
"encoding/json"
"fmt"
"io"
"io/ioutil"
@@ -20,7 +21,6 @@ import (
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/remotes"
jsoniter "github.com/json-iterator/go"
digest "github.com/opencontainers/go-digest"
specs "github.com/opencontainers/image-spec/specs-go"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@@ -110,7 +110,6 @@ func (c *Converter) Convert(ctx context.Context) (ocispec.Descriptor, error) {
return ocispec.Descriptor{}, errors.Wrap(err, "schema 1 conversion failed")
}
json := jsoniter.ConfigCompatibleWithStandardLibrary
var img ocispec.Image
if err := json.Unmarshal([]byte(c.pulledManifest.History[0].V1Compatibility), &img); err != nil {
return ocispec.Descriptor{}, errors.Wrap(err, "failed to unmarshal image from schema 1 history")
@@ -195,7 +194,6 @@ func (c *Converter) fetchManifest(ctx context.Context, desc ocispec.Descriptor)
return err
}
json := jsoniter.ConfigCompatibleWithStandardLibrary
var m manifest
if err := json.Unmarshal(b, &m); err != nil {
return err
@@ -318,7 +316,6 @@ func (c *Converter) schema1ManifestHistory() ([]ocispec.History, []digest.Digest
return nil, nil, errors.New("no history")
}
json := jsoniter.ConfigCompatibleWithStandardLibrary
history := make([]ocispec.History, len(m.History))
diffIDs := []digest.Digest{}
for i := range m.History {
@@ -376,7 +373,6 @@ type v1History struct {
// empty layer. A return value of true indicates the layer is empty,
// however false does not indicate non-empty.
func isEmptyLayer(compatHistory []byte) (bool, error) {
json := jsoniter.ConfigCompatibleWithStandardLibrary
var h v1History
if err := json.Unmarshal(compatHistory, &h); err != nil {
return false, err
@@ -426,7 +422,6 @@ func joseBase64UrlDecode(s string) ([]byte, error) {
}
func stripSignature(b []byte) ([]byte, error) {
json := jsoniter.ConfigCompatibleWithStandardLibrary
var sig signature
if err := json.Unmarshal(b, &sig); err != nil {
return nil, err