Refactored Eviction framework with Basic LRU based Batch Eviction

Signed-off-by: soumya-codes <[email protected]>

config/config.go

@@ -22,12 +22,10 @@ const (
 	DefaultConfigName     string = "dice.toml"
 	DefaultConfigFilePath string = "./"
 
-	EvictSimpleFirst   = "simple-first"
-	EvictAllKeysRandom = "allkeys-random"
-	EvictAllKeysLRU    = "allkeys-lru"
-	EvictAllKeysLFU    = "allkeys-lfu"
+	EvictBatchKeysLRU string = "batch_keys_lru"
 
-	DefaultKeysLimit int = 200000000
+	DefaultKeysLimit     int     = 200000000
+	DefaultEvictionRatio float64 = 0.1
 )
 
 var (
@@ -97,11 +95,11 @@ type Config struct {
 	} `mapstructure:"performance"`
 
 	Memory struct {
-		MaxMemory      int64   `mapstructure:"maxmemory"`
-		EvictionPolicy string  `mapstructure:"evictionpolicy"`
-		EvictionRatio  float64 `mapstructure:"evictionratio"`
-		KeysLimit      int     `mapstructure:"keyslimit"`
-		LFULogFactor   int     `mapstructure:"lfulogfactor"`
+		MaxMemory        int64   `mapstructure:"maxmemory"`
+		EvictionStrategy string  `mapstructure:"evictionstrategy"`
+		EvictionRatio    float64 `mapstructure:"evictionratio"`
+		KeysLimit        int     `mapstructure:"keyslimit"`
+		LFULogFactor     int     `mapstructure:"lfulogfactor"`
 	} `mapstructure:"memory"`
 
 	Persistence struct {
@@ -181,17 +179,17 @@ var baseConfig = Config{
 		AdhocReqChanBufSize:    20, // assuming we wouldn't have more than 20 adhoc requests being sent at a time.
 	},
 	Memory: struct {
-		MaxMemory      int64   `mapstructure:"maxmemory"`
-		EvictionPolicy string  `mapstructure:"evictionpolicy"`
-		EvictionRatio  float64 `mapstructure:"evictionratio"`
-		KeysLimit      int     `mapstructure:"keyslimit"`
-		LFULogFactor   int     `mapstructure:"lfulogfactor"`
+		MaxMemory        int64   `mapstructure:"maxmemory"`
+		EvictionStrategy string  `mapstructure:"evictionstrategy"`
+		EvictionRatio    float64 `mapstructure:"evictionratio"`
+		KeysLimit        int     `mapstructure:"keyslimit"`
+		LFULogFactor     int     `mapstructure:"lfulogfactor"`
 	}{
-		MaxMemory:      0,
-		EvictionPolicy: EvictAllKeysLFU,
-		EvictionRatio:  0.9,
-		KeysLimit:      DefaultKeysLimit,
-		LFULogFactor:   10,
+		MaxMemory:        0,
+		EvictionStrategy: EvictBatchKeysLRU,
+		EvictionRatio:    DefaultEvictionRatio,
+		KeysLimit:        DefaultKeysLimit,
+		LFULogFactor:     10,
 	},
 	Persistence: struct {
 		AOFFile            string `mapstructure:"aoffile"`

internal/eval/bloom_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 func TestBloomFilter(t *testing.T) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 	// This test only contains some basic checks for all the bloom filter
 	// operations like BFRESERVE, BFADD, BFEXISTS. It assumes that the
 	// functions called in the main function are working correctly and
@@ -94,7 +94,7 @@ func TestBloomFilter(t *testing.T) {
 }
 
 func TestGetOrCreateBloomFilter(t *testing.T) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 	// Create a key and default opts
 	key := "bf"
 	opts := defaultBloomOpts()

internal/eval/commands.go

@@ -432,13 +432,6 @@ var (
 		Eval:  evalLATENCY,
 		Arity: -2,
 	}
-	lruCmdMeta = DiceCmdMeta{
-		Name: "LRU",
-		Info: `LRU deletes all the keys from the LRU
-		returns encoded RESP OK`,
-		Eval:  evalLRU,
-		Arity: 1,
-	}
 	sleepCmdMeta = DiceCmdMeta{
 		Name: "SLEEP",
 		Info: `SLEEP sets db to sleep for the specified number of seconds.
@@ -1454,7 +1447,6 @@ func init() {
 	DiceCmds["LLEN"] = llenCmdMeta
 	DiceCmds["LPOP"] = lpopCmdMeta
 	DiceCmds["LPUSH"] = lpushCmdMeta
-	DiceCmds["LRU"] = lruCmdMeta
 	DiceCmds["MGET"] = MGetCmdMeta
 	DiceCmds["MSET"] = msetCmdMeta
 	DiceCmds["MULTI"] = MultiCmdMeta

internal/eval/countminsketch_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 func TestCountMinSketch(t *testing.T) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	testCMSInitByDim(t, store)
 	testCMSInitByProb(t, store)

internal/eval/eval.go

@@ -1064,13 +1064,6 @@ func evalLATENCY(args []string, store *dstore.Store) []byte {
 	return clientio.Encode([]string{}, false)
 }
 
-// evalLRU deletes all the keys from the LRU
-// returns encoded RESP OK
-func evalLRU(args []string, store *dstore.Store) []byte {
-	dstore.EvictAllkeysLRUOrLFU(store)
-	return clientio.RespOK
-}
-
 // evalSLEEP sets db to sleep for the specified number of seconds.
 // The sleep time should be the only param in args.
 // Returns error response if the time param in args is not of integer format.

internal/eval/eval_test.go

@@ -12,17 +12,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/dicedb/dice/internal/eval/sortedset"
-	"github.com/dicedb/dice/internal/server/utils"
-
-	"github.com/bytedance/sonic"
-	"github.com/ohler55/ojg/jp"
-
 	"github.com/axiomhq/hyperloglog"
+	"github.com/bytedance/sonic"
 	"github.com/dicedb/dice/internal/clientio"
 	diceerrors "github.com/dicedb/dice/internal/errors"
+	"github.com/dicedb/dice/internal/eval/sortedset"
 	"github.com/dicedb/dice/internal/object"
+	"github.com/dicedb/dice/internal/server/utils"
 	dstore "github.com/dicedb/dice/internal/store"
+	"github.com/ohler55/ojg/jp"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -42,7 +40,7 @@ func setupTest(store *dstore.Store) *dstore.Store {
 }
 
 func TestEval(t *testing.T) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	testEvalMSET(t, store)
 	testEvalECHO(t, store)
@@ -1568,7 +1566,7 @@ func testEvalJSONOBJLEN(t *testing.T, store *dstore.Store) {
 
 func BenchmarkEvalJSONOBJLEN(b *testing.B) {
 	sizes := []int{0, 10, 100, 1000, 10000, 100000} // Various sizes of JSON objects
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	for _, size := range sizes {
 		b.Run(fmt.Sprintf("JSONObjectSize_%d", size), func(b *testing.B) {
@@ -3938,13 +3936,13 @@ func runMigratedEvalTests(t *testing.T, tests map[string]evalTestCase, evalFunc
 func BenchmarkEvalMSET(b *testing.B) {
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		store := dstore.NewStore(nil, nil)
+		store := dstore.NewStore(nil, nil, nil)
 		evalMSET([]string{"KEY", "VAL", "KEY2", "VAL2"}, store)
 	}
 }
 
 func BenchmarkEvalHSET(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 	for i := 0; i < b.N; i++ {
 		evalHSET([]string{"KEY", fmt.Sprintf("FIELD_%d", i), fmt.Sprintf("VALUE_%d", i)}, store)
 	}
@@ -4237,7 +4235,7 @@ func testEvalHKEYS(t *testing.T, store *dstore.Store) {
 }
 
 func BenchmarkEvalHKEYS(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	for i := 0; i < b.N; i++ {
 		evalHSET([]string{"KEY", fmt.Sprintf("FIELD_%d", i), fmt.Sprintf("VALUE_%d", i)}, store)
@@ -4249,7 +4247,7 @@ func BenchmarkEvalHKEYS(b *testing.B) {
 }
 
 func BenchmarkEvalPFCOUNT(b *testing.B) {
-	store := *dstore.NewStore(nil, nil)
+	store := *dstore.NewStore(nil, nil, nil)
 
 	// Helper function to create and insert HLL objects
 	createAndInsertHLL := func(key string, items []string) {
@@ -4596,7 +4594,7 @@ func testEvalHLEN(t *testing.T, store *dstore.Store) {
 
 func BenchmarkEvalHLEN(b *testing.B) {
 	sizes := []int{0, 10, 100, 1000, 10000, 100000}
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	for _, size := range sizes {
 		b.Run(fmt.Sprintf("HashSize_%d", size), func(b *testing.B) {
@@ -4908,7 +4906,7 @@ func testEvalTYPE(t *testing.T, store *dstore.Store) {
 }
 
 func BenchmarkEvalTYPE(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	// Define different types of objects to benchmark
 	objectTypes := map[string]func(){
@@ -5252,7 +5250,7 @@ func testEvalJSONOBJKEYS(t *testing.T, store *dstore.Store) {
 
 func BenchmarkEvalJSONOBJKEYS(b *testing.B) {
 	sizes := []int{0, 10, 100, 1000, 10000, 100000} // Various sizes of JSON objects
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	for _, size := range sizes {
 		b.Run(fmt.Sprintf("JSONObjectSize_%d", size), func(b *testing.B) {
@@ -5510,7 +5508,7 @@ func testEvalGETRANGE(t *testing.T, store *dstore.Store) {
 }
 
 func BenchmarkEvalGETRANGE(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 	store.Put("BENCHMARK_KEY", store.NewObj("Hello World", maxExDuration, object.ObjTypeString, object.ObjEncodingRaw))
 
 	inputs := []struct {
@@ -5535,7 +5533,7 @@ func BenchmarkEvalGETRANGE(b *testing.B) {
 }
 
 func BenchmarkEvalHSETNX(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 	for i := 0; i < b.N; i++ {
 		evalHSETNX([]string{"KEY", fmt.Sprintf("FIELD_%d", i/2), fmt.Sprintf("VALUE_%d", i)}, store)
 	}
@@ -5638,15 +5636,15 @@ func testEvalHSETNX(t *testing.T, store *dstore.Store) {
 	runMigratedEvalTests(t, tests, evalHSETNX, store)
 }
 func TestMSETConsistency(t *testing.T) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 	evalMSET([]string{"KEY", "VAL", "KEY2", "VAL2"}, store)
 
 	assert.Equal(t, "VAL", store.Get("KEY").Value)
 	assert.Equal(t, "VAL2", store.Get("KEY2").Value)
 }
 
 func BenchmarkEvalHINCRBY(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	// creating new fields
 	for i := 0; i < b.N; i++ {
@@ -5898,7 +5896,7 @@ func testEvalSETEX(t *testing.T, store *dstore.Store) {
 }
 
 func BenchmarkEvalSETEX(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
@@ -6077,7 +6075,7 @@ func testEvalINCRBYFLOAT(t *testing.T, store *dstore.Store) {
 }
 
 func BenchmarkEvalINCRBYFLOAT(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 	store.Put("key1", store.NewObj("1", maxExDuration, object.ObjTypeString, object.ObjEncodingEmbStr))
 	store.Put("key2", store.NewObj("1.2", maxExDuration, object.ObjTypeString, object.ObjEncodingEmbStr))
 
@@ -6316,7 +6314,7 @@ func testEvalBITOP(t *testing.T, store *dstore.Store) {
 }
 
 func BenchmarkEvalBITOP(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	// Setup initial data for benchmarking
 	store.Put("key1", store.NewObj(&ByteArray{data: []byte{0x01, 0x02, 0xff}}, maxExDuration, object.ObjTypeByteArray, object.ObjEncodingByteArray))
@@ -6630,7 +6628,7 @@ func testEvalAPPEND(t *testing.T, store *dstore.Store) {
 }
 
 func BenchmarkEvalAPPEND(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 	for i := 0; i < b.N; i++ {
 		evalAPPEND([]string{"key", fmt.Sprintf("val_%d", i)}, store)
 	}
@@ -7358,7 +7356,7 @@ func BenchmarkEvalZPOPMIN(b *testing.B) {
 		},
 	}
 
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	for _, bm := range benchmarks {
 		b.Run(bm.name, func(b *testing.B) {
@@ -7524,7 +7522,7 @@ func testEvalZREM(t *testing.T, store *dstore.Store) {
 }
 
 func BenchmarkEvalZRANK(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	// Set up initial sorted set
 	evalZADD([]string{"myzset", "1", "member1", "2", "member2", "3", "member3"}, store)
@@ -7806,7 +7804,7 @@ func testEvalHINCRBYFLOAT(t *testing.T, store *dstore.Store) {
 }
 
 func BenchmarkEvalHINCRBYFLOAT(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	// Setting initial fields with some values
 	store.Put("key1", store.NewObj(HashMap{"field1": "1.0", "field2": "1.2"}, maxExDuration, object.ObjTypeHashMap, object.ObjEncodingHashMap))
@@ -8164,7 +8162,7 @@ func testEvalJSONSTRAPPEND(t *testing.T, store *dstore.Store) {
 }
 
 func BenchmarkEvalJSONSTRAPPEND(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	// Setup a sample JSON document
 	key := "doc1"
@@ -8288,7 +8286,7 @@ func BenchmarkEvalZPOPMAX(b *testing.B) {
 		},
 	}
 
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	for _, bm := range benchmarks {
 		b.Run(bm.name, func(b *testing.B) {
@@ -8304,7 +8302,7 @@ func BenchmarkEvalZPOPMAX(b *testing.B) {
 	}
 }
 func BenchmarkZCOUNT(b *testing.B) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 
 	// Populate the sorted set with some members for basic benchmarks
 	evalZADD([]string{"key", "10", "member1", "20", "member2", "30", "member3"}, store)
@@ -8333,7 +8331,7 @@ func BenchmarkZCOUNT(b *testing.B) {
 	// Benchmark for edge cases
 	b.Run("Edge Case ZCOUNT", func(b *testing.B) {
 		// Reset the store and set up members
-		store = dstore.NewStore(nil, nil)
+		store = dstore.NewStore(nil, nil, nil)
 		evalZADD([]string{"key", "5", "member1", "15", "member2", "25", "member3"}, store)
 
 		b.ResetTimer()

internal/eval/hmap_test.go

@@ -71,7 +71,7 @@ func TestHashMapIncrementValue(t *testing.T) {
 }
 
 func TestGetValueFromHashMap(t *testing.T) {
-	store := store.NewStore(nil, nil)
+	store := store.NewStore(nil, nil, nil)
 	key := "key1"
 	field := "field1"
 	value := "value1"

internal/eval/main_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	store := dstore.NewStore(nil, nil)
+	store := dstore.NewStore(nil, nil, nil)
 	store.ResetStore()
 
 	exitCode := m.Run()

internal/eval/store_eval.go

@@ -1113,7 +1113,7 @@ func evalAPPEND(args []string, store *dstore.Store) *EvalResponse {
 	if _, ok := obj.Value.(*sortedset.Set); ok {
 		return &EvalResponse{
 			Result: nil,
-			Error: diceerrors.ErrWrongTypeOperation,
+			Error:  diceerrors.ErrWrongTypeOperation,
 		}
 	}
 	_, currentEnc := object.ExtractTypeEncoding(obj)

internal/server/utils/time.go

@@ -28,6 +28,10 @@ func (mc *MockClock) SetTime(t time.Time) {
 	mc.CurrTime = t
 }
 
+func (mc *MockClock) GetTime() time.Time {
+	return mc.CurrTime
+}
+
 func GetCurrentTime() time.Time {
 	return CurrentTime.Now()
 }