Remove namespace from redis config

app/lib/admin/metrics/dimension/software_versions_dimension.rb

@@ -75,10 +75,6 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
   end
 
   def redis_info
-    @redis_info ||= if redis.is_a?(Redis::Namespace)
-                      redis.redis.info
-                    else
-                      redis.info
-                    end
+    @redis_info ||= redis.info
   end
 end

app/lib/admin/metrics/dimension/space_usage_dimension.rb

@@ -59,11 +59,7 @@ class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension
   end
 
   def redis_info
-    @redis_info ||= if redis.is_a?(Redis::Namespace)
-                      redis.redis.info
-                    else
-                      redis.info
-                    end
+    @redis_info ||= redis.info
   end
 
   def search_size

app/lib/redis_configuration.rb

@@ -23,28 +23,10 @@ class RedisConfiguration
   end
 
   def connection
-    if namespace?
-      Redis::Namespace.new(namespace, redis: raw_connection)
-    else
-      raw_connection
-    end
-  end
-
-  def namespace?
-    namespace.present?
-  end
-
-  def namespace
-    ENV.fetch('REDIS_NAMESPACE', nil)
+    Redis.new(url: url, driver: :hiredis)
   end
 
   def url
     ENV['REDIS_URL']
   end
-
-  private
-
-  def raw_connection
-    Redis.new(url: url, driver: :hiredis)
-  end
 end

lib/mastodon/redis_config.rb

@@ -26,15 +26,11 @@ setup_redis_env_url
 setup_redis_env_url(:cache, false)
 setup_redis_env_url(:sidekiq, false)
 
-namespace         = ENV.fetch('REDIS_NAMESPACE', nil)
-cache_namespace   = namespace ? "#{namespace}_cache" : 'cache'
-sidekiq_namespace = namespace
-
 REDIS_CACHE_PARAMS = {
   driver: :hiredis,
   url: ENV['CACHE_REDIS_URL'],
   expires_in: 10.minutes,
-  namespace: "#{cache_namespace}:7.1",
+  db: 1,
   connect_timeout: 5,
   pool: {
     size: Sidekiq.server? ? Sidekiq[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
@@ -44,8 +40,6 @@ REDIS_CACHE_PARAMS = {
 
 REDIS_SIDEKIQ_PARAMS = {
   driver: :hiredis,
+  db: 0,
   url: ENV['SIDEKIQ_REDIS_URL'],
-  namespace: sidekiq_namespace,
 }.freeze
-
-ENV['REDIS_NAMESPACE'] = "mastodon_test#{ENV['TEST_ENV_NUMBER']}" if Rails.env.test?