This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 7bbc97e5835b64c49fd418581f5a45429c1806b1
Merge: 69ea5ff 04b0049
Author: Alex Petrov <oleksandr.pet...@gmail.com>
AuthorDate: Fri Jun 5 19:34:13 2020 +0200
Merge branch 'cassandra-3.11' into trunk
build.xml | 2 +-
.../org/apache/cassandra/distributed/Cluster.java | 36 ++++++---------
.../cassandra/distributed/UpgradeableCluster.java | 34 +++++++-------
.../distributed/impl/AbstractCluster.java | 53 ++++++++++++++++++----
.../cassandra/distributed/impl/Coordinator.java | 30 +++++-------
.../impl/DelegatingInvokableInstance.java | 6 +++
.../cassandra/distributed/impl/Instance.java | 11 ++---
.../apache/cassandra/distributed/impl/RowUtil.java | 22 +++++++++
.../cassandra/distributed/test/BootstrapTest.java | 18 +++-----
.../cassandra/distributed/test/TestBaseImpl.java | 6 +--
.../distributed/upgrade/UpgradeTestBase.java | 10 ++--
11 files changed, 132 insertions(+), 96 deletions(-)
diff --cc build.xml
index 812efc0,3fd409b..7760385
--- a/build.xml
+++ b/build.xml
@@@ -534,24 -401,28 +534,24 @@@
<dependency groupId="org.antlr" artifactId="antlr-runtime"
version="3.5.2">
<exclusion groupId="org.antlr" artifactId="stringtemplate"/>
</dependency>
- <dependency groupId="org.slf4j" artifactId="slf4j-api"
version="1.7.7"/>
- <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j"
version="1.7.7"/>
- <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j"
version="1.7.7" />
- <dependency groupId="ch.qos.logback" artifactId="logback-core"
version="1.1.3"/>
- <dependency groupId="ch.qos.logback" artifactId="logback-classic"
version="1.1.3"/>
- <dependency groupId="org.codehaus.jackson"
artifactId="jackson-core-asl" version="1.9.2"/>
- <dependency groupId="org.codehaus.jackson"
artifactId="jackson-mapper-asl" version="1.9.2"/>
+ <dependency groupId="org.slf4j" artifactId="slf4j-api"
version="1.7.25"/>
+ <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j"
version="1.7.25"/>
+ <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j"
version="1.7.25" />
+ <dependency groupId="ch.qos.logback" artifactId="logback-core"
version="1.2.3"/>
+ <dependency groupId="ch.qos.logback" artifactId="logback-classic"
version="1.2.3"/>
+ <dependency groupId="com.fasterxml.jackson.core"
artifactId="jackson-core" version="2.9.5"/>
+ <dependency groupId="com.fasterxml.jackson.core"
artifactId="jackson-databind" version="2.9.5"/>
+ <dependency groupId="com.fasterxml.jackson.core"
artifactId="jackson-annotations" version="2.9.5"/>
<dependency groupId="com.googlecode.json-simple"
artifactId="json-simple" version="1.1"/>
<dependency groupId="com.boundary" artifactId="high-scale-lib"
version="1.0.6"/>
- <dependency groupId="com.github.jbellis" artifactId="jamm"
version="0.3.0"/>
+ <dependency groupId="com.github.jbellis" artifactId="jamm"
version="${jamm.version}"/>
- <dependency groupId="com.thinkaurelius.thrift"
artifactId="thrift-server" version="0.3.7">
- <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
- <exclusion groupId="junit" artifactId="junit"/>
- </dependency>
<dependency groupId="org.yaml" artifactId="snakeyaml"
version="1.11"/>
- <dependency groupId="org.apache.thrift" artifactId="libthrift"
version="0.9.2">
- <exclusion groupId="commons-logging"
artifactId="commons-logging"/>
- </dependency>
- <dependency groupId="junit" artifactId="junit" version="4.6" />
+ <dependency groupId="junit" artifactId="junit" version="4.12" />
<dependency groupId="org.mockito" artifactId="mockito-core"
version="3.2.4" />
+ <dependency groupId="org.quicktheories" artifactId="quicktheories"
version="0.25" />
+ <dependency groupId="com.google.code.java-allocation-instrumenter"
artifactId="java-allocation-instrumenter"
version="${allocation-instrumenter.version}" />
- <dependency groupId="org.apache.cassandra" artifactId="dtest-api"
version="0.0.1" />
+ <dependency groupId="org.apache.cassandra" artifactId="dtest-api"
version="0.0.2" />
<dependency groupId="org.apache.rat" artifactId="apache-rat"
version="0.10">
<exclusion groupId="commons-lang" artifactId="commons-lang"/>
</dependency>
diff --cc test/distributed/org/apache/cassandra/distributed/Cluster.java
index ee01874,95ead50..e8e6041
--- a/test/distributed/org/apache/cassandra/distributed/Cluster.java
+++ b/test/distributed/org/apache/cassandra/distributed/Cluster.java
@@@ -18,18 -18,13 +18,13 @@@
package org.apache.cassandra.distributed;
- import java.io.File;
import java.io.IOException;
- import java.util.List;
import java.util.function.Consumer;
- import org.apache.cassandra.distributed.api.ICluster;
import org.apache.cassandra.distributed.api.IInstanceConfig;
-import org.apache.cassandra.distributed.api.IInvokableInstance;
import org.apache.cassandra.distributed.impl.AbstractCluster;
+import org.apache.cassandra.distributed.api.IInvokableInstance;
- import org.apache.cassandra.distributed.impl.InstanceConfig;
- import org.apache.cassandra.distributed.shared.Builder;
- import org.apache.cassandra.distributed.shared.NetworkTopology;
+ import org.apache.cassandra.distributed.shared.AbstractBuilder;
import org.apache.cassandra.distributed.shared.Versions;
/**
diff --cc
test/distributed/org/apache/cassandra/distributed/UpgradeableCluster.java
index 57ace93,bde5d4e..532c1b1
--- a/test/distributed/org/apache/cassandra/distributed/UpgradeableCluster.java
+++ b/test/distributed/org/apache/cassandra/distributed/UpgradeableCluster.java
@@@ -81,5 -70,13 +70,14 @@@ public class UpgradeableCluster extend
{
return build(nodeCount).withVersion(version).start();
}
+
+ public static final class Builder extends
AbstractBuilder<IUpgradeableInstance, UpgradeableCluster, Builder>
+ {
+
+ public Builder()
+ {
+ super(UpgradeableCluster::new);
+ }
+ }
}
+
diff --cc
test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java
index c1446d1,329fa37..2ee209d
--- a/test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java
@@@ -79,10 -81,10 +81,10 @@@ public class Coordinator implements ICo
return
org.apache.cassandra.db.ConsistencyLevel.fromCode(cl.ordinal());
}
- private QueryResult executeInternal(String query, ConsistencyLevel
consistencyLevelOrigin, Object[] boundValues)
+ private SimpleQueryResult executeInternal(String query, ConsistencyLevel
consistencyLevelOrigin, Object[] boundValues)
{
ClientState clientState = makeFakeClientState();
- CQLStatement prepared = QueryProcessor.getStatement(query,
clientState).statement;
+ CQLStatement prepared = QueryProcessor.getStatement(query,
clientState);
List<ByteBuffer> boundBBValues = new ArrayList<>();
ConsistencyLevel consistencyLevel =
ConsistencyLevel.valueOf(consistencyLevelOrigin.name());
for (Object boundValue : boundValues)
@@@ -96,21 -98,10 +98,11 @@@
Integer.MAX_VALUE,
null,
null,
-
ProtocolVersion.CURRENT),
+
ProtocolVersion.V4,
+ null),
System.nanoTime());
- if (res != null && res.kind == ResultMessage.Kind.ROWS)
- {
- ResultMessage.Rows rows = (ResultMessage.Rows) res;
- String[] names = rows.result.metadata.names.stream().map(c ->
c.name.toString()).toArray(String[]::new);
- Object[][] results = RowUtil.toObjects(rows);
- return new QueryResult(names, results);
- }
- else
- {
- return QueryResult.EMPTY;
- }
+ return RowUtil.toQueryResult(res);
}
public Object[][] executeWithTracing(UUID sessionId, String query,
ConsistencyLevel consistencyLevelOrigin, Object... boundValues)
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 6f9577a,6066ecf..908ccb2
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -32,7 -34,7 +32,6 @@@ import java.util.concurrent.CopyOnWrite
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.TimeoutException;
--import java.util.function.BiConsumer;
import java.util.function.Function;
import javax.management.ListenerNotFoundException;
@@@ -69,9 -70,10 +68,9 @@@ import org.apache.cassandra.distributed
import org.apache.cassandra.distributed.api.IListen;
import org.apache.cassandra.distributed.api.IMessage;
import org.apache.cassandra.distributed.api.NodeToolResult;
+ import org.apache.cassandra.distributed.api.SimpleQueryResult;
import org.apache.cassandra.distributed.mock.nodetool.InternalNodeProbe;
import
org.apache.cassandra.distributed.mock.nodetool.InternalNodeProbeFactory;
--import org.apache.cassandra.distributed.shared.NetworkTopology;
import org.apache.cassandra.gms.ApplicationState;
import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.gms.VersionedValue;
@@@ -169,17 -160,14 +168,13 @@@ public class Instance extends IsolatedE
public InetSocketAddress broadcastAddress() { return
config.broadcastAddress(); }
@Override
- public Object[][] executeInternal(String query, Object... args)
+ public SimpleQueryResult executeInternalWithResult(String query,
Object... args)
{
return sync(() -> {
- ParsedStatement.Prepared prepared =
QueryProcessor.prepareInternal(query);
- ResultMessage result =
prepared.statement.executeInternal(QueryProcessor.internalQueryState(),
-
QueryProcessor.makeInternalOptions(prepared, args));
-
+ QueryHandler.Prepared prepared =
QueryProcessor.prepareInternal(query);
+ ResultMessage result =
prepared.statement.executeLocally(QueryProcessor.internalQueryState(),
+
QueryProcessor.makeInternalOptions(prepared.statement, args));
-
- if (result instanceof ResultMessage.Rows)
- return RowUtil.toObjects((ResultMessage.Rows)result);
- else
- return null;
+ return RowUtil.toQueryResult(result);
}).call();
}
diff --cc
test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
index 99676ce,4f0c700..7b1f6f6
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
@@@ -30,15 -30,14 +30,13 @@@ import org.junit.BeforeClass
import org.apache.cassandra.distributed.UpgradeableCluster;
import org.apache.cassandra.distributed.api.ICluster;
- import org.apache.cassandra.distributed.api.IInstance;
import org.apache.cassandra.distributed.api.IInstanceConfig;
-import org.apache.cassandra.distributed.api.IUpgradeableInstance;
import org.apache.cassandra.distributed.impl.Instance;
- import org.apache.cassandra.distributed.impl.InstanceConfig;
- import org.apache.cassandra.distributed.shared.Builder;
import org.apache.cassandra.distributed.shared.DistributedTestBase;
import org.apache.cassandra.distributed.shared.Versions;
- import static org.apache.cassandra.distributed.shared.Versions.Version;
+
import static org.apache.cassandra.distributed.shared.Versions.Major;
+ import static org.apache.cassandra.distributed.shared.Versions.Version;
import static org.apache.cassandra.distributed.shared.Versions.find;
public class UpgradeTestBase extends DistributedTestBase
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
