Revert "Use jsoniteer for faster json encoding/decoding"

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

View File

@@ -2,6 +2,7 @@ package images
import (
"context"
"encoding/json"
"strings"
"time"
@@ -9,7 +10,6 @@ import (
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/platforms"
jsoniter "github.com/json-iterator/go"
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
@@ -123,7 +123,6 @@ func Manifest(ctx context.Context, provider content.Provider, image ocispec.Desc
return ocispec.Manifest{}, err
}
}
json := jsoniter.ConfigCompatibleWithStandardLibrary
if err := Walk(ctx, HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
switch desc.MediaType {
@@ -217,7 +216,6 @@ func Config(ctx context.Context, provider content.Provider, image ocispec.Descri
// Platforms returns one or more platforms supported by the image.
func Platforms(ctx context.Context, provider content.Provider, image ocispec.Descriptor) ([]ocispec.Platform, error) {
var platformSpecs []ocispec.Platform
json := jsoniter.ConfigCompatibleWithStandardLibrary
return platformSpecs, Walk(ctx, Handlers(HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
if desc.Platform != nil {
platformSpecs = append(platformSpecs, *desc.Platform)
@@ -288,7 +286,6 @@ func Check(ctx context.Context, provider content.Provider, image ocispec.Descrip
// Children returns the immediate children of content described by the descriptor.
func Children(ctx context.Context, provider content.Provider, desc ocispec.Descriptor, platform string) ([]ocispec.Descriptor, error) {
json := jsoniter.ConfigCompatibleWithStandardLibrary
var descs []ocispec.Descriptor
switch desc.MediaType {
case MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest:
@@ -357,7 +354,6 @@ func RootFS(ctx context.Context, provider content.Provider, configDesc ocispec.D
return nil, err
}
json := jsoniter.ConfigCompatibleWithStandardLibrary
var config ocispec.Image
if err := json.Unmarshal(p, &config); err != nil {
return nil, err

View File

@@ -3,13 +3,13 @@ package oci
import (
"archive/tar"
"context"
"encoding/json"
"io"
"sort"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/platforms"
jsoniter "github.com/json-iterator/go"
ocispecs "github.com/opencontainers/image-spec/specs-go"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
@@ -116,8 +116,6 @@ func ociLayoutFile(version string) tarRecord {
Version: version,
}
json := jsoniter.ConfigCompatibleWithStandardLibrary
b, err := json.Marshal(layout)
if err != nil {
panic(err)
@@ -146,7 +144,6 @@ func ociIndexRecord(manifests ...ocispec.Descriptor) tarRecord {
Manifests: manifests,
}
json := jsoniter.ConfigCompatibleWithStandardLibrary
b, err := json.Marshal(index)
if err != nil {
panic(err)

View File

@@ -4,6 +4,7 @@ package oci
import (
"archive/tar"
"context"
"encoding/json"
"fmt"
"io"
"io/ioutil"
@@ -13,7 +14,6 @@ import (
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
jsoniter "github.com/json-iterator/go"
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
@@ -83,7 +83,6 @@ func onUntarIndexJSON(r io.Reader, imageName string) ([]images.Image, error) {
if err != nil {
return nil, err
}
json := jsoniter.ConfigCompatibleWithStandardLibrary
var idx ocispec.Index
if err := json.Unmarshal(b, &idx); err != nil {
return nil, err
@@ -132,7 +131,6 @@ func onUntarBlob(ctx context.Context, r io.Reader, store content.Store, name str
// - images.MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest
// - images.MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex
func GetChildrenDescriptors(r io.Reader, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
json := jsoniter.ConfigCompatibleWithStandardLibrary
switch desc.MediaType {
case images.MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest:
var manifest ocispec.Manifest