rtree: move rtree from utils to pkg

Signed-off-by: Neil Shen <overvenus@gmail.com>
pingcap · Feb 24, 2020 · 8810be1 · 8810be1
1 parent 9cc5029
commit 8810be1
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 9 deletions.
diff --git a/cmd/validate.go b/cmd/validate.go
@@ -19,9 +19,9 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/pingcap/br/pkg/restore"
+	"github.com/pingcap/br/pkg/rtree"
 	"github.com/pingcap/br/pkg/task"
 	"github.com/pingcap/br/pkg/utils"
-	"github.com/pingcap/br/pkg/utils/rtree"
 )
 
 // NewValidateCommand return a debug subcommand.

diff --git a/pkg/backup/client.go b/pkg/backup/client.go
@@ -29,10 +29,10 @@ import (
 	"github.com/pingcap/tidb/util/ranger"
 	"go.uber.org/zap"
 
+	"github.com/pingcap/br/pkg/rtree"
 	"github.com/pingcap/br/pkg/storage"
 	"github.com/pingcap/br/pkg/summary"
 	"github.com/pingcap/br/pkg/utils"
-	"github.com/pingcap/br/pkg/utils/rtree"
 )
 
 // ClientMgr manages connections needed by backup.

diff --git a/pkg/backup/push.go b/pkg/backup/push.go
@@ -10,7 +10,7 @@ import (
 	"github.com/pingcap/log"
 	"go.uber.org/zap"
 
-	"github.com/pingcap/br/pkg/utils/rtree"
+	"github.com/pingcap/br/pkg/rtree"
 )
 
 // pushDown warps a backup task.

diff --git a/pkg/restore/range.go b/pkg/restore/range.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pingcap/tidb/tablecodec"
 	"go.uber.org/zap"
 
-	"github.com/pingcap/br/pkg/utils/rtree"
+	"github.com/pingcap/br/pkg/rtree"
 )
 
 // sortRanges checks if the range overlapped and sort them

diff --git a/pkg/restore/range_test.go b/pkg/restore/range_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/import_sstpb"
 	"github.com/pingcap/tidb/tablecodec"
 
-	"github.com/pingcap/br/pkg/utils/rtree"
+	"github.com/pingcap/br/pkg/rtree"
 )
 
 type testRangeSuite struct{}

diff --git a/pkg/restore/split.go b/pkg/restore/split.go
@@ -14,7 +14,7 @@ import (
 	"github.com/pingcap/tidb/util/codec"
 	"go.uber.org/zap"
 
-	"github.com/pingcap/br/pkg/utils/rtree"
+	"github.com/pingcap/br/pkg/rtree"
 )
 
 // Constants for split retry machinery.

diff --git a/pkg/restore/split_test.go b/pkg/restore/split_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/pingcap/pd/server/schedule/placement"
 	"github.com/pingcap/tidb/util/codec"
 
-	"github.com/pingcap/br/pkg/utils/rtree"
+	"github.com/pingcap/br/pkg/rtree"
 )
 
 type testClient struct {

diff --git a/pkg/restore/util.go b/pkg/restore/util.go
@@ -18,8 +18,8 @@ import (
 	"github.com/pingcap/tidb/util/codec"
 	"go.uber.org/zap"
 
+	"github.com/pingcap/br/pkg/rtree"
 	"github.com/pingcap/br/pkg/summary"
-	"github.com/pingcap/br/pkg/utils/rtree"
 )
 
 var recordPrefixSep = []byte("_r")

diff --git a/pkg/utils/rtree/check.go → pkg/rtree/check.go b/pkg/utils/rtree/check.go → pkg/rtree/check.go
diff --git a/pkg/utils/rtree/rtree.go → pkg/rtree/rtree.go b/pkg/utils/rtree/rtree.go → pkg/rtree/rtree.go
diff --git a/pkg/utils/rtree/rtree_test.go → pkg/rtree/rtree_test.go b/pkg/utils/rtree/rtree_test.go → pkg/rtree/rtree_test.go
diff --git a/pkg/task/restore.go b/pkg/task/restore.go
@@ -13,9 +13,9 @@ import (
 	"github.com/pingcap/br/pkg/conn"
 	"github.com/pingcap/br/pkg/glue"
 	"github.com/pingcap/br/pkg/restore"
+	"github.com/pingcap/br/pkg/rtree"
 	"github.com/pingcap/br/pkg/summary"
 	"github.com/pingcap/br/pkg/utils"
-	"github.com/pingcap/br/pkg/utils/rtree"
 )
 
 const (