[#33] Raise an error when pipeline results contains one or more Redis errors

cabol · cabol · commit c8bb517fb4ce · 2021-12-05T14:59:26.000+01:00
diff --git a/.dialyzer_ignore.exs b/.dialyzer_ignore.exs
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,14 +16,12 @@ jobs:
     strategy:
       matrix:
         include:
-          - elixir: 1.11.x
-            otp: 23.x
+          - elixir: 1.12.x
+            otp: 24.x
             coverage: true
             dialyzer: true
-          - elixir: 1.10.x
+          - elixir: 1.11.x
             otp: 23.x
-          - elixir: 1.10.x
-            otp: 22.x
           - elixir: 1.9.x
             otp: 22.x
 
diff --git a/config/test.exs b/config/test.exs
@@ -58,6 +58,9 @@ config :nebulex_redis_adapter, NebulexRedisAdapter.TestCache.RedisClusterConnErr
     [
       host: "127.0.0.1",
       port: 10100
+    ],
+    [
+      url: "redis://127.0.0.1:10200"
     ]
   ],
   conn_opts: [
diff --git a/lib/nebulex_redis_adapter.ex b/lib/nebulex_redis_adapter.ex
@@ -383,7 +383,7 @@ defmodule NebulexRedisAdapter do
     child_spec =
       Nebulex.Adapters.Supervisor.child_spec(
         name: normalize_module_name([name, Supervisor]),
-        strategy: :rest_for_one,
+        strategy: :one_for_all,
         children: [{NebulexRedisAdapter.BootstrapServer, adapter_meta} | children]
       )
 
diff --git a/lib/nebulex_redis_adapter/command.ex b/lib/nebulex_redis_adapter/command.ex
@@ -9,37 +9,24 @@ defmodule NebulexRedisAdapter.Command do
           Redix.command(),
           Nebulex.Cache.key()
         ) :: any | no_return
-  def exec!(%{cache: cache} = meta, command, key \\ nil) do
-    meta
+  def exec!(adapter_meta, command, key \\ nil) do
+    adapter_meta
     |> conn(key)
     |> Redix.command(command)
-    |> handle_command_response(cache)
+    |> handle_command_response()
   end
 
   @spec pipeline!(
           Nebulex.Adapter.adapter_meta(),
           [Redix.command()],
           Nebulex.Cache.key()
         ) :: [any] | no_return
-  def pipeline!(%{cache: cache} = meta, commands, key \\ nil) do
-    meta
+  def pipeline!(adapter_meta, commands, key \\ nil) do
+    adapter_meta
     |> conn(key)
     |> Redix.pipeline(commands)
-    |> handle_command_response(cache)
-  end
-
-  @spec handle_command_response({:ok, any} | {:error, any}, Nebulex.Cache.t()) :: any | no_return
-  def handle_command_response({:ok, response}, _cache) do
-    response
-  end
-
-  def handle_command_response({:error, %Redix.Error{message: "MOVED" <> _} = error}, cache) do
-    :ok = cache.stop()
-    raise error
-  end
-
-  def handle_command_response({:error, reason}, _cache) do
-    raise reason
+    |> handle_command_response()
+    |> check_pipeline_errors()
   end
 
   ## Private Functions
@@ -59,4 +46,21 @@ defmodule NebulexRedisAdapter.Command do
   defp conn(%{mode: :redis_cluster} = meta, key) do
     RedisCluster.get_conn(meta, key)
   end
+
+  defp handle_command_response({:ok, response}) do
+    response
+  end
+
+  defp handle_command_response({:error, %Redix.Error{message: "MOVED" <> _} = error}) do
+    raise error
+  end
+
+  defp handle_command_response({:error, reason}) do
+    raise reason
+  end
+
+  defp check_pipeline_errors(results) do
+    _ = for %Redix.Error{} = error <- results, do: raise(error)
+    results
+  end
 end
diff --git a/lib/nebulex_redis_adapter/redis_cluster.ex b/lib/nebulex_redis_adapter/redis_cluster.ex
@@ -40,6 +40,8 @@ defmodule NebulexRedisAdapter.RedisCluster do
     end
   end
 
+  import Nebulex.Helpers
+
   alias NebulexRedisAdapter.{Connection, Pool}
 
   @compile {:inline, cluster_slots_tab: 1}
@@ -62,7 +64,7 @@ defmodule NebulexRedisAdapter.RedisCluster do
     # create specs for children
     children =
       for [start, stop | nodes] <- cluster_slots do
-        sup_name = :"#{name}.#{start}.#{stop}"
+        sup_name = normalize_module_name([name, RedisClusterSupervisor, start, stop])
 
         opts =
           opts
diff --git a/lib/nebulex_redis_adapter/redis_cluster/supervisor.ex b/lib/nebulex_redis_adapter/redis_cluster/supervisor.ex
@@ -24,9 +24,8 @@ defmodule NebulexRedisAdapter.RedisCluster.Supervisor do
       opts
       |> Keyword.get(:conn_opts, [])
       |> Keyword.delete(:url)
-      |> Keyword.put(:host, host)
-      |> Keyword.put(:port, port)
-      |> Keyword.merge(Keyword.get(opts, :conn_opts, []))
+      |> Keyword.put_new(:host, host)
+      |> Keyword.put_new(:port, port)
 
     children =
       for i <- 0..(pool_size - 1) do
diff --git a/mix.exs b/mix.exs
@@ -3,7 +3,7 @@ defmodule NebulexRedisAdapter.MixProject do
 
   @source_url "https://github.com/cabol/nebulex_redis_adapter"
   @version "2.1.1"
-  @nbx_vsn "2.1.0"
+  @nbx_vsn "2.3.0"
 
   def project do
     [
diff --git a/mix.lock b/mix.lock
@@ -3,31 +3,31 @@
   "benchee_html": {:hex, :benchee_html, "1.0.0", "5b4d24effebd060f466fb460ec06576e7b34a00fc26b234fe4f12c4f05c95947", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:benchee_json, "~> 1.0", [hex: :benchee_json, repo: "hexpm", optional: false]}], "hexpm", "5280af9aac432ff5ca4216d03e8a93f32209510e925b60e7f27c33796f69e699"},
   "benchee_json": {:hex, :benchee_json, "1.0.0", "cc661f4454d5995c08fe10dd1f2f72f229c8f0fb1c96f6b327a8c8fc96a91fe5", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "da05d813f9123505f870344d68fb7c86a4f0f9074df7d7b7e2bb011a63ec231c"},
   "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"},
-  "certifi": {:hex, :certifi, "2.6.1", "dbab8e5e155a0763eea978c913ca280a6b544bfa115633fa20249c3d396d9493", [:rebar3], [], "hexpm", "524c97b4991b3849dd5c17a631223896272c6b0af446778ba4675a1dff53bb7e"},
-  "crc": {:hex, :crc, "0.10.1", "87a0478e5a930926f1062397c9eb32d981f6b3abbc352d6d6fecf45a1725b249", [:mix, :rebar3], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "ed3a9a673d4726fd12d6f58811f014e33cb3926b28f9639b12456ccb241d0f9b"},
-  "credo": {:hex, :credo, "1.5.5", "e8f422026f553bc3bebb81c8e8bf1932f498ca03339856c7fec63d3faac8424b", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "dd8623ab7091956a855dc9f3062486add9c52d310dfd62748779c4315d8247de"},
+  "certifi": {:hex, :certifi, "2.8.0", "d4fb0a6bb20b7c9c3643e22507e42f356ac090a1dcea9ab99e27e0376d695eba", [:rebar3], [], "hexpm", "6ac7efc1c6f8600b08d625292d4bbf584e14847ce1b6b5c44d983d273e1097ea"},
+  "crc": {:hex, :crc, "0.10.2", "93ee6788904735d4d93f59a1e80860e4c9aa44e8d2ff7c69857eb62757454137", [:mix, :rebar3], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "6b931cfb5e7d20c3c4113adab460f29ee5a50a36b397edd81c9bede2bbdb505c"},
+  "credo": {:hex, :credo, "1.6.1", "7dc76dcdb764a4316c1596804c48eada9fff44bd4b733a91ccbf0c0f368be61e", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "698607fb5993720c7e93d2d8e76f2175bba024de964e160e2f7151ef3ab82ac5"},
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "dialyxir": {:hex, :dialyxir, "1.1.0", "c5aab0d6e71e5522e77beff7ba9e08f8e02bad90dfbeffae60eaf0cb47e29488", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "07ea8e49c45f15264ebe6d5b93799d4dd56a44036cf42d0ad9c960bc266c0b9a"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.13", "0c98163e7d04a15feb62000e1a891489feb29f3d10cb57d4f845c405852bbef8", [:mix], [], "hexpm", "d602c26af3a0af43d2f2645613f65841657ad6efc9f0e361c3b6c06b578214ba"},
-  "elixir_make": {:hex, :elixir_make, "0.6.2", "7dffacd77dec4c37b39af867cedaabb0b59f6a871f89722c25b28fcd4bd70530", [:mix], [], "hexpm", "03e49eadda22526a7e5279d53321d1cced6552f344ba4e03e619063de75348d9"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.18", "e1b2be73eb08a49fb032a0208bf647380682374a725dfb5b9e510def8397f6f2", [:mix], [], "hexpm", "114a0e85ec3cf9e04b811009e73c206394ffecfcc313e0b346de0d557774ee97"},
+  "elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
-  "ex_doc": {:hex, :ex_doc, "0.24.2", "e4c26603830c1a2286dae45f4412a4d1980e1e89dc779fcd0181ed1d5a05c8d9", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "e134e1d9e821b8d9e4244687fb2ace58d479b67b282de5158333b0d57c6fb7da"},
-  "excoveralls": {:hex, :excoveralls, "0.14.1", "14140e4ef343f2af2de33d35268c77bc7983d7824cb945e6c2af54235bc2e61f", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "4a588f9f8cf9dc140cc1f3d0ea4d849b2f76d5d8bee66b73c304bb3d3689c8b0"},
+  "ex_doc": {:hex, :ex_doc, "0.26.0", "1922164bac0b18b02f84d6f69cab1b93bc3e870e2ad18d5dacb50a9e06b542a3", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2775d66e494a9a48355db7867478ffd997864c61c65a47d31c4949459281c78d"},
+  "excoveralls": {:hex, :excoveralls, "0.14.4", "295498f1ae47bdc6dce59af9a585c381e1aefc63298d48172efaaa90c3d251db", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "e3ab02f2df4c1c7a519728a6f0a747e71d7d6e846020aae338173619217931c1"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
-  "hackney": {:hex, :hackney, "1.17.4", "99da4674592504d3fb0cfef0db84c3ba02b4508bae2dff8c0108baa0d6e0977c", [:rebar3], [{:certifi, "~>2.6.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "de16ff4996556c8548d512f4dbe22dd58a587bf3332e7fd362430a7ef3986b16"},
+  "hackney": {:hex, :hackney, "1.18.0", "c4443d960bb9fba6d01161d01cd81173089686717d9490e5d3606644c48d121f", [:rebar3], [{:certifi, "~>2.8.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "9afcda620704d720db8c6a3123e9848d09c87586dc1c10479c42627b905b5c5e"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "jason": {:hex, :jason, "1.2.2", "ba43e3f2709fd1aa1dce90aaabfd039d000469c05c56f0b8e31978e03fa39052", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "18a228f5f0058ee183f29f9eae0805c6e59d61c3b006760668d8d18ff0d12179"},
   "jchash": {:hex, :jchash, "0.1.2", "c157534ad219fb5a92986e406c5763ef8da901785430c5853d5ec4de2874b3a0", [:rebar3], [], "hexpm", "3371d73e367e9aecf58bc2bfd8e022032c2b9dad2b715e799a9e33e4af1fef74"},
   "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},
-  "makeup_elixir": {:hex, :makeup_elixir, "0.15.1", "b5888c880d17d1cc3e598f05cdb5b5a91b7b17ac4eaf5f297cb697663a1094dd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "db68c173234b07ab2a07f645a5acdc117b9f99d69ebf521821d89690ae6c6ec8"},
+  "makeup_elixir": {:hex, :makeup_elixir, "0.15.2", "dc72dfe17eb240552857465cc00cce390960d9a0c055c4ccd38b70629227e97c", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "fd23ae48d09b32eff49d4ced2b43c9f086d402ee4fd4fcb2d7fad97fa8823e75"},
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
-  "nebulex": {:hex, :nebulex, "2.1.0", "6ed3dc8e851366c59b1260c73d8c70bd694667f1da439bcd13c9eca2d20c74bb", [:mix], [{:decorator, "~> 1.4", [hex: :decorator, repo: "hexpm", optional: true]}, {:shards, "~> 1.0", [hex: :shards, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "d19ef2d7ee57350b1e88931d79c621e69b4ed52ba3351d53348cd4283a0fdb72"},
-  "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"},
+  "nebulex": {:hex, :nebulex, "2.3.0", "c8d6d6676a1ff0493251422fdb4c071ce1022a9e94320f85d1c78bac206f5818", [:mix], [{:decorator, "~> 1.4", [hex: :decorator, repo: "hexpm", optional: true]}, {:shards, "~> 1.0", [hex: :shards, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "b1bde6083391551375fdc34f752d56e9f6ed2c528637cf7a9fa02cfa59a34596"},
+  "nimble_parsec": {:hex, :nimble_parsec, "1.2.0", "b44d75e2a6542dcb6acf5d71c32c74ca88960421b6874777f79153bbbbd7dccc", [:mix], [], "hexpm", "52b2871a7515a5ac49b00f214e4165a40724cf99798d8e4a65e4fd64ebd002c1"},
   "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"},
-  "redix": {:hex, :redix, "1.1.2", "f4905f79ddee0bb97be0f6ab38628426b81783fe8276232a1b058a4f398a8886", [:mix], [{:castore, "~> 0.1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "0e8454a8afe15f9c1606c2b1355aa373e722ee0ade6528db977428d9e1b71c5b"},
+  "redix": {:hex, :redix, "1.1.5", "6fc460d66a5c2287e83e6d73dddc8d527ff59cb4d4f298b41e03a4db8c3b2bd5", [:mix], [{:castore, "~> 0.1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "679afdd4c14502fe9c11387ff1cdcb33065a1cf511097da1eee407f17c7a418b"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"},
-  "telemetry": {:hex, :telemetry, "0.4.3", "a06428a514bdbc63293cd9a6263aad00ddeb66f608163bdec7c8995784080818", [:rebar3], [], "hexpm", "eb72b8365ffda5bed68a620d1da88525e326cb82a75ee61354fc24b844768041"},
+  "telemetry": {:hex, :telemetry, "1.0.0", "0f453a102cdf13d506b7c0ab158324c337c41f1cc7548f0bc0e130bbf0ae9452", [:rebar3], [], "hexpm", "73bc09fa59b4a0284efb4624335583c528e07ec9ae76aca96ea0673850aec57a"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
 }
diff --git a/test/nebulex_redis_adapter/client_cluster_test.exs b/test/nebulex_redis_adapter/client_cluster_test.exs
@@ -6,7 +6,7 @@ defmodule NebulexRedisAdapter.ClientClusterTest do
 
   setup do
     {:ok, pid} = Cache.start_link()
-    _ = Cache.flush()
+    _ = Cache.delete_all()
     :ok
 
     on_exit(fn ->
diff --git a/test/nebulex_redis_adapter/redis_cluster_test.exs b/test/nebulex_redis_adapter/redis_cluster_test.exs
@@ -8,7 +8,7 @@ defmodule NebulexRedisAdapter.RedisClusterTest do
 
   setup do
     {:ok, pid} = Cache.start_link()
-    Cache.flush()
+    _ = Cache.delete_all()
 
     on_exit(fn ->
       :ok = Process.sleep(100)
@@ -18,35 +18,53 @@ defmodule NebulexRedisAdapter.RedisClusterTest do
     {:ok, cache: Cache, name: Cache}
   end
 
-  test "connection error" do
-    assert {:error, %Redix.ConnectionError{reason: :closed}} = RedisClusterConnError.start_link()
+  describe "connection" do
+    test "error: connection is closed" do
+      assert {:error, %Redix.ConnectionError{reason: :closed}} =
+               RedisClusterConnError.start_link()
+    end
   end
 
-  test "hash tags on keys" do
-    for i <- 0..10 do
-      assert RedisCluster.hash_slot("{foo}.#{i}") ==
-               RedisCluster.hash_slot("{foo}.#{i + 1}")
+  describe "CRC16" do
+    test "ok: returns the expected hash_slot" do
+      assert RedisCluster.hash_slot("123456789") == {:"$hash_slot", 12_739}
+    end
+  end
+
+  describe "keys hash tags" do
+    test "hash_slot/2" do
+      for i <- 0..10 do
+        assert RedisCluster.hash_slot("{foo}.#{i}") ==
+                 RedisCluster.hash_slot("{foo}.#{i + 1}")
+
+        assert RedisCluster.hash_slot("{bar}.#{i}") ==
+                 RedisCluster.hash_slot("{bar}.#{i + 1}")
+      end
 
-      assert RedisCluster.hash_slot("{bar}.#{i}") ==
-               RedisCluster.hash_slot("{bar}.#{i + 1}")
+      assert RedisCluster.hash_slot("{foo.1") != RedisCluster.hash_slot("{foo.2")
     end
 
-    assert RedisCluster.hash_slot("{foo.1") != RedisCluster.hash_slot("{foo.2")
+    test "with put and get operations" do
+      assert :ok == Cache.put_all(%{"{foo}.1" => "bar1", "{foo}.2" => "bar2"})
+      assert %{"{foo}.1" => "bar1", "{foo}.2" => "bar2"} == Cache.get_all(["{foo}.1", "{foo}.2"])
+    end
   end
 
-  test "set and get with hash tags" do
-    assert :ok == Cache.put_all(%{"{foo}.1" => "bar1", "{foo}.2" => "bar2"})
-    assert %{"{foo}.1" => "bar1", "{foo}.2" => "bar2"} == Cache.get_all(["{foo}.1", "{foo}.2"])
-  end
+  describe "MOVED error" do
+    test "when executing a Redis command/pipeline" do
+      _ = Process.flag(:trap_exit, true)
 
-  test "moved error" do
-    assert {:ok, pid} = RedisClusterWithKeyslot.start_link()
-    assert Process.alive?(pid)
+      {:ok, _pid} = RedisClusterWithKeyslot.start_link()
 
-    assert_raise Redix.Error, fn ->
-      RedisClusterWithKeyslot.put("1234567890", "hello") == :ok
-    end
+      # put is executed throughout a Redis command
+      assert_raise Redix.Error, ~r"MOVED", fn ->
+        RedisClusterWithKeyslot.put("1234567890", "hello")
+      end
 
-    refute Process.alive?(pid)
+      # get is executed throughout a Redis pipeline
+      assert_raise Redix.Error, ~r"MOVED", fn ->
+        RedisClusterWithKeyslot.get("1234567890", "hello")
+      end
+    end
   end
 end
diff --git a/test/nebulex_redis_adapter/standalone_test.exs b/test/nebulex_redis_adapter/standalone_test.exs
@@ -6,7 +6,7 @@ defmodule NebulexRedisAdapter.StandaloneTest do
 
   setup do
     {:ok, pid} = Cache.start_link()
-    Cache.flush()
+    Cache.delete_all()
     :ok
 
     on_exit(fn ->

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,9 @@ config :nebulex_redis_adapter, NebulexRedisAdapter.TestCache.RedisClusterConnErr`
`58`	`58`	`[`
`59`	`59`	`host: "127.0.0.1",`
`60`	`60`	`port: 10100`
	`61`	`+ ],`
	`62`	`+ [`
	`63`	`+ url: "redis://127.0.0.1:10200"`
`61`	`64`	`]`
`62`	`65`	`],`
`63`	`66`	`conn_opts: [`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ defmodule NebulexRedisAdapter do`
`383`	`383`	`child_spec =`
`384`	`384`	`Nebulex.Adapters.Supervisor.child_spec(`
`385`	`385`	`name: normalize_module_name([name, Supervisor]),`
`386`		`- strategy: :rest_for_one,`
	`386`	`+ strategy: :one_for_all,`
`387`	`387`	`children: [{NebulexRedisAdapter.BootstrapServer, adapter_meta} \| children]`
`388`	`388`	`)`
`389`	`389`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ defmodule NebulexRedisAdapter.MixProject do`
`3`	`3`
`4`	`4`	`@source_url "https://github.com/cabol/nebulex_redis_adapter"`
`5`	`5`	`@version "2.1.1"`
`6`		`- @nbx_vsn "2.1.0"`
	`6`	`+ @nbx_vsn "2.3.0"`
`7`	`7`
`8`	`8`	`def project do`
`9`	`9`	`[`