feat: support maxmemory-clients

AntiTopQuark · Sep 2, 2024 · a3bf6eb · a3bf6eb
1 parent 75f6177
commit a3bf6eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/server/redis_connection.h b/src/server/redis_connection.h
@@ -219,6 +219,10 @@ class Connection : public EvbufCallbackBase<Connection> {
  bool importing_ = false;
  RESP protocol_version_ = RESP::v2;
  std::string output_buffer_;
+<<<<<<< HEAD
+=======
+
+>>>>>>> 3ce53f66 (feat: support maxmemory-clients)
 };
 
 } // namespace redis
diff --git a/tests/gocase/unit/limits/limits_test.go b/tests/gocase/unit/limits/limits_test.go
@@ -64,6 +64,7 @@ func TestNetworkLimits(t *testing.T) {
  })
 }
 
+<<<<<<< HEAD
 func getEvictedClients(rdb *redis.Client, ctx context.Context) (int, error) {
  info, err := rdb.Info(ctx, "stats").Result()
  if err != nil {
@@ -81,6 +82,8 @@ func getEvictedClients(rdb *redis.Client, ctx context.Context) (int, error) {
  }
  return 0, fmt.Errorf("evicted_clients not found")
 }
+=======
+>>>>>>> 3ce53f66 (feat: support maxmemory-clients)
 
 func TestMaxMemoryClientsLimits(t *testing.T) {
  srv := util.StartServer(t, map[string]string{