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

Jump to bottom

fix: remove usages of internal Streams API/variable that was removed upstream #8660

Merged
merged 1 commit into from
Jan 26, 2022
Merged

fix: remove usages of internal Streams API/variable that was removed upstream #8660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...engine/src/main/java/io/confluent/ksql/physical/scalablepush/locator/AllHostsLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ public List<KsqlNode> locate() {
.map(QueryMetadata::getAllMetadata)
.filter(Objects::nonNull)
.flatMap(Collection::stream)
.filter(streamsMetadata -> !(streamsMetadata.equals(StreamsMetadataImpl.NOT_AVAILABLE)))
.map(StreamsMetadata::hostInfo)
.map(hi -> new Node(isLocalhost(hi), buildLocation(hi)))
.distinct()
Expand Down
5 changes: 2 additions & 3 deletions ...ne/src/test/java/io/confluent/ksql/physical/scalablepush/locator/AllHostsLocatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import io.confluent.ksql.util.PersistentQueryMetadata;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collections;
import java.util.List;
import org.apache.kafka.streams.StreamsMetadata;
import org.apache.kafka.streams.KafkaStreams.State;
Expand All @@ -18,8 +19,6 @@
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;

import static org.apache.kafka.streams.state.internals.StreamsMetadataImpl.NOT_AVAILABLE;

@RunWith(MockitoJUnitRunner.class)
public class AllHostsLocatorTest {

Expand All @@ -44,7 +43,7 @@ public void shouldLocate() throws MalformedURLException {
when(metadata1.getAllMetadata())
.thenReturn(ImmutableList.of(streamsMetadata1, streamsMetadata2));
when(metadata2.getAllMetadata())
.thenReturn(ImmutableList.of(streamsMetadata3, NOT_AVAILABLE));
.thenReturn(Collections.emptyList());
when(streamsMetadata1.hostInfo())
.thenReturn(new HostInfo("abc", 101), new HostInfo("localhost", 8088));
when(streamsMetadata2.hostInfo()).thenReturn(new HostInfo("localhost", 8088));
Expand Down
4 changes: 1 addition & 3 deletions ...rest-app/src/main/java/io/confluent/ksql/rest/server/resources/ClusterStatusResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import java.util.stream.Collectors;
import org.apache.kafka.streams.StreamsMetadata;
import org.apache.kafka.streams.state.HostInfo;
import org.apache.kafka.streams.state.internals.StreamsMetadataImpl;

/**
* Endpoint that reports the view of the cluster that this server has.
Expand Down Expand Up @@ -103,8 +102,7 @@ private Map<String, ActiveStandbyEntity> getActiveStandbyInformation(
final Map<String, ActiveStandbyEntity> perQueryMap = new HashMap<>();
for (PersistentQueryMetadata persistentQueryMetadata: engine.getPersistentQueries()) {
for (StreamsMetadata streamsMetadata: persistentQueryMetadata.getAllMetadata()) {
if (streamsMetadata.equals(StreamsMetadataImpl.NOT_AVAILABLE)
|| !streamsMetadata.hostInfo().equals(asHostInfo(ksqlHostInfo))) {
if (streamsMetadata.hostInfo().equals(asHostInfo(ksqlHostInfo))) {
continue;
}
final QueryIdAndStreamsMetadata queryIdAndStreamsMetadata = new QueryIdAndStreamsMetadata(
Expand Down
2 changes: 0 additions & 2 deletions ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/util/DiscoverRemoteHostsUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.stream.Collectors;
import org.apache.kafka.streams.StreamsMetadata;
import org.apache.kafka.streams.state.HostInfo;
import org.apache.kafka.streams.state.internals.StreamsMetadataImpl;

public final class DiscoverRemoteHostsUtil {

Expand All @@ -43,7 +42,6 @@ public static Set<HostInfo> getRemoteHosts(
.map(QueryMetadata::getAllMetadata)
.filter(Objects::nonNull)
.flatMap(Collection::stream)
.filter(streamsMetadata -> !(streamsMetadata.equals(StreamsMetadataImpl.NOT_AVAILABLE)))
.map(StreamsMetadata::hostInfo)
.filter(hostInfo -> !(hostInfo.host().equals(localHost.host())
&& hostInfo.port() == (localHost.port())))
Expand Down