Skip to content

MINOR: Align KTableAgg and KTableReduce #6712

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

Merged
mjsax merged 2 commits into from
May 11, 2019
Merged

MINOR: Align KTableAgg and KTableReduce #6712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b2806e
MINOR: Align KTableAgg and KTableReduce
mjsax May 10, 2019
2afd600
Github comment
mjsax May 11, 2019
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
1 change: 0 additions & 1 deletion streams/src/main/java/org/apache/kafka/streams/kstream/internals/KStreamReduce.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ private class KStreamReduceProcessor extends AbstractProcessor<K, V> {
public void init(final ProcessorContext context) {
super.init(context);
metrics = (StreamsMetricsImpl) context.metrics();

store = (KeyValueStore<K, V>) context.getStateStore(storeName);
tupleForwarder = new TupleForwarder<>(store, context, new ForwardingCacheFlushListener<K, V>(context), sendOldValues);
}
Expand Down
27 changes: 17 additions & 10 deletions streams/src/main/java/org/apache/kafka/streams/kstream/internals/KTableAggregate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,29 @@ public void process(final K key, final Change<V> value) {
throw new StreamsException("Record key for KTable aggregate operator with state " + storeName + " should not be null.");
}

T oldAgg = store.get(key);

if (oldAgg == null) {
oldAgg = initializer.apply();
}

T newAgg = oldAgg;
final T oldAgg = store.get(key);
final T intermediateAgg;

// first try to remove the old value
if (value.oldValue != null) {
newAgg = remove.apply(key, value.oldValue, newAgg);
if (value.oldValue != null && oldAgg != null) {
intermediateAgg = remove.apply(key, value.oldValue, oldAgg);
} else {
intermediateAgg = oldAgg;
}

// then try to add the new value
final T newAgg;
if (value.newValue != null) {
newAgg = add.apply(key, value.newValue, newAgg);
final T initializedAgg;
if (intermediateAgg == null) {
initializedAgg = initializer.apply();
} else {
initializedAgg = intermediateAgg;
}

newAgg = add.apply(key, value.newValue, initializedAgg);
} else {
newAgg = intermediateAgg;
}

// update the store with the new value
Expand Down
23 changes: 14 additions & 9 deletions streams/src/main/java/org/apache/kafka/streams/kstream/internals/KTableReduce.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,25 @@ public void process(final K key, final Change<V> value) {
}

final V oldAgg = store.get(key);
V newAgg = oldAgg;
final V intermediateAgg;

// first try to add the new value
// first try to remove the old value
if (value.oldValue != null && oldAgg != null) {
intermediateAgg = removeReducer.apply(oldAgg, value.oldValue);
} else {
intermediateAgg = oldAgg;
}

// then try to add the new value
final V newAgg;
if (value.newValue != null) {
if (newAgg == null) {
if (intermediateAgg == null) {
newAgg = value.newValue;
} else {
newAgg = addReducer.apply(newAgg, value.newValue);
newAgg = addReducer.apply(intermediateAgg, value.newValue);
}
}

// then try to remove the old value
if (value.oldValue != null) {
newAgg = removeReducer.apply(newAgg, value.oldValue);
} else {
newAgg = intermediateAgg;
}

// update the store with the new value
Expand Down