ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

!1015 【6.0】处理EasyStream并行流下zip等依赖于toIdxMap函数时没有保证顺序问题导致的数据顺序错乱的问题

Browse Source 
Merge pull request !1015 from 阿超/v6-dev
This commit is contained in:
Looly 2023-06-13 03:48:40 +00:00 committed by Gitee
commit 52feb1b60f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 28 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hutool-core/src/main/java/org/dromara/hutool/core/stream/TerminableWrappedStream.java
View File

@ -12,10 +12,10 @@
package org.dromara.hutool.core.stream;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.lang.Opt;
import org.dromara.hutool.core.lang.mutable.MutableInt;
import org.dromara.hutool.core.lang.mutable.MutableObj;
import org.dromara.hutool.core.array.ArrayUtil;
import java.util.*;
import java.util.function.*;
@ -214,7 +214,7 @@ public interface TerminableWrappedStream<T, S extends TerminableWrappedStream<T,
*/
default <U> Map<Integer, U> toIdxMap(final Function<? super T, ? extends U> valueMapper) {
final MutableInt index = new MutableInt(NOT_FOUND_ELEMENT_INDEX);
return EasyStream.of(toList()).toMap(e -> index.incrementAndGet(), valueMapper, (l, r) -> r);
return EasyStream.of(sequential().toList()).toMap(e -> index.incrementAndGet(), valueMapper, (l, r) -> r);
}
// region ============ to zip ============
@ -269,9 +269,6 @@ public interface TerminableWrappedStream<T, S extends TerminableWrappedStream<T,
@SuppressWarnings("ResultOfMethodCallIgnored")
default int findFirstIdx(final Predicate<? super T> predicate) {
Objects.requireNonNull(predicate);
if (isParallel()) {
return NOT_FOUND_ELEMENT_INDEX;
} else {
final MutableInt index = new MutableInt(NOT_FOUND_ELEMENT_INDEX);
unwrap().filter(e -> {
index.increment();
@ -279,7 +276,6 @@ public interface TerminableWrappedStream<T, S extends TerminableWrappedStream<T,
}).findFirst();// 此处只做计数，不需要值
return index.get();
}
}
/**
* 获取最后一个元素
@ -317,9 +313,6 @@ public interface TerminableWrappedStream<T, S extends TerminableWrappedStream<T,
*/
default int findLastIdx(final Predicate<? super T> predicate) {
Objects.requireNonNull(predicate);
if (isParallel()) {
return NOT_FOUND_ELEMENT_INDEX;
} else {
final MutableInt idxRef = new MutableInt(NOT_FOUND_ELEMENT_INDEX);
forEachIdx((e, i) -> {
if (predicate.test(e)) {
@ -328,7 +321,6 @@ public interface TerminableWrappedStream<T, S extends TerminableWrappedStream<T,
});
return idxRef.get();
}
}
/**
* 获取流中指定下标的元素，如果是负数，则从最后一个开始数起
@ -505,14 +497,9 @@ public interface TerminableWrappedStream<T, S extends TerminableWrappedStream<T,
*/
default void forEachIdx(final BiConsumer<? super T, Integer> action) {
Objects.requireNonNull(action);
if (isParallel()) {
EasyStream.of(toIdxMap().entrySet()).parallel(isParallel())
.forEach(e -> action.accept(e.getValue(), e.getKey()));
} else {
final MutableInt index = new MutableInt(NOT_FOUND_ELEMENT_INDEX);
unwrap().forEach(e -> action.accept(e, index.incrementAndGet()));
}
}
/**
* 对流里面的每一个元素按照顺序执行一个操作，操作带下标，并行流时下标永远为-1
@ -522,15 +509,9 @@ public interface TerminableWrappedStream<T, S extends TerminableWrappedStream<T,
*/
default void forEachOrderedIdx(final BiConsumer<? super T, Integer> action) {
Objects.requireNonNull(action);
if (isParallel()) {
EasyStream.of(toIdxMap().entrySet())
.parallel(isParallel())
.forEachOrdered(e -> action.accept(e.getValue(), e.getKey()));
} else {
final MutableInt index = new MutableInt(NOT_FOUND_ELEMENT_INDEX);
unwrap().forEachOrdered(e -> action.accept(e, index.incrementAndGet()));
}
}
// endregion

32
hutool-core/src/main/java/org/dromara/hutool/core/stream/TransformableWrappedStream.java
View File

@ -12,6 +12,7 @@
package org.dromara.hutool.core.stream;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.collection.iter.IterUtil;
import org.dromara.hutool.core.lang.Console;
@ -19,7 +20,6 @@ import org.dromara.hutool.core.lang.mutable.MutableInt;
import org.dromara.hutool.core.lang.mutable.MutableObj;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.core.map.SafeConcurrentHashMap;
import org.dromara.hutool.core.array.ArrayUtil;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
@ -279,17 +279,9 @@ public interface TransformableWrappedStream<T, S extends TransformableWrappedStr
*/
default S peekIdx(final BiConsumer<? super T, Integer> action) {
Objects.requireNonNull(action);
if (isParallel()) {
final Map<Integer, T> idxMap = easyStream().toIdxMap();
return wrap(EasyStream.of(idxMap.entrySet())
.parallel(isParallel())
.peek(e -> action.accept(e.getValue(), e.getKey()))
.map(Map.Entry::getValue));
} else {
final AtomicInteger index = new AtomicInteger(NOT_FOUND_ELEMENT_INDEX);
return peek(e -> action.accept(e, index.incrementAndGet()));
}
}
/**
* 返回叠加调用{@link Console#log(Object)}打印出结果的流
@ -383,17 +375,9 @@ public interface TransformableWrappedStream<T, S extends TransformableWrappedStr
*/
default S filterIdx(final BiPredicate<? super T, Integer> predicate) {
Objects.requireNonNull(predicate);
if (isParallel()) {
final Map<Integer, T> idxMap = easyStream().toIdxMap();
return wrap(EasyStream.of(idxMap.entrySet())
.parallel(isParallel())
.filter(e -> predicate.test(e.getValue(), e.getKey()))
.map(Map.Entry::getValue));
} else {
final MutableInt index = new MutableInt(NOT_FOUND_ELEMENT_INDEX);
return filter(e -> predicate.test(e, index.incrementAndGet()));
}
}
/**
* 过滤元素，返回与 指定操作结果 匹配 指定值 的元素组成的流
@ -440,16 +424,9 @@ public interface TransformableWrappedStream<T, S extends TransformableWrappedStr
*/
default <R> EasyStream<R> flatMapIdx(final BiFunction<? super T, Integer, ? extends Stream<? extends R>> mapper) {
Objects.requireNonNull(mapper);
if (isParallel()) {
final Map<Integer, T> idxMap = easyStream().toIdxMap();
return EasyStream.of(idxMap.entrySet())
.parallel(isParallel())
.flatMap(e -> mapper.apply(e.getValue(), e.getKey()));
} else {
final MutableInt index = new MutableInt(NOT_FOUND_ELEMENT_INDEX);
return flatMap(e -> mapper.apply(e, index.incrementAndGet()));
}
}
/**
* 扩散流操作，可能影响流元素个数，将原有流元素执行mapper操作, 转换为迭代器元素,
@ -553,16 +530,9 @@ public interface TransformableWrappedStream<T, S extends TransformableWrappedStr
*/
default <R> EasyStream<R> mapIdx(final BiFunction<? super T, Integer, ? extends R> mapper) {
Objects.requireNonNull(mapper);
if (isParallel()) {
final Map<Integer, T> idxMap = easyStream().toIdxMap();
return EasyStream.of(idxMap.entrySet())
.parallel(isParallel())
.map(e -> mapper.apply(e.getValue(), e.getKey()));
} else {
final MutableInt index = new MutableInt(NOT_FOUND_ELEMENT_INDEX);
return map(e -> mapper.apply(e, index.incrementAndGet()));
}
}
/**
* 扩散流操作，可能影响流元素个数，将原有流元素执行mapper操作，返回多个流所有元素组成的流，操作带一个方法，调用该方法可增加元素

17
hutool-core/src/test/java/org/dromara/hutool/core/stream/EasyStreamTest.java
View File

@ -12,7 +12,6 @@ import org.junit.jupiter.api.Test;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -145,9 +144,6 @@ public class EasyStreamTest {
final List<String> list = Arrays.asList("dromara", "hutool", "sweet");
final List<String> mapIndex = EasyStream.of(list).mapIdx((e, i) -> i + 1 + "." + e).toList();
Assertions.assertEquals(Arrays.asList("1.dromara", "2.hutool", "3.sweet"), mapIndex);
// 并行流时正常
Assertions.assertEquals(Arrays.asList("1.dromara", "2.hutool", "3.sweet"),
EasyStream.of("dromara", "hutool", "sweet").parallel().mapIdx((e, i) -> i + 1 + "." + e).toList());
}
@Test
@ -199,10 +195,6 @@ public class EasyStreamTest {
final EasyStream.Builder<String> builder = EasyStream.builder();
EasyStream.of(list).forEachIdx((e, i) -> builder.accept(i + 1 + "." + e));
Assertions.assertEquals(Arrays.asList("1.dromara", "2.hutool", "3.sweet"), builder.build().toList());
// 并行流时正常
final AtomicInteger total = new AtomicInteger(0);
EasyStream.of("dromara", "hutool", "sweet").parallel().forEachIdx((e, i) -> total.addAndGet(i));
Assertions.assertEquals(3, total.get());
}
@Test
@ -223,10 +215,6 @@ public class EasyStreamTest {
final List<String> list = Arrays.asList("dromara", "hutool", "sweet");
final List<String> mapIndex = EasyStream.of(list).flatMapIdx((e, i) -> EasyStream.of(i + 1 + "." + e)).toList();
Assertions.assertEquals(Arrays.asList("1.dromara", "2.hutool", "3.sweet"), mapIndex);
// 并行流时正常
Assertions.assertEquals(Arrays.asList("1.dromara", "2.hutool", "3.sweet"),
EasyStream.of("dromara", "hutool", "sweet").parallel()
.flatMapIdx((e, i) -> EasyStream.of(i + 1 + "." + e)).toList());
}
@Test
@ -280,9 +268,6 @@ public class EasyStreamTest {
final List<String> list = Arrays.asList("dromara", "hutool", "sweet");
final List<String> filterIndex = EasyStream.of(list).filterIdx((e, i) -> i < 2).toList();
Assertions.assertEquals(Arrays.asList("dromara", "hutool"), filterIndex);
// 并行流时正常
Assertions.assertEquals(Arrays.asList("dromara", "hutool"),
EasyStream.of("dromara", "hutool", "sweet").parallel().filterIdx((e, i) -> i < 2).toList());
}
@Test
@ -350,7 +335,6 @@ public class EasyStreamTest {
public void testFindFirstIdx() {
final List<Integer> list = Arrays.asList(null, 2, 3);
Assertions.assertEquals(1, EasyStream.of(list).findFirstIdx(Objects::nonNull));
Assertions.assertEquals(-1, (Object) EasyStream.of(list).parallel().findFirstIdx(Objects::nonNull));
}
@Test
@ -370,7 +354,6 @@ public class EasyStreamTest {
public void testFindLastIdx() {
final List<Integer> list = Arrays.asList(1, null, 3);
Assertions.assertEquals(2, (Object) EasyStream.of(list).findLastIdx(Objects::nonNull));
Assertions.assertEquals(-1, (Object) EasyStream.of(list).parallel().findLastIdx(Objects::nonNull));
}
@Test