[VOL-5417] Add GetWithPrefix and GetWithPrefixKeysOnly functions for the kvclient Interface
Change-Id: I446f414d157d5794de4302450fc075073243b564
Signed-off-by: pnalmas <praneeth.nalmas@radisys.com>
diff --git a/pkg/db/kvstore/client.go b/pkg/db/kvstore/client.go
index c59f4b3..85bc5f5 100644
--- a/pkg/db/kvstore/client.go
+++ b/pkg/db/kvstore/client.go
@@ -76,6 +76,8 @@
type Client interface {
List(ctx context.Context, key string) (map[string]*KVPair, error)
Get(ctx context.Context, key string) (*KVPair, error)
+ GetWithPrefix(ctx context.Context, prefixKey string) (map[string]*KVPair, error)
+ GetWithPrefixKeysOnly(ctx context.Context, prefixKey string) ([]string, error)
Put(ctx context.Context, key string, value interface{}) error
Delete(ctx context.Context, key string) error
DeleteWithPrefix(ctx context.Context, prefixKey string) error
diff --git a/pkg/db/kvstore/etcdclient.go b/pkg/db/kvstore/etcdclient.go
index 8439afe..c5df1d8 100644
--- a/pkg/db/kvstore/etcdclient.go
+++ b/pkg/db/kvstore/etcdclient.go
@@ -171,6 +171,57 @@
}
}
+// GetWithPrefix fetches all key-value pairs with the specified prefix from etcd.
+// Returns a map of key-value pairs or an error if the operation fails.
+func (c *EtcdClient) GetWithPrefix(ctx context.Context, prefixKey string) (map[string]*KVPair, error) {
+ // Acquire a client from the pool
+ client, err := c.pool.Get(ctx)
+ if err != nil {
+ return nil, fmt.Errorf("failed to get client from pool: %w", err)
+ }
+ defer c.pool.Put(client)
+
+ // Fetch keys with the prefix
+ resp, err := client.Get(ctx, prefixKey, v3Client.WithPrefix())
+ if err != nil {
+ return nil, fmt.Errorf("failed to fetch entries for prefix %s: %w", prefixKey, err)
+ }
+
+ // Initialize the result map
+ result := make(map[string]*KVPair)
+
+ // Iterate through the fetched key-value pairs and populate the map
+ for _, ev := range resp.Kvs {
+ result[string(ev.Key)] = NewKVPair(string(ev.Key), ev.Value, "", ev.Lease, ev.Version)
+ }
+
+ return result, nil
+}
+
+// GetWithPrefixKeysOnly retrieves only the keys that match a given prefix.
+func (c *EtcdClient) GetWithPrefixKeysOnly(ctx context.Context, prefixKey string) ([]string, error) {
+ // Acquire a client from the pool
+ client, err := c.pool.Get(ctx)
+ if err != nil {
+ return nil, fmt.Errorf("failed to get client from pool: %w", err)
+ }
+ defer c.pool.Put(client)
+
+ // Fetch keys with the prefix
+ resp, err := client.Get(ctx, prefixKey, v3Client.WithPrefix(), v3Client.WithKeysOnly())
+ if err != nil {
+ return nil, fmt.Errorf("failed to fetch entries for prefix %s: %w", prefixKey, err)
+ }
+
+ // Extract keys from the response
+ keys := []string{}
+ for _, kv := range resp.Kvs {
+ keys = append(keys, string(kv.Key))
+ }
+
+ return keys, nil
+}
+
// Put writes a key-value pair to the KV store. Value can only be a string or []byte since the etcd API
// accepts only a string as a value for a put operation. Timeout defines how long the function will
// wait for a response
diff --git a/pkg/db/kvstore/redisclient.go b/pkg/db/kvstore/redisclient.go
index 742916c..7ed4159 100644
--- a/pkg/db/kvstore/redisclient.go
+++ b/pkg/db/kvstore/redisclient.go
@@ -415,3 +415,41 @@
logger.Errorw(ctx, "error-closing-client", log.Fields{"error": err})
}
}
+
+func (c *RedisClient) GetWithPrefix(ctx context.Context, prefix string) (map[string]*KVPair, error) {
+ var err error
+ var keys []string
+ m := make(map[string]*KVPair)
+ var values []interface{}
+
+ if keys, err = c.scanAllKeysWithPrefix(ctx, prefix); err != nil {
+ return nil, err
+ }
+
+ if len(keys) != 0 {
+ values, err = c.redisAPI.MGet(ctx, keys...).Result()
+ if err != nil {
+ return nil, err
+ }
+ }
+ for i, key := range keys {
+ if valBytes, err := ToByte(values[i]); err == nil {
+ m[key] = NewKVPair(key, interface{}(valBytes), "", 0, 0)
+ }
+ }
+ return m, nil
+}
+
+func (c *RedisClient) GetWithPrefixKeysOnly(ctx context.Context, prefix string) ([]string, error) {
+ // Use the scanAllKeysWithPrefix function to fetch keys matching the prefix
+ keys, err := c.scanAllKeysWithPrefix(ctx, prefix)
+ if err != nil {
+ return nil, fmt.Errorf("failed to scan keys with prefix %s: %v", prefix, err)
+ }
+
+ if len(keys) == 0 {
+ logger.Debugw(ctx, "no-keys-found", log.Fields{"prefix": prefix})
+ }
+
+ return keys, nil
+}