natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.2' into cassandra-3.0

This commit is contained in:
Jordan West 2020-10-14 12:00:34 -07:00
parent 6eeca9d6cc 9a40e8079b
commit 7b3a15dd9f
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -398,7 +398,7 @@
</dependency>
<dependency groupId="junit" artifactId="junit" version="4.6" />
<dependency groupId="org.mockito" artifactId="mockito-core" version="3.2.4" />
<dependency groupId="org.apache.cassandra" artifactId="dtest-api" version="0.0.5" />
<dependency groupId="org.apache.cassandra" artifactId="dtest-api" version="0.0.6" />
<dependency groupId="org.reflections" artifactId="reflections" version="0.9.12" />
<dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.10">
<exclusion groupId="commons-lang" artifactId="commons-lang"/>

7
test/distributed/org/apache/cassandra/distributed/impl/DelegatingInvokableInstance.java
View File

@ -36,6 +36,7 @@ import org.apache.cassandra.distributed.api.IListen;
import org.apache.cassandra.distributed.api.IMessage;
import org.apache.cassandra.distributed.api.SimpleQueryResult;
import org.apache.cassandra.distributed.shared.NetworkTopology;
import org.apache.cassandra.utils.FBUtilities;
public abstract class DelegatingInvokableInstance implements IInvokableInstance
{
@ -89,6 +90,12 @@ public abstract class DelegatingInvokableInstance implements IInvokableInstance
return delegate().getMessagingVersion();
}
@Override
public String getReleaseVersionString()
{
return delegate().getReleaseVersionString();
}
@Override
public void setMessagingVersion(InetSocketAddress endpoint, int version)
{

5
test/distributed/org/apache/cassandra/distributed/impl/Instance.java
View File

@ -507,6 +507,11 @@ public class Instance extends IsolatedExecutor implements IInvokableInstance
runOnInstance(() -> MessagingService.instance().setVersion(endpoint.getAddress(), version));
}
public String getReleaseVersionString()
{
return callsOnInstance(() -> FBUtilities.getReleaseVersionString()).call();
}
public void flush(String keyspace)
{
runOnInstance(() -> FBUtilities.waitOnFutures(Keyspace.open(keyspace).flush()));