stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8333265: De-duplicate method references in java.util.stream.FindOps

Browse Source 
Reviewed-by: liach
This commit is contained in:
Claes Redestad 2024-08-21 22:10:06 +00:00
parent ab8071d280
commit 47c8a6a8db
2 changed files with 46 additions and 25 deletions
src/java.base/share/classes/java/util/stream
FindOps.java
test/micro/org/openjdk/bench/java/util/stream/ops/ref
FindAny.java

65
src/java.base/share/classes/java/util/stream/FindOps.java

@ -194,13 +194,16 @@ final class FindOps {
return hasValue ? Optional.of(value) : null;
}
static final TerminalOp<?, ?> OP_FIND_FIRST = new FindOp<>(true,
StreamShape.REFERENCE, Optional.empty(),
Optional::isPresent, FindSink.OfRef::new);
static final TerminalOp<?, ?> OP_FIND_ANY = new FindOp<>(false,
StreamShape.REFERENCE, Optional.empty(),
Optional::isPresent, FindSink.OfRef::new);
static final TerminalOp<?, ?> OP_FIND_FIRST, OP_FIND_ANY;
static {
Predicate<Optional<Object>> isPresent = Optional::isPresent;
Supplier<TerminalSink<Object, Optional<Object>>> newSink
= FindSink.OfRef::new;
OP_FIND_FIRST = new FindOp<>(true, StreamShape.REFERENCE,
Optional.empty(), isPresent, newSink);
OP_FIND_ANY = new FindOp<>(false, StreamShape.REFERENCE,
Optional.empty(), isPresent, newSink);
}
}
/** Specialization of {@code FindSink} for int streams */
@ -217,12 +220,16 @@ final class FindOps {
return hasValue ? OptionalInt.of(value) : null;
}
static final TerminalOp<Integer, OptionalInt> OP_FIND_FIRST = new FindOp<>(true,
StreamShape.INT_VALUE, OptionalInt.empty(),
OptionalInt::isPresent, FindSink.OfInt::new);
static final TerminalOp<Integer, OptionalInt> OP_FIND_ANY = new FindOp<>(false,
StreamShape.INT_VALUE, OptionalInt.empty(),
OptionalInt::isPresent, FindSink.OfInt::new);
static final TerminalOp<Integer, OptionalInt> OP_FIND_FIRST, OP_FIND_ANY;
static {
Predicate<OptionalInt> isPresent = OptionalInt::isPresent;
Supplier<TerminalSink<Integer, OptionalInt>> newSink
= FindSink.OfInt::new;
OP_FIND_FIRST = new FindOp<>(true, StreamShape.INT_VALUE,
OptionalInt.empty(), isPresent, newSink);
OP_FIND_ANY = new FindOp<>(false, StreamShape.INT_VALUE,
OptionalInt.empty(), isPresent, newSink);
}
}
/** Specialization of {@code FindSink} for long streams */
@ -239,12 +246,16 @@ final class FindOps {
return hasValue ? OptionalLong.of(value) : null;
}
static final TerminalOp<Long, OptionalLong> OP_FIND_FIRST = new FindOp<>(true,
StreamShape.LONG_VALUE, OptionalLong.empty(),
OptionalLong::isPresent, FindSink.OfLong::new);
static final TerminalOp<Long, OptionalLong> OP_FIND_ANY = new FindOp<>(false,
StreamShape.LONG_VALUE, OptionalLong.empty(),
OptionalLong::isPresent, FindSink.OfLong::new);
static final TerminalOp<Long, OptionalLong> OP_FIND_FIRST, OP_FIND_ANY;
static {
Predicate<OptionalLong> isPresent = OptionalLong::isPresent;
Supplier<TerminalSink<Long, OptionalLong>> newSink
= FindSink.OfLong::new;
OP_FIND_FIRST = new FindOp<>(true, StreamShape.LONG_VALUE,
OptionalLong.empty(), isPresent, newSink);
OP_FIND_ANY = new FindOp<>(false, StreamShape.LONG_VALUE,
OptionalLong.empty(), isPresent, newSink);
}
}
/** Specialization of {@code FindSink} for double streams */
@ -261,12 +272,16 @@ final class FindOps {
return hasValue ? OptionalDouble.of(value) : null;
}
static final TerminalOp<Double, OptionalDouble> OP_FIND_FIRST = new FindOp<>(true,
StreamShape.DOUBLE_VALUE, OptionalDouble.empty(),
OptionalDouble::isPresent, FindSink.OfDouble::new);
static final TerminalOp<Double, OptionalDouble> OP_FIND_ANY = new FindOp<>(false,
StreamShape.DOUBLE_VALUE, OptionalDouble.empty(),
OptionalDouble::isPresent, FindSink.OfDouble::new);
static final TerminalOp<Double, OptionalDouble> OP_FIND_FIRST, OP_FIND_ANY;
static {
Predicate<OptionalDouble> isPresent = OptionalDouble::isPresent;
Supplier<TerminalSink<Double, OptionalDouble>> newSink
= FindSink.OfDouble::new;
OP_FIND_FIRST = new FindOp<>(true, StreamShape.DOUBLE_VALUE,
OptionalDouble.empty(), isPresent, newSink);
OP_FIND_ANY = new FindOp<>(false, StreamShape.DOUBLE_VALUE,
OptionalDouble.empty(), isPresent, newSink);
}
}
}

6
test/micro/org/openjdk/bench/java/util/stream/ops/ref/FindAny.java

@ -60,4 +60,10 @@ public class FindAny {
return LongStream.range(0, size).parallel().boxed().findAny().get();
}
public static void main(String... args) {
FindAny findAny = new FindAny();
findAny.size = 100000;
findAny.seq_invoke();
findAny.par_invoke();
}
}