Merge remote-tracking branch 'origin/refactor-reactive-mget-method' into refactor-reactive-mget-method

Author: ori0o0p

src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java

@@ -264,6 +264,7 @@ public Flux<KeyValue<K, V>> mget(Iterable<K> keys) {
             return super.mget(keyList);
         }
 
+<<<<<<< HEAD
         List<Publisher<KeyValue<K, V>>> publishers = partitioned.values().stream().map(super::mget)
                 .collect(Collectors.toList());
 
@@ -283,6 +284,31 @@ public Flux<KeyValue<K, V>> mget(Iterable<K> keys) {
 
             return Arrays.asList(values);
         }).flatMapMany(Flux::fromIterable);
+=======
+        List<Publisher<KeyValue<K, V>>> publishers = partitioned.values().stream()
+                .map(super::mget)
+                .collect(Collectors.toList());
+
+        return Flux.mergeSequential(publishers)
+                .collectList()
+                .map(results -> {
+                    KeyValue<K, V>[] values = new KeyValue[keyList.size()];
+                    int offset = 0;
+
+                    for (List<K> partitionKeys : partitioned.values()) {
+                        for (int i = 0; i < keyList.size(); i++) {
+                            int index = partitionKeys.indexOf(keyList.get(i));
+                            if (index != -1) {
+                                values[i] = results.get(offset + index);
+                            }
+                        }
+                        offset += partitionKeys.size();
+                    }
+
+                    return Arrays.asList(values);
+                })
+                .flatMapMany(Flux::fromIterable);
+>>>>>>> origin/refactor-reactive-mget-method
     }
 
     @Override