mjsax commented on a change in pull request #11252:
URL: https://github.com/apache/kafka/pull/11252#discussion_r710444534
##########
File path:
streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamKStreamJoin.java
##########
@@ -209,37 +211,51 @@ private void emitNonJoinedOuterRecords(final
WindowStore<KeyAndJoinSide<K>, Left
// reset to MAX_VALUE in case the store is empty
sharedTimeTracker.minTime = Long.MAX_VALUE;
- try (final KeyValueIterator<Windowed<KeyAndJoinSide<K>>,
LeftOrRightValue> it = store.all()) {
+ try (final KeyValueIterator<TimestampedKeyAndJoinSide<K>,
LeftOrRightValue<V1, V2>> it = store.all()) {
+ TimestampedKeyAndJoinSide<K> prevKey = null;
+
while (it.hasNext()) {
- final KeyValue<Windowed<KeyAndJoinSide<K>>,
LeftOrRightValue> record = it.next();
+ final KeyValue<TimestampedKeyAndJoinSide<K>,
LeftOrRightValue<V1, V2>> record = it.next();
- final Windowed<KeyAndJoinSide<K>> windowedKey = record.key;
- final LeftOrRightValue value = record.value;
- sharedTimeTracker.minTime = windowedKey.window().start();
+ final TimestampedKeyAndJoinSide<K>
timestampedKeyAndJoinSide = record.key;
+ final LeftOrRightValue<V1, V2> value = record.value;
+ final K key = timestampedKeyAndJoinSide.getKey();
+ final long timestamp =
timestampedKeyAndJoinSide.getTimestamp();
+ sharedTimeTracker.minTime = timestamp;
// Skip next records if window has not closed
- if (windowedKey.window().start() + joinAfterMs +
joinGraceMs >= sharedTimeTracker.streamTime) {
+ if (timestamp + joinAfterMs + joinGraceMs >=
sharedTimeTracker.streamTime) {
break;
}
- final K key = windowedKey.key().getKey();
- final long time = windowedKey.window().start();
-
final R nullJoinedValue;
if (isLeftSide) {
nullJoinedValue = joiner.apply(key,
- (V1) value.getLeftValue(),
- (V2) value.getRightValue());
+ value.getLeftValue(),
+ value.getRightValue());
} else {
nullJoinedValue = joiner.apply(key,
- (V1) value.getRightValue(),
- (V2) value.getLeftValue());
+ (V1) value.getRightValue(),
+ (V2) value.getLeftValue());
}
- context().forward(key, nullJoinedValue,
To.all().withTimestamp(time));
+ context().forward(key, nullJoinedValue,
To.all().withTimestamp(timestamp));
+
+ if (prevKey != null &&
!prevKey.equals(timestampedKeyAndJoinSide)) {
Review comment:
Could we simply this to:
```
if (!timestampedKeyAndJoinSide.equals(prevKey)) {
```
Flipping the order should avoid a NPE because `timestampedKeyAndJoinSide !=
null` and `equals()` should handle `null` as input gracefully?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
