-
Notifications
You must be signed in to change notification settings - Fork 1k
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.
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
fix: changes required for compatibility with KIP-479 #3466
Merged
bbejeck
merged 5 commits into
master
from
fix_update_for_new_stream_joined_config_object
Oct 9, 2019
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
f255b64
fix: changes required for compatibility with KIP-479
bbejeck 1a87af9
fix: rebased and changes for refactoring
bbejeck 7ed8f88
fix: add spotbugs ignore to test
bbejeck 32b3a4e
fix: add specific warning to spotbug annotation
bbejeck 812f75a
fix: Add suppress deprecation warnings from KIP-470 changes
bbejeck File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
ksql-streams/src/main/java/io/confluent/ksql/execution/streams/StreamJoinedFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
/* | ||
* Copyright 2018 Confluent Inc. | ||
* | ||
* Licensed under the Confluent Community License (the "License"); you may not use | ||
* this file except in compliance with the License. You may obtain a copy of the | ||
* License at | ||
* | ||
* http://www.confluent.io/confluent-community-license | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OF ANY KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations under the License. | ||
*/ | ||
|
||
package io.confluent.ksql.execution.streams; | ||
|
||
import io.confluent.ksql.util.KsqlConfig; | ||
import org.apache.kafka.common.serialization.Serde; | ||
import org.apache.kafka.streams.kstream.StreamJoined; | ||
|
||
public interface StreamJoinedFactory { | ||
<K, V, V0> StreamJoined<K, V, V0> create( | ||
Serde<K> keySerde, | ||
Serde<V> leftSerde, | ||
Serde<V0> rightSerde, | ||
String name, | ||
String storeName); | ||
|
||
|
||
static StreamJoinedFactory create(final KsqlConfig ksqlConfig) { | ||
if (StreamsUtil.useProvidedName(ksqlConfig)) { | ||
return new StreamJoinedFactory() { | ||
@Override | ||
public <K, V, V0> StreamJoined<K, V, V0> create( | ||
final Serde<K> keySerde, | ||
final Serde<V> leftSerde, | ||
final Serde<V0> rightSerde, | ||
final String name, | ||
final String storeName) { | ||
return StreamJoined.with(keySerde, leftSerde, rightSerde) | ||
.withName(name).withStoreName(storeName); | ||
} | ||
}; | ||
} | ||
return new StreamJoinedFactory() { | ||
@Override | ||
public <K, V, V0> StreamJoined<K, V, V0> create( | ||
final Serde<K> keySerde, | ||
final Serde<V> leftSerde, | ||
final Serde<V0> rightSerde, | ||
final String name, | ||
final String storeName) { | ||
return StreamJoined.with(keySerde, leftSerde, rightSerde); | ||
} | ||
}; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
withStoreName
is the key change/addition. If we want to stick with generated store names, we can omit thewithStoreName
call and update the expected topologies for theQueryTranslationTest
.