asim: remove unused keyspace from BaseRanges and rand framework

Previously, we add min/max key to BaseRanges in
3da645a,
which made keyspace field unused. This commit removes the unused
keyspace field from BaseRanges. Additionally, it introduces
min/max keys for the rand framework. Note that some rand tests now
fail due to a simulator assumption that the first range must start
with the key 0. A future commit will explain and address it.

Epic: none
Release note: none

Author: wenyihu6

pkg/kv/kvserver/asim/gen/generator.go

@@ -286,7 +286,6 @@ func GetRangePlacementType(s string) PlacementType {
 type BaseRanges struct {
 	Ranges            int
 	MinKey, MaxKey    int64
-	KeySpace          int
 	ReplicationFactor int
 	Bytes             int64
 	ReplicaPlacement  state.ReplicaPlacement
@@ -307,9 +306,10 @@ func (b BaseRanges) GetRangesInfo(
 	case Skewed:
 		return state.RangesInfoSkewedDistribution(numOfStores, b.Ranges, b.MinKey, b.MaxKey, b.ReplicationFactor, b.Bytes)
 	case Random:
-		return state.RangesInfoRandDistribution(randSource, numOfStores, b.Ranges, b.KeySpace, b.ReplicationFactor, b.Bytes)
+		return state.RangesInfoRandDistribution(randSource, numOfStores, b.Ranges, b.MinKey, b.MaxKey, b.ReplicationFactor, b.Bytes)
 	case WeightedRandom:
-		return state.RangesInfoWeightedRandDistribution(randSource, weightedRandom, b.Ranges, b.KeySpace, b.ReplicationFactor, b.Bytes)
+		return state.RangesInfoWeightedRandDistribution(
+			randSource, weightedRandom, b.Ranges, b.MinKey, b.MaxKey, b.ReplicationFactor, b.Bytes)
 	case ReplicaPlacement:
 		// TODO(tbg): port this over from the prototype.
 		/*

pkg/kv/kvserver/asim/state/new_state.go

@@ -323,7 +323,7 @@ func RangesInfoWeightedRandDistribution(
 	randSource *rand.Rand,
 	weightedStores []float64,
 	ranges int,
-	keyspace int,
+	minKey, maxKey int64,
 	replicationFactor int,
 	rangeSize int64,
 ) RangesInfo {
@@ -341,9 +341,8 @@ func RangesInfoWeightedRandDistribution(
 		distribution,
 		ranges,
 		spanConfig,
-		int64(MinKey),
-		int64(keyspace),
-		rangeSize, /* rangeSize */
+		minKey, maxKey,
+		rangeSize,
 	)
 }
 
@@ -353,7 +352,7 @@ func RangesInfoRandDistribution(
 	randSource *rand.Rand,
 	stores int,
 	ranges int,
-	keyspace int,
+	minKey, maxKey int64,
 	replicationFactor int,
 	rangeSize int64,
 ) RangesInfo {
@@ -369,5 +368,5 @@ func RangesInfoRandDistribution(
 
 	return RangesInfoWithDistribution(
 		storeList, distribution, distribution, ranges, spanConfig,
-		int64(MinKey), int64(keyspace), rangeSize)
+		minKey, maxKey, rangeSize)
 }

pkg/kv/kvserver/asim/state/new_state_test_helper.go

@@ -94,7 +94,8 @@ func NewStateRandDistribution(
 ) State {
 	randSource := rand.New(rand.NewSource(seed))
 	clusterInfo := ClusterInfoWithStoreCount(stores, 1 /* storesPerNode */)
-	rangesInfo := RangesInfoRandDistribution(randSource, stores, ranges, keyspace, replicationFactor, 0 /* rangeSize */)
+	rangesInfo := RangesInfoRandDistribution(randSource, stores, ranges, int64(MinKey),
+		int64(keyspace), replicationFactor, 0 /* rangeSize */)
 	return LoadConfig(clusterInfo, rangesInfo, settings)
 }
 
@@ -110,6 +111,7 @@ func NewStateWeightedRandDistribution(
 ) State {
 	randSource := rand.New(rand.NewSource(seed))
 	clusterInfo := ClusterInfoWithStoreCount(len(weightedStores), 1 /* storesPerNode */)
-	rangesInfo := RangesInfoWeightedRandDistribution(randSource, weightedStores, ranges, keyspace, replicationFactor, 0 /* rangeSize */)
+	rangesInfo := RangesInfoWeightedRandDistribution(randSource, weightedStores, ranges, int64(MinKey),
+		int64(keyspace), replicationFactor, 0 /* rangeSize */)
 	return LoadConfig(clusterInfo, rangesInfo, settings)
 }

pkg/kv/kvserver/asim/tests/datadriven_simulation_test.go

@@ -379,10 +379,8 @@ func TestDataDriven(t *testing.T) {
 							Ranges: 1,
 							MinKey: 0, MaxKey: 1,
 							ReplicationFactor: 1,
-							KeySpace:          defaultKeyspace,
 						},
 					})
-
 				}
 				for sample := 0; sample < samples; sample++ {
 					assertionFailures := []string{}

pkg/kv/kvserver/asim/tests/default_settings.go

@@ -113,7 +113,8 @@ func (f randTestingFramework) defaultBasicRangesGen() gen.BasicRanges {
 	return gen.BasicRanges{
 		BaseRanges: gen.BaseRanges{
 			Ranges:            f.defaultStaticSettings.ranges,
-			KeySpace:          f.defaultStaticSettings.keySpace,
+			MinKey:            f.defaultStaticSettings.minKey,
+			MaxKey:            f.defaultStaticSettings.maxKey,
 			ReplicationFactor: f.defaultStaticSettings.replicationFactor,
 			Bytes:             f.defaultStaticSettings.bytes,
 		},

pkg/kv/kvserver/asim/tests/rand_framework.go

@@ -213,7 +213,8 @@ func (f randTestingFramework) randomBasicRangesGen() gen.RangeGen {
 		return gen.BasicRanges{
 			BaseRanges: gen.BaseRanges{
 				Ranges:            convertInt64ToInt(f.rangeGenerator.key()),
-				KeySpace:          convertInt64ToInt(f.keySpaceGenerator.key()),
+				MinKey:            defaultMinKey,
+				MaxKey:            f.keySpaceGenerator.key(),
 				ReplicationFactor: f.s.rangeGen.replicationFactor,
 				Bytes:             defaultBytes,
 			},
@@ -226,7 +227,8 @@ func (f randTestingFramework) randomBasicRangesGen() gen.RangeGen {
 		return RandomizedBasicRanges{
 			BaseRanges: gen.BaseRanges{
 				Ranges:            convertInt64ToInt(f.rangeGenerator.key()),
-				KeySpace:          convertInt64ToInt(f.keySpaceGenerator.key()),
+				MinKey:            defaultMinKey,
+				MaxKey:            f.keySpaceGenerator.key(),
 				ReplicationFactor: f.s.rangeGen.replicationFactor,
 				Bytes:             defaultBytes,
 			},
@@ -247,7 +249,8 @@ func (f randTestingFramework) randomBasicRangesGen() gen.RangeGen {
 		return WeightedRandomizedBasicRanges{
 			BaseRanges: gen.BaseRanges{
 				Ranges:            convertInt64ToInt(f.rangeGenerator.key()),
-				KeySpace:          convertInt64ToInt(f.keySpaceGenerator.key()),
+				MinKey:            defaultMinKey,
+				MaxKey:            f.keySpaceGenerator.key(),
 				ReplicationFactor: f.s.rangeGen.replicationFactor,
 				Bytes:             defaultBytes,
 			},