From 336a78aeafe936e4f28c81df288c8e551e076381 Mon Sep 17 00:00:00 2001 From: Matthias Bertschy Date: Tue, 28 Feb 2017 07:50:44 +0100 Subject: [PATCH] Use natural sorting for strings in sorting_printer Import new dependency vbom.ml/util/sortorder Run ./hack/update-bazel.sh --- Godeps/Godeps.json | 6 +- Godeps/LICENSES | 25 ++++++++ pkg/kubectl/BUILD | 1 + pkg/kubectl/sorting_printer.go | 6 +- vendor/BUILD | 9 +++ vendor/vbom.ml/util/LICENSE | 17 ++++++ vendor/vbom.ml/util/sortorder/README.md | 5 ++ vendor/vbom.ml/util/sortorder/doc.go | 5 ++ vendor/vbom.ml/util/sortorder/natsort.go | 76 ++++++++++++++++++++++++ 9 files changed, 147 insertions(+), 3 deletions(-) create mode 100644 vendor/vbom.ml/util/LICENSE create mode 100644 vendor/vbom.ml/util/sortorder/README.md create mode 100644 vendor/vbom.ml/util/sortorder/doc.go create mode 100644 vendor/vbom.ml/util/sortorder/natsort.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 80e0c413c7..3a57f08ae7 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,7 +1,7 @@ { "ImportPath": "k8s.io/kubernetes", "GoVersion": "go1.7", - "GodepVersion": "v78", + "GodepVersion": "v79", "Packages": [ "github.com/ugorji/go/codec/codecgen", "github.com/onsi/ginkgo/ginkgo", @@ -2761,6 +2761,10 @@ "ImportPath": "k8s.io/heapster/metrics/apis/metrics/v1alpha1", "Comment": "v1.2.0-beta.1", "Rev": "c2ac40f1adf8c42a79badddb2a2acd673cae3bcb" + }, + { + "ImportPath": "vbom.ml/util/sortorder", + "Rev": "db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394" } ] } diff --git a/Godeps/LICENSES b/Godeps/LICENSES index 3543ae703d..29ca8f66a4 100644 --- a/Godeps/LICENSES +++ b/Godeps/LICENSES @@ -83176,3 +83176,28 @@ Apache License = vendor/k8s.io/heapster/LICENSE 136e4f49dbf29942c572a3a8f6e88a77 - ================================================================================ + +================================================================================ += vendor/vbom.ml/util/sortorder licensed under: = + +The MIT License (MIT) +Copyright (c) 2015 Frits van Bommel +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + += vendor/vbom.ml/util/LICENSE 9f7e1d7e8f527330ebb5f4c32e0f3e40 - +================================================================================ + diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index e1e3011dcd..386dd98aad 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -99,6 +99,7 @@ go_library( "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/util/integer", "//vendor:k8s.io/client-go/util/jsonpath", + "//vendor:vbom.ml/util/sortorder", ], ) diff --git a/pkg/kubectl/sorting_printer.go b/pkg/kubectl/sorting_printer.go index 6243b6c0e6..bd8f5f973f 100644 --- a/pkg/kubectl/sorting_printer.go +++ b/pkg/kubectl/sorting_printer.go @@ -32,6 +32,8 @@ import ( "k8s.io/client-go/util/jsonpath" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/printers" + + "vbom.ml/util/sortorder" ) // Sorting printer sorts list types before delegating to another printer. @@ -175,7 +177,7 @@ func isLess(i, j reflect.Value) (bool, error) { case reflect.Float32, reflect.Float64: return i.Float() < j.Float(), nil case reflect.String: - return i.String() < j.String(), nil + return sortorder.NaturalLess(i.String(), j.String()), nil case reflect.Ptr: return isLess(i.Elem(), j.Elem()) case reflect.Struct: @@ -254,7 +256,7 @@ func isLess(i, j reflect.Value) (bool, error) { } case string: if jtype, ok := j.Interface().(string); ok { - return itype < jtype, nil + return sortorder.NaturalLess(itype, jtype), nil } default: return false, fmt.Errorf("unsortable type: %T", itype) diff --git a/vendor/BUILD b/vendor/BUILD index 0c1452c6af..39f8966ad4 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -16568,3 +16568,12 @@ go_library( "//vendor:k8s.io/client-go/pkg/apis/storage/v1beta1", ], ) + +go_library( + name = "vbom.ml/util/sortorder", + srcs = [ + "vbom.ml/util/sortorder/doc.go", + "vbom.ml/util/sortorder/natsort.go", + ], + tags = ["automanaged"], +) diff --git a/vendor/vbom.ml/util/LICENSE b/vendor/vbom.ml/util/LICENSE new file mode 100644 index 0000000000..5c695fb590 --- /dev/null +++ b/vendor/vbom.ml/util/LICENSE @@ -0,0 +1,17 @@ +The MIT License (MIT) +Copyright (c) 2015 Frits van Bommel +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/vbom.ml/util/sortorder/README.md b/vendor/vbom.ml/util/sortorder/README.md new file mode 100644 index 0000000000..ed8da0e29b --- /dev/null +++ b/vendor/vbom.ml/util/sortorder/README.md @@ -0,0 +1,5 @@ +## sortorder [![GoDoc](https://godoc.org/vbom.ml/util/sortorder?status.svg)](https://godoc.org/vbom.ml/util/sortorder) + + import "vbom.ml/util/sortorder" + +Sort orders and comparison functions. diff --git a/vendor/vbom.ml/util/sortorder/doc.go b/vendor/vbom.ml/util/sortorder/doc.go new file mode 100644 index 0000000000..75d5a2928f --- /dev/null +++ b/vendor/vbom.ml/util/sortorder/doc.go @@ -0,0 +1,5 @@ +// Package sortorder implements sort orders and comparison functions. +// +// Currently, it only implements so-called "natural order", where integers +// embedded in strings are compared by value. +package sortorder diff --git a/vendor/vbom.ml/util/sortorder/natsort.go b/vendor/vbom.ml/util/sortorder/natsort.go new file mode 100644 index 0000000000..1af08c1bd1 --- /dev/null +++ b/vendor/vbom.ml/util/sortorder/natsort.go @@ -0,0 +1,76 @@ +package sortorder + +// Natural implements sort.Interface to sort strings in natural order. This +// means that e.g. "abc2" < "abc12". +// +// Non-digit sequences and numbers are compared separately. The former are +// compared bytewise, while the latter are compared numerically (except that +// the number of leading zeros is used as a tie-breaker, so e.g. "2" < "02") +// +// Limitation: only ASCII digits (0-9) are considered. +type Natural []string + +func (n Natural) Len() int { return len(n) } +func (n Natural) Swap(i, j int) { n[i], n[j] = n[j], n[i] } +func (n Natural) Less(i, j int) bool { return NaturalLess(n[i], n[j]) } + +func isdigit(b byte) bool { return '0' <= b && b <= '9' } + +// NaturalLess compares two strings using natural ordering. This means that e.g. +// "abc2" < "abc12". +// +// Non-digit sequences and numbers are compared separately. The former are +// compared bytewise, while the latter are compared numerically (except that +// the number of leading zeros is used as a tie-breaker, so e.g. "2" < "02") +// +// Limitation: only ASCII digits (0-9) are considered. +func NaturalLess(str1, str2 string) bool { + idx1, idx2 := 0, 0 + for idx1 < len(str1) && idx2 < len(str2) { + c1, c2 := str1[idx1], str2[idx2] + dig1, dig2 := isdigit(c1), isdigit(c2) + switch { + case dig1 != dig2: // Digits before other characters. + return dig1 // True if LHS is a digit, false if the RHS is one. + case !dig1: // && !dig2, because dig1 == dig2 + // UTF-8 compares bytewise-lexicographically, no need to decode + // codepoints. + if c1 != c2 { + return c1 < c2 + } + idx1++ + idx2++ + default: // Digits + // Eat zeros. + for ; idx1 < len(str1) && str1[idx1] == '0'; idx1++ { + } + for ; idx2 < len(str2) && str2[idx2] == '0'; idx2++ { + } + // Eat all digits. + nonZero1, nonZero2 := idx1, idx2 + for ; idx1 < len(str1) && isdigit(str1[idx1]); idx1++ { + } + for ; idx2 < len(str2) && isdigit(str2[idx2]); idx2++ { + } + // If lengths of numbers with non-zero prefix differ, the shorter + // one is less. + if len1, len2 := idx1-nonZero1, idx2-nonZero2; len1 != len2 { + return len1 < len2 + } + // If they're not equal, string comparison is correct. + if nr1, nr2 := str1[nonZero1:idx1], str2[nonZero2:idx2]; nr1 != nr2 { + return nr1 < nr2 + } + // Otherwise, the one with less zeros is less. + // Because everything up to the number is equal, comparing the index + // after the zeros is sufficient. + if nonZero1 != nonZero2 { + return nonZero1 < nonZero2 + } + } + // They're identical so far, so continue comparing. + } + // So far they are identical. At least one is ended. If the other continues, + // it sorts last. + return len(str1) < len(str2) +}