test: ensure the transaction is legit durling the resharding (#319)

Author: supercaracal

lib/redis_client/cluster/transaction.rb

@@ -117,7 +117,7 @@ def send_transaction(client, redirect:)
       end
 
       def send_pipeline(client, redirect:)
-        results = client.ensure_connected_cluster_scoped(retryable: @retryable) do |connection|
+        replies = client.ensure_connected_cluster_scoped(retryable: @retryable) do |connection|
           commands = @pipeline._commands
           client.middlewares.call_pipelined(commands, client.config) do
             connection.call_pipelined(commands, nil)
@@ -128,8 +128,26 @@ def send_pipeline(client, redirect:)
           end
         end
 
-        @pipeline._coerce!(results)
-        results[watch? ? -2 : -1]
+        offset = watch? ? 2 : 1
+        coerce_results!(replies[-offset], offset)
+      end
+
+      def coerce_results!(results, offset)
+        results.each_with_index do |result, index|
+          if result.is_a?(::RedisClient::CommandError)
+            result._set_command(@pipeline._commands[index + offset])
+            raise result
+          end
+
+          next if @pipeline._blocks.nil?
+
+          block = @pipeline._blocks[index + offset]
+          next if block.nil?
+
+          results[index] = block.call(result)
+        end
+
+        results
       end
 
       def handle_command_error!(commands, err)

test/redis_client/test_cluster.rb

@@ -295,6 +295,31 @@ def test_transaction_with_meaningless_watch
         assert_equal(%w[1 2], @client.call('MGET', '{key}1', '{key}2'))
       end
 
+      def test_transaction_with_error
+        @client.call('SET', 'key1', 'x')
+
+        assert_raises(::RedisClient::CommandError) do
+          @client.multi do |tx|
+            tx.call('SET', 'key1', 'aaa')
+            tx.call('MYBAD', 'key1', 'bbb')
+          end
+        end
+
+        assert_equal('x', @client.call('GET', 'key1'))
+      end
+
+      def test_transaction_with_block
+        @client.call('MSET', '{key}1', 'a', '{key}2', 'b', '{key}3', 'c')
+
+        got = @client.multi do |tx|
+          tx.call('GET', '{key}1') { |x| "#{x}aa" }
+          tx.call('GET', '{key}2') { |x| "#{x}bb" }
+          tx.call('GET', '{key}3') { |x| "#{x}cc" }
+        end
+
+        assert_equal(%w[aaa bbb ccc], got)
+      end
+
       def test_pubsub_without_subscription
         pubsub = @client.pubsub
         assert_nil(pubsub.next_event(0.01))

test/test_against_cluster_state.rb

@@ -62,11 +62,14 @@ def test_the_state_of_cluster_resharding_with_pipelining
     def test_the_state_of_cluster_resharding_with_transaction
       do_resharding_test do |keys|
         @client.multi do |tx|
-          keys.each { |key| tx.call('SET', key, key) }
+          keys.each do |key|
+            tx.call('SET', key, '0')
+            tx.call('INCR', key)
+          end
         end
 
         keys.each do |key|
-          want = key
+          want = '1'
           got = @client.call('GET', key)
           assert_equal(want, got, "Case: GET: #{key}")
         end