GAE CL for luci-go common refactor R=nodir@chromium.org, dnj@chromium.org, estaab@chromium.org BUG= Review URL: https://codereview.chromium.org/2192003003 .
diff --git a/filter/dscache/context.go b/filter/dscache/context.go index 6263e17..8d2ae3b 100644 --- a/filter/dscache/context.go +++ b/filter/dscache/context.go
@@ -8,7 +8,7 @@ ds "github.com/luci/gae/service/datastore" "github.com/luci/gae/service/info" mc "github.com/luci/gae/service/memcache" - "github.com/luci/luci-go/common/mathrand" + "github.com/luci/luci-go/common/data/rand/mathrand" "golang.org/x/net/context" )
diff --git a/filter/dscache/dscache_test.go b/filter/dscache/dscache_test.go index 36562b8..cc1b606 100644 --- a/filter/dscache/dscache_test.go +++ b/filter/dscache/dscache_test.go
@@ -19,7 +19,7 @@ "github.com/luci/gae/service/memcache" "github.com/luci/luci-go/common/clock" "github.com/luci/luci-go/common/clock/testclock" - "github.com/luci/luci-go/common/mathrand" + "github.com/luci/luci-go/common/data/rand/mathrand" . "github.com/smartystreets/goconvey/convey" "golang.org/x/net/context" )
diff --git a/filter/txnBuf/query_merger.go b/filter/txnBuf/query_merger.go index 549ec76..524b5a9 100644 --- a/filter/txnBuf/query_merger.go +++ b/filter/txnBuf/query_merger.go
@@ -11,7 +11,7 @@ "github.com/luci/gae/impl/memory" ds "github.com/luci/gae/service/datastore" "github.com/luci/gae/service/datastore/serialize" - "github.com/luci/luci-go/common/stringset" + "github.com/luci/luci-go/common/data/stringset" ) // queryToIter takes a FinalizedQuery and returns an iterator function which
diff --git a/filter/txnBuf/state.go b/filter/txnBuf/state.go index 1fefc1b..26dafa5 100644 --- a/filter/txnBuf/state.go +++ b/filter/txnBuf/state.go
@@ -12,9 +12,9 @@ "github.com/luci/gae/service/datastore" "github.com/luci/gae/service/datastore/serialize" "github.com/luci/gae/service/info" + "github.com/luci/luci-go/common/data/stringset" "github.com/luci/luci-go/common/errors" - "github.com/luci/luci-go/common/parallel" - "github.com/luci/luci-go/common/stringset" + "github.com/luci/luci-go/common/sync/parallel" "golang.org/x/net/context" )
diff --git a/filter/txnBuf/txnbuf_test.go b/filter/txnBuf/txnbuf_test.go index a115d06..c39d0e5 100644 --- a/filter/txnBuf/txnbuf_test.go +++ b/filter/txnBuf/txnbuf_test.go
@@ -13,7 +13,7 @@ "github.com/luci/gae/filter/count" "github.com/luci/gae/impl/memory" "github.com/luci/gae/service/datastore" - "github.com/luci/luci-go/common/cmpbin" + "github.com/luci/luci-go/common/data/cmpbin" "github.com/luci/luci-go/common/errors" . "github.com/luci/luci-go/common/testing/assertions" . "github.com/smartystreets/goconvey/convey"
diff --git a/impl/memory/datastore_index_selection.go b/impl/memory/datastore_index_selection.go index 8716e97..2a5fe2f 100644 --- a/impl/memory/datastore_index_selection.go +++ b/impl/memory/datastore_index_selection.go
@@ -12,7 +12,7 @@ ds "github.com/luci/gae/service/datastore" "github.com/luci/gae/service/datastore/serialize" - "github.com/luci/luci-go/common/stringset" + "github.com/luci/luci-go/common/data/stringset" ) // ErrMissingIndex is returned when the current indexes are not sufficient
diff --git a/impl/memory/datastore_query.go b/impl/memory/datastore_query.go index 933b780..feacb3f 100644 --- a/impl/memory/datastore_query.go +++ b/impl/memory/datastore_query.go
@@ -12,8 +12,8 @@ ds "github.com/luci/gae/service/datastore" "github.com/luci/gae/service/datastore/serialize" - "github.com/luci/luci-go/common/cmpbin" - "github.com/luci/luci-go/common/stringset" + "github.com/luci/luci-go/common/data/cmpbin" + "github.com/luci/luci-go/common/data/stringset" ) // MaxQueryComponents was lifted from a hard-coded constant in dev_appserver.
diff --git a/impl/memory/datastore_query_execution.go b/impl/memory/datastore_query_execution.go index 3718c27..c5d5bf2 100644 --- a/impl/memory/datastore_query_execution.go +++ b/impl/memory/datastore_query_execution.go
@@ -11,8 +11,8 @@ ds "github.com/luci/gae/service/datastore" "github.com/luci/gae/service/datastore/serialize" - "github.com/luci/luci-go/common/cmpbin" - "github.com/luci/luci-go/common/stringset" + "github.com/luci/luci-go/common/data/cmpbin" + "github.com/luci/luci-go/common/data/stringset" ) type queryStrategy interface {
diff --git a/impl/memory/datastore_query_test.go b/impl/memory/datastore_query_test.go index 912c78a..44b1a4c 100644 --- a/impl/memory/datastore_query_test.go +++ b/impl/memory/datastore_query_test.go
@@ -10,8 +10,8 @@ dstore "github.com/luci/gae/service/datastore" "github.com/luci/gae/service/datastore/serialize" - "github.com/luci/luci-go/common/cmpbin" - "github.com/luci/luci-go/common/stringset" + "github.com/luci/luci-go/common/data/cmpbin" + "github.com/luci/luci-go/common/data/stringset" . "github.com/luci/luci-go/common/testing/assertions" . "github.com/smartystreets/goconvey/convey" )
diff --git a/impl/memory/gkvlite_iter_test.go b/impl/memory/gkvlite_iter_test.go index 26e0af0..2a873ff 100644 --- a/impl/memory/gkvlite_iter_test.go +++ b/impl/memory/gkvlite_iter_test.go
@@ -11,7 +11,7 @@ "github.com/luci/gae/service/datastore" "github.com/luci/gae/service/datastore/serialize" "github.com/luci/gkvlite" - "github.com/luci/luci-go/common/cmpbin" + "github.com/luci/luci-go/common/data/cmpbin" . "github.com/smartystreets/goconvey/convey" )
diff --git a/impl/memory/mail_static_lists.go b/impl/memory/mail_static_lists.go index a65f13b..b664e66 100644 --- a/impl/memory/mail_static_lists.go +++ b/impl/memory/mail_static_lists.go
@@ -5,7 +5,7 @@ package memory import ( - "github.com/luci/luci-go/common/stringset" + "github.com/luci/luci-go/common/data/stringset" ) // all of these constants were imported on Mon Dec 14 18:18:00 PST 2015 from
diff --git a/impl/memory/taskqueue.go b/impl/memory/taskqueue.go index 7e84c99..2ee29fe 100644 --- a/impl/memory/taskqueue.go +++ b/impl/memory/taskqueue.go
@@ -11,8 +11,8 @@ "golang.org/x/net/context" tq "github.com/luci/gae/service/taskqueue" + "github.com/luci/luci-go/common/data/rand/mathrand" "github.com/luci/luci-go/common/errors" - "github.com/luci/luci-go/common/mathrand" ) /////////////////////////////// public functions ///////////////////////////////
diff --git a/impl/memory/taskqueue_test.go b/impl/memory/taskqueue_test.go index b97b541..b9b261a 100644 --- a/impl/memory/taskqueue_test.go +++ b/impl/memory/taskqueue_test.go
@@ -16,7 +16,7 @@ tqS "github.com/luci/gae/service/taskqueue" "github.com/luci/luci-go/common/clock" "github.com/luci/luci-go/common/clock/testclock" - "github.com/luci/luci-go/common/mathrand" + "github.com/luci/luci-go/common/data/rand/mathrand" . "github.com/luci/luci-go/common/testing/assertions" . "github.com/smartystreets/goconvey/convey" "golang.org/x/net/context"
diff --git a/impl/memory/testing_utils_test.go b/impl/memory/testing_utils_test.go index 8084892..66447d0 100644 --- a/impl/memory/testing_utils_test.go +++ b/impl/memory/testing_utils_test.go
@@ -12,7 +12,7 @@ ds "github.com/luci/gae/service/datastore" "github.com/luci/gae/service/datastore/serialize" - "github.com/luci/luci-go/common/cmpbin" + "github.com/luci/luci-go/common/data/cmpbin" ) func init() {
diff --git a/service/datastore/query.go b/service/datastore/query.go index 08ae6e1..35756f7 100644 --- a/service/datastore/query.go +++ b/service/datastore/query.go
@@ -11,8 +11,8 @@ "strings" "sync" + "github.com/luci/luci-go/common/data/stringset" "github.com/luci/luci-go/common/errors" - "github.com/luci/luci-go/common/stringset" ) var (
diff --git a/service/datastore/query_test.go b/service/datastore/query_test.go index f0dbcd6..9e16edc 100644 --- a/service/datastore/query_test.go +++ b/service/datastore/query_test.go
@@ -8,7 +8,7 @@ "math" "testing" - "github.com/luci/luci-go/common/parallel" + "github.com/luci/luci-go/common/sync/parallel" . "github.com/luci/luci-go/common/testing/assertions" . "github.com/smartystreets/goconvey/convey" )
diff --git a/service/datastore/serialize/serialize.go b/service/datastore/serialize/serialize.go index 11435c0..66a6db7 100644 --- a/service/datastore/serialize/serialize.go +++ b/service/datastore/serialize/serialize.go
@@ -13,8 +13,8 @@ "github.com/luci/gae/service/blobstore" ds "github.com/luci/gae/service/datastore" - "github.com/luci/luci-go/common/cmpbin" - "github.com/luci/luci-go/common/stringset" + "github.com/luci/luci-go/common/data/cmpbin" + "github.com/luci/luci-go/common/data/stringset" ) // MaxIndexColumns is the maximum number of sort columns (e.g. sort orders) that
diff --git a/service/datastore/serialize/serialize_test.go b/service/datastore/serialize/serialize_test.go index 3cad2cf..d6c9b9f 100644 --- a/service/datastore/serialize/serialize_test.go +++ b/service/datastore/serialize/serialize_test.go
@@ -13,7 +13,7 @@ "github.com/luci/gae/service/blobstore" ds "github.com/luci/gae/service/datastore" - "github.com/luci/luci-go/common/cmpbin" + "github.com/luci/luci-go/common/data/cmpbin" . "github.com/luci/luci-go/common/testing/assertions" . "github.com/smartystreets/goconvey/convey" )