Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 3 commits into from
+46 −25
Closed

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cff6d03
De-duplicate identical lambdas in FindOps
cl4es May 30, 2024
a223e60
@ExE-Boss review
cl4es Jun 18, 2024
d83a1c9
Fixes
cl4es Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 40 additions & 25 deletions src/java.base/share/classes/java/util/stream/FindOps.java
View file
Original file line number Diff line number Diff line change
@@ -194,13 +194,16 @@ public Optional<T> get() {
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 @@ public OptionalInt get() {
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 @@ public OptionalLong get() {
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 @@ public OptionalDouble get() {
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 changes: 6 additions & 0 deletions test/micro/org/openjdk/bench/java/util/stream/ops/ref/FindAny.java
View file
Original file line number Diff line number Diff line change
@@ -60,4 +60,10 @@ public Long par_invoke() {
return LongStream.range(0, size).parallel().boxed().findAny().get();
}

public static void main(String... args) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this driver necessary?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cl4es Just wonder what your use case is for this addition. If this is accidentally committed, please remove it and I am glad with all other changes.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding a main method in micros like these allow me to easily multi-purpose them as relatively clean, diagnostic startup microbenchmarks. It's something I've started adding to all micros I author. I guess I should do a write-up about it some time.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the explanation.

FindAny findAny = new FindAny();
findAny.size = 100000;
findAny.seq_invoke();
findAny.par_invoke();
}
}