Provide an int64 version of Quantity that is much faster

cmd/kubelet/app/server.go

@@ -927,10 +927,10 @@ func parseResourceList(m utilconfig.ConfigurationMap) (api.ResourceList, error)
 			if err != nil {
 				return nil, err
 			}
-			if q.Amount.Sign() == -1 {
+			if q.Sign() == -1 {
 				return nil, fmt.Errorf("resource quantity for %q cannot be negative: %v", k, v)
 			}
-			rl[api.ResourceName(k)] = *q
+			rl[api.ResourceName(k)] = q
 		default:
 			return nil, fmt.Errorf("cannot reserve %q resource", k)
 		}

contrib/mesos/pkg/scheduler/resources/resource.go

@@ -85,14 +85,8 @@ func podResources(pod *api.Pod, resourceName api.ResourceName, def, min resource
 		}
 
 		// add up the request and limit sum for all containers
-		err = requestSum.Add(request)
-		if err != nil {
-			return
-		}
-		err = limitSum.Add(limit)
-		if err != nil {
-			return
-		}
+		requestSum.Add(request)
+		limitSum.Add(limit)
 
 		// optionally write request and limit back
 		if write {

federation/apis/federation/types.generated.go

@@ -25,11 +25,10 @@ import (
 	"errors"
 	"fmt"
 	codec1978 "github.com/ugorji/go/codec"
-	pkg4_inf_v0 "gopkg.in/inf.v0"
 	pkg1_api "k8s.io/kubernetes/pkg/api"
 	pkg3_resource "k8s.io/kubernetes/pkg/api/resource"
 	pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned"
-	pkg5_types "k8s.io/kubernetes/pkg/types"
+	pkg4_types "k8s.io/kubernetes/pkg/types"
 	"reflect"
 	"runtime"
 	time "time"
@@ -65,13 +64,12 @@ func init() {
 		panic(err)
 	}
 	if false { // reference the types, but skip this branch at build/run time
-		var v0 pkg4_inf_v0.Dec
-		var v1 pkg1_api.ConditionStatus
-		var v2 pkg3_resource.Quantity
-		var v3 pkg2_unversioned.Time
-		var v4 pkg5_types.UID
-		var v5 time.Time
-		_, _, _, _, _, _ = v0, v1, v2, v3, v4, v5
+		var v0 pkg1_api.ConditionStatus
+		var v1 pkg3_resource.Quantity
+		var v2 pkg2_unversioned.Time
+		var v3 pkg4_types.UID
+		var v4 time.Time
+		_, _, _, _, _ = v0, v1, v2, v3, v4
 	}
 }
 

federation/apis/federation/v1alpha1/types.generated.go

@@ -25,11 +25,10 @@ import (
 	"errors"
 	"fmt"
 	codec1978 "github.com/ugorji/go/codec"
-	pkg4_inf_v0 "gopkg.in/inf.v0"
 	pkg3_resource "k8s.io/kubernetes/pkg/api/resource"
 	pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	pkg1_v1 "k8s.io/kubernetes/pkg/api/v1"
-	pkg5_types "k8s.io/kubernetes/pkg/types"
+	pkg4_types "k8s.io/kubernetes/pkg/types"
 	"reflect"
 	"runtime"
 	time "time"
@@ -65,13 +64,12 @@ func init() {
 		panic(err)
 	}
 	if false { // reference the types, but skip this branch at build/run time
-		var v0 pkg4_inf_v0.Dec
-		var v1 pkg3_resource.Quantity
-		var v2 pkg2_unversioned.Time
-		var v3 pkg1_v1.ConditionStatus
-		var v4 pkg5_types.UID
-		var v5 time.Time
-		_, _, _, _, _, _ = v0, v1, v2, v3, v4, v5
+		var v0 pkg3_resource.Quantity
+		var v1 pkg2_unversioned.Time
+		var v2 pkg1_v1.ConditionStatus
+		var v3 pkg4_types.UID
+		var v4 time.Time
+		_, _, _, _, _ = v0, v1, v2, v3, v4
 	}
 }
 

hack/lib/golang.sh

@@ -68,7 +68,7 @@ else
     linux/amd64
     linux/arm
     linux/arm64
-    linux/ppc64le
+    #linux/ppc64le # temporarily disabled due to a linking error
   )
 
   # If we update this we should also update the set of golang compilers we build
@@ -78,7 +78,7 @@ else
     linux/386
     linux/arm
     linux/arm64
-    linux/ppc64le
+    #linux/ppc64le # temporarily disabled due to a linking error
     darwin/amd64
     darwin/386
     windows/amd64

pkg/api/helpers.go

@@ -58,16 +58,7 @@ var Semantic = conversion.EqualitiesOrDie(
 		// TODO: if we decide it's important, it should be safe to start comparing the format.
 		//
 		// Uninitialized quantities are equivalent to 0 quantities.
-		if a.Amount == nil && b.MilliValue() == 0 {
-			return true
-		}
-		if b.Amount == nil && a.MilliValue() == 0 {
-			return true
-		}
-		if a.Amount == nil || b.Amount == nil {
-			return false
-		}
-		return a.Amount.Cmp(b.Amount) == 0
+		return a.Cmp(b) == 0
 	},
 	func(a, b unversioned.Time) bool {
 		return a.UTC() == b.UTC()

pkg/api/helpers_test.go

@@ -23,8 +23,6 @@ import (
 
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/labels"
-
-	inf "gopkg.in/inf.v0"
 )
 
 func TestConversionError(t *testing.T) {
@@ -56,8 +54,8 @@ func TestSemantic(t *testing.T) {
 		{resource.Quantity{}, resource.MustParse("0"), true},
 		{resource.Quantity{}, resource.MustParse("1m"), false},
 		{
-			resource.Quantity{Amount: inf.NewDec(5, 0), Format: resource.BinarySI},
-			resource.Quantity{Amount: inf.NewDec(5, 0), Format: resource.DecimalSI},
+			resource.NewQuantity(5, resource.BinarySI),
+			resource.NewQuantity(5, resource.DecimalSI),
 			true,
 		},
 		{resource.MustParse("2m"), resource.MustParse("1m"), false},