kvccl: move followerreadsccl under kvccl

Package movement.
cockroachdb · Jul 15, 2020 · b19794d · b19794d
1 parent b7430b5
commit b19794d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/pkg/ccl/ccl_init.go b/pkg/ccl/ccl_init.go
@@ -18,7 +18,6 @@ import (
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/buildccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/cliccl"
-	_ "github.com/cockroachdb/cockroach/pkg/ccl/followerreadsccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/gssapiccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/importccl"
 	_ "github.com/cockroachdb/cockroach/pkg/ccl/kvccl"

diff --git a/pkg/ccl/kvccl/kvccl.go b/pkg/ccl/kvccl/kvccl.go
@@ -8,4 +8,8 @@
 
 package kvccl
 
-import _ "github.com/cockroachdb/cockroach/pkg/ccl/kvccl/kvtenantccl" // init hooks
+import (
+	// ccl init hooks.
+	_ "github.com/cockroachdb/cockroach/pkg/ccl/kvccl/kvfollowerreadsccl"
+	_ "github.com/cockroachdb/cockroach/pkg/ccl/kvccl/kvtenantccl"
+)
diff --git a/pkg/ccl/followerreadsccl/followerreads.go → ...kvccl/kvfollowerreadsccl/followerreads.go b/pkg/ccl/followerreadsccl/followerreads.go → ...kvccl/kvfollowerreadsccl/followerreads.go
@@ -6,9 +6,9 @@
 //
 //     https://github.com/cockroachdb/cockroach/blob/master/licenses/CCL.txt
 
-// Package followerreadsccl implements and injects the functionality needed to
+// Package kvfollowerreadsccl implements and injects the functionality needed to
 // expose follower reads to clients.
-package followerreadsccl
+package kvfollowerreadsccl
 
 import (
 	"fmt"

diff --git a/...cl/followerreadsccl/followerreads_test.go → .../kvfollowerreadsccl/followerreads_test.go b/...cl/followerreadsccl/followerreads_test.go → .../kvfollowerreadsccl/followerreads_test.go
@@ -6,7 +6,7 @@
 //
 //     https://github.com/cockroachdb/cockroach/blob/master/licenses/CCL.txt
 
-package followerreadsccl
+package kvfollowerreadsccl
 
 import (
 	"context"