This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 04b00498312c2627bd180485565fbd1b18e1fbc3
Merge: 7014cd5 880b07c
Author: Alex Petrov <oleksandr.pet...@gmail.com>
AuthorDate: Fri Jun 5 19:26:56 2020 +0200
Merge branch 'cassandra-3.0' into cassandra-3.11
build.xml | 2 +-
.../org/apache/cassandra/distributed/Cluster.java | 38 +++++++---------
.../cassandra/distributed/UpgradeableCluster.java | 33 +++++++-------
.../distributed/impl/AbstractCluster.java | 53 ++++++++++++++++++----
.../cassandra/distributed/impl/Coordinator.java | 30 +++++-------
.../impl/DelegatingInvokableInstance.java | 6 +++
.../cassandra/distributed/impl/Instance.java | 10 ++--
.../apache/cassandra/distributed/impl/RowUtil.java | 22 +++++++++
.../cassandra/distributed/test/BootstrapTest.java | 18 +++-----
.../cassandra/distributed/test/TestBaseImpl.java | 9 ++--
.../distributed/upgrade/UpgradeTestBase.java | 10 ++--
11 files changed, 137 insertions(+), 94 deletions(-)
diff --cc
test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java
index d49679d,2f2b525..329fa37
--- a/test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java
@@@ -64,8 -66,8 +66,8 @@@ public class Coordinator implements ICo
return instance.async(() -> {
try
{
- Tracing.instance.newSession(sessionId);
+ Tracing.instance.newSession(sessionId,
Collections.emptyMap());
- return executeInternal(query, consistencyLevelOrigin,
boundValues).toObjectArrays();
+ return executeInternal(query, consistencyLevelOrigin,
boundValues);
}
finally
{
@@@ -96,20 -98,9 +98,10 @@@
Integer.MAX_VALUE,
null,
null,
-
Server.CURRENT_VERSION));
+
ProtocolVersion.CURRENT),
+ 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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
