move build-tagged shardwidth files to subpackage

executor.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"github.com/pilosa/pilosa/pql"
+	"github.com/pilosa/pilosa/shardwidth"
 	"github.com/pilosa/pilosa/tracing"
 	"github.com/pkg/errors"
 )
@@ -1234,7 +1235,7 @@ func (e *executor) executeRowsShard(_ context.Context, index string, fieldName s
 	if columnID, ok, err := c.UintArg("column"); err != nil {
 		return nil, err
 	} else if ok {
-		colShard := columnID >> shardWidthExponent
+		colShard := columnID >> shardwidth.Exponent
 		if colShard != shard {
 			return rowIDs, nil
 		}

fragment.go

@@ -40,6 +40,7 @@ import (
 	"github.com/pilosa/pilosa/logger"
 	"github.com/pilosa/pilosa/pql"
 	"github.com/pilosa/pilosa/roaring"
+	"github.com/pilosa/pilosa/shardwidth"
 	"github.com/pilosa/pilosa/stats"
 	"github.com/pilosa/pilosa/syswrap"
 	"github.com/pilosa/pilosa/tracing"
@@ -50,7 +51,7 @@ const (
 	// ShardWidth is the number of column IDs in a shard. It must be a power of 2 greater than or equal to 16.
 	// shardWidthExponent = 20 // set in shardwidthNN.go files
 
-	ShardWidth = 1 << shardWidthExponent
+	ShardWidth = 1 << shardwidth.Exponent
 
 	// shardVsContainerExponent is the power of 2 of ShardWith minus the power
 	// of two of roaring container width (which is 16).
@@ -60,7 +61,7 @@ const (
 	// which a given container is in means dividing by the number of rows per
 	// container which is performantly expressed as a right shift by this
 	// exponent.
-	shardVsContainerExponent = shardWidthExponent - 16
+	shardVsContainerExponent = shardwidth.Exponent - 16
 
 	// width of roaring containers is 2^16
 	containerWidth = 1 << 16

shardwidth/16.go

@@ -0,0 +1,5 @@
+// +build shardwidth16
+
+package shardwidth
+
+const Exponent = 16

shardwidth/17.go

@@ -0,0 +1,5 @@
+// +build shardwidth17
+
+package shardwidth
+
+const Exponent = 17

shardwidth/18.go

@@ -0,0 +1,5 @@
+// +build shardwidth18
+
+package shardwidth
+
+const Exponent = 18

shardwidth/19.go

@@ -0,0 +1,5 @@
+// +build shardwidth19
+
+package shardwidth
+
+const Exponent = 19

shardwidth/20.go

@@ -1,5 +1,5 @@
 // +build !shardwidth16,!shardwidth17,!shardwidth18,!shardwidth19,!shardwidth21,!shardwidth22,!shardwidth23,!shardwidth24,!shardwidth25,!shardwidth26,!shardwidth27,!shardwidth28,!shardwidth29,!shardwidth30,!shardwidth31,!shardwidth32
 
-package pilosa
+package shardwidth
 
-const shardWidthExponent = 20
+const Exponent = 20

shardwidth/21.go

@@ -0,0 +1,5 @@
+// +build shardwidth21
+
+package shardwidth
+
+const Exponent = 21

shardwidth/22.go

@@ -0,0 +1,5 @@
+// +build shardwidth22
+
+package shardwidth
+
+const Exponent = 22

shardwidth/23.go

@@ -0,0 +1,5 @@
+// +build shardwidth23
+
+package shardwidth
+
+const Exponent = 23

shardwidth/24.go

@@ -0,0 +1,5 @@
+// +build shardwidth24
+
+package shardwidth
+
+const Exponent = 24

shardwidth/25.go

@@ -0,0 +1,5 @@
+// +build shardwidth25
+
+package shardwidth
+
+const Exponent = 25

shardwidth/26.go

@@ -0,0 +1,5 @@
+// +build shardwidth26
+
+package shardwidth
+
+const Exponent = 26

shardwidth/27.go

@@ -0,0 +1,5 @@
+// +build shardwidth27
+
+package shardwidth
+
+const Exponent = 27

shardwidth/28.go

@@ -0,0 +1,5 @@
+// +build shardwidth28
+
+package shardwidth
+
+const Exponent = 28

shardwidth/29.go

@@ -0,0 +1,5 @@
+// +build shardwidth29
+
+package shardwidth
+
+const Exponent = 29

shardwidth/30.go

@@ -0,0 +1,5 @@
+// +build shardwidth30
+
+package shardwidth
+
+const Exponent = 30

shardwidth/31.go

@@ -0,0 +1,5 @@
+// +build shardwidth31
+
+package shardwidth
+
+const Exponent = 31

shardwidth/32.go

@@ -0,0 +1,5 @@
+// +build shardwidth32
+
+package shardwidth
+
+const Exponent = 32

shardwidth22.go

@@ -1,5 +0,0 @@
-// +build shardwidth22
-
-package pilosa
-
-const shardWidthExponent = 22