fixup! chore: caching parameters for multiple routers and batchrouters

Author: Sidddddarth

jobsdb/jobsdb_parameters_cache.go

@@ -36,28 +36,28 @@ type cachingDpvJobsDB struct {
 	JobsDB
 }
 
-func (c *cachingDpvJobsDB) GetDistinctParameterValues(ctx context.Context, parameterName string) (values []string, err error) {
+func (c *cachingDpvJobsDB) GetDistinctParameterValues(ctx context.Context, parameter ParameterName) (values []string, err error) {
 	// only one goroutine can access the cache for a specific parameter at a time
-	c.parameterLock.Lock(parameterName)
-	defer c.parameterLock.Unlock(parameterName)
+	c.parameterLock.Lock(parameter.string())
+	defer c.parameterLock.Unlock(parameter.string())
 
 	// read the cache
 	c.cacheMu.RLock()
-	if cachedEntry, ok := c.cache[parameterName]; ok && time.Since(cachedEntry.B) < c.ttl.Load() {
+	if cachedEntry, ok := c.cache[parameter.string()]; ok && time.Since(cachedEntry.B) < c.ttl.Load() {
 		c.cacheMu.RUnlock()
 		return cachedEntry.A, nil
 	}
 	c.cacheMu.RUnlock()
 
 	// if not in cache or expired, fetch from DB
 	// and update the cache
-	values, err = c.JobsDB.GetDistinctParameterValues(ctx, parameterName)
+	values, err = c.JobsDB.GetDistinctParameterValues(ctx, parameter)
 	if err != nil {
 		return nil, err
 	}
 	// update the cache with the new values
 	c.cacheMu.Lock()
-	c.cache[parameterName] = lo.Tuple2[[]string, time.Time]{A: values, B: time.Now()}
+	c.cache[parameter.string()] = lo.Tuple2[[]string, time.Time]{A: values, B: time.Now()}
 	c.cacheMu.Unlock()
 	return values, nil
 }

jobsdb/jobsdb_parameters_cache_test.go

@@ -17,11 +17,13 @@ type cpvMockJobsdb struct {
 	JobsDB
 }
 
-func (j *cpvMockJobsdb) GetDistinctParameterValues(ctx context.Context, parameterName string) ([]string, error) {
+func (j *cpvMockJobsdb) GetDistinctParameterValues(ctx context.Context, parameter ParameterName) ([]string, error) {
 	j.calls++
 	return []string{"value1", "value2"}, nil
 }
 
+var testParameter parameterName = "test_parameter"
+
 func TestCachingDistinctParameterValuesJobsdb(t *testing.T) {
 	t.Run("single goroutine", func(t *testing.T) {
 		// Create a mock JobsDB
@@ -34,20 +36,20 @@ func TestCachingDistinctParameterValuesJobsdb(t *testing.T) {
 		ctx := context.Background()
 
 		// First call should fetch from the mock JobsDB
-		values, err := cachingJobsdb.GetDistinctParameterValues(ctx, "test_parameter")
+		values, err := cachingJobsdb.GetDistinctParameterValues(ctx, testParameter)
 		require.NoError(t, err)
 		require.Equal(t, 1, jobsdb.calls)
 		require.Equal(t, []string{"value1", "value2"}, values)
 
 		// Second call should hit the cache
-		values, err = cachingJobsdb.GetDistinctParameterValues(ctx, "test_parameter")
+		values, err = cachingJobsdb.GetDistinctParameterValues(ctx, testParameter)
 		require.NoError(t, err)
 		require.Equal(t, 1, jobsdb.calls)
 		require.Equal(t, []string{"value1", "value2"}, values)
 
 		time.Sleep(100 * time.Millisecond)
 
-		values, err = cachingJobsdb.GetDistinctParameterValues(ctx, "test_parameter")
+		values, err = cachingJobsdb.GetDistinctParameterValues(ctx, testParameter)
 		require.NoError(t, err)
 		require.Equal(t, 2, jobsdb.calls)
 		require.Equal(t, []string{"value1", "value2"}, values)
@@ -67,21 +69,21 @@ func TestCachingDistinctParameterValuesJobsdb(t *testing.T) {
 		for i := range 10 {
 			go func(i int) {
 				defer wg.Done()
-				values, err := cachingJobsdb.GetDistinctParameterValues(ctx, "test_parameter_"+strconv.Itoa(i))
+				values, err := cachingJobsdb.GetDistinctParameterValues(ctx, parameterName("test_parameter_"+strconv.Itoa(i)))
 				require.NoError(t, err)
 				require.Equal(t, []string{"value1", "value2"}, values)
 				time.Sleep(100 * time.Millisecond)
-				values, err = cachingJobsdb.GetDistinctParameterValues(ctx, "test_parameter_"+strconv.Itoa(i))
+				values, err = cachingJobsdb.GetDistinctParameterValues(ctx, parameterName("test_parameter_"+strconv.Itoa(i)))
 				require.NoError(t, err)
 				require.Equal(t, []string{"value1", "value2"}, values)
 			}(i)
 			go func(i int) {
 				defer wg.Done()
-				values, err := cachingJobsdb.GetDistinctParameterValues(ctx, "test_parameter_"+strconv.Itoa(i))
+				values, err := cachingJobsdb.GetDistinctParameterValues(ctx, parameterName("test_parameter_"+strconv.Itoa(i)))
 				require.NoError(t, err)
 				require.Equal(t, []string{"value1", "value2"}, values)
 				time.Sleep(100 * time.Millisecond)
-				values, err = cachingJobsdb.GetDistinctParameterValues(ctx, "test_parameter_"+strconv.Itoa(i))
+				values, err = cachingJobsdb.GetDistinctParameterValues(ctx, parameterName("test_parameter_"+strconv.Itoa(i)))
 				require.NoError(t, err)
 				require.Equal(t, []string{"value1", "value2"}, values)
 			}(i)