From e0624177cd877c5290e42d0fc6874a8276358075 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <brad@danga.com>
Date: Sat, 17 Jan 2015 20:30:37 -0800
Subject: [PATCH] search: add blobref sorting, implementing sorting of results
 when source is unsorted

Part of upcoming blobpacked migration tool.

Change-Id: Ifdc4723d4d1468eb4d2798fadb256b409cfe0555
---
 pkg/search/query.go | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkg/search/query.go b/pkg/search/query.go
index d9e7418be..2822a76f5 100644
--- a/pkg/search/query.go
+++ b/pkg/search/query.go
@@ -26,6 +26,7 @@ import (
 	"net/http"
 	"os"
 	"reflect"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -47,6 +48,7 @@ const (
 	LastModifiedAsc
 	CreatedDesc
 	CreatedAsc
+	BlobRefAsc
 	maxSortType
 )
 
@@ -55,6 +57,7 @@ var sortName = map[SortType][]byte{
 	LastModifiedAsc:  []byte(`"mod"`),
 	CreatedDesc:      []byte(`"-created"`),
 	CreatedAsc:       []byte(`"created"`),
+	BlobRefAsc:       []byte(`"blobref"`),
 }
 
 func (t SortType) MarshalJSON() ([]byte, error) {
@@ -858,7 +861,16 @@ func (h *Handler) Query(rawq *SearchQuery) (*SearchResult, error) {
 		return nil, err
 	}
 	if !cands.sorted {
-		// TODO(bradfitz): sort them
+		switch q.Sort {
+		case UnspecifiedSort:
+			// Nothing to do.
+		case BlobRefAsc:
+			sort.Sort(sortSearchResultBlobs{res.Blobs, func(a, b *SearchResultBlob) bool {
+				return a.Blob.Less(b.Blob)
+			}})
+		default:
+			return nil, errors.New("TODO: unsupported sort+query combination.")
+		}
 		if q.Limit > 0 && len(res.Blobs) > q.Limit {
 			res.Blobs = res.Blobs[:q.Limit]
 		}
@@ -1507,3 +1519,12 @@ func (c *DirConstraint) blobMatches(s *search, br blob.Ref, bm camtypes.BlobMeta
 	// TODO: implement
 	panic("TODO: implement DirConstraint.blobMatches")
 }
+
+type sortSearchResultBlobs struct {
+	s    []*SearchResultBlob
+	less func(a, b *SearchResultBlob) bool
+}
+
+func (ss sortSearchResultBlobs) Len() int           { return len(ss.s) }
+func (ss sortSearchResultBlobs) Swap(i, j int)      { ss.s[i], ss.s[j] = ss.s[j], ss.s[i] }
+func (ss sortSearchResultBlobs) Less(i, j int) bool { return ss.less(ss.s[i], ss.s[j]) }