You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2020/06/05 17:34:47 UTC
[cassandra] branch cassandra-3.11 updated (7014cd5 -> 04b0049)
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 7014cd5 Merge branch 'cassandra-3.0' into cassandra-3.11
new 4fef917 In-jvm dtest builder should be provided to the factory and expose state
new 880b07c Merge branch 'cassandra-2.2' into cassandra-3.0
new 04b0049 Merge branch 'cassandra-3.0' into cassandra-3.11
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by if...@apache.org.
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 <ol...@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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org