You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2019/02/05 10:53:57 UTC
[cassandra] branch cassandra-3.11 updated (220611a -> a6059f1)
This is an automated email from the ASF dual-hosted git repository.
benedict pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 220611a Merge branch 'cassandra-3.0' into cassandra-3.11
add c100f1a Multi-version in-JVM dtests
add aa2a5c6 Merge branch 'cassandra-2.2' into cassandra-3.0
add a6059f1 Merge branch 'cassandra-3.0' into cassandra-3.11
No new revisions were added by this update.
Summary of changes:
.circleci/config.yml | 2 +-
CHANGES.txt | 5 -
build.xml | 11 +-
.../AbstractLocalAwareExecutorService.java | 12 +-
.../cassandra/concurrent/InfiniteLoopExecutor.java | 3 +-
.../cassandra/concurrent/NamedThreadFactory.java | 6 +-
src/java/org/apache/cassandra/config/Config.java | 12 +
.../cassandra/config/DatabaseDescriptor.java | 3 +
.../org/apache/cassandra/utils/FBUtilities.java | 9 +
test/conf/logback-dtest.xml | 2 +-
.../org/apache/cassandra/distributed/Cluster.java | 57 +++
.../cassandra/distributed/InstanceClassLoader.java | 109 ------
.../cassandra/distributed/InstanceConfig.java | 87 -----
.../cassandra/distributed/InvokableInstance.java | 213 -----------
.../apache/cassandra/distributed/TestCluster.java | 280 --------------
.../cassandra/distributed/UpgradeableCluster.java | 70 ++++
.../apache/cassandra/distributed/api/ICluster.java | 20 +-
.../cassandra/distributed/api/ICoordinator.java | 37 +-
.../{LegacyAdapter.java => api/IInstance.java} | 36 +-
.../IInstanceConfig.java} | 31 +-
.../distributed/api/IIsolatedExecutor.java | 127 +++++++
.../apache/cassandra/distributed/api/IListen.java | 10 +-
.../apache/cassandra/distributed/api/IMessage.java | 15 +-
.../IMessageFilters.java} | 30 +-
.../distributed/impl/AbstractCluster.java | 406 +++++++++++++++++++++
.../distributed/{ => impl}/Coordinator.java | 65 ++--
.../impl/DelegatingInvokableInstance.java | 196 ++++++++++
.../distributed/impl/IInvokableInstance.java | 68 ++++
.../distributed/impl/IUpgradeableInstance.java | 15 +-
.../cassandra/distributed/{ => impl}/Instance.java | 315 ++++++++--------
.../distributed/impl/InstanceClassLoader.java | 103 ++++++
.../cassandra/distributed/impl/InstanceConfig.java | 233 ++++++++++++
.../distributed/{ => impl}/InstanceIDDefiner.java | 15 +-
.../distributed/impl/IsolatedExecutor.java | 165 +++++++++
.../apache/cassandra/distributed/impl/Listen.java | 55 +++
.../cassandra/distributed/{ => impl}/Message.java | 45 ++-
.../distributed/{ => impl}/MessageFilters.java | 35 +-
.../cassandra/distributed/{ => impl}/RowUtil.java | 2 +-
.../cassandra/distributed/impl/Versions.java | 187 ++++++++++
.../{ => test}/DistributedReadWritePathTest.java | 33 +-
.../{ => test}/DistributedTestBase.java | 12 +-
.../cassandra/distributed/upgrade/UpgradeTest.java | 52 +++
.../distributed/upgrade/UpgradeTestBase.java | 156 ++++++++
.../apache/cassandra/LogbackStatusListener.java | 2 +-
.../config/DatabaseDescriptorRefTest.java | 28 +-
45 files changed, 2316 insertions(+), 1059 deletions(-)
create mode 100644 test/distributed/org/apache/cassandra/distributed/Cluster.java
delete mode 100644 test/distributed/org/apache/cassandra/distributed/InstanceClassLoader.java
delete mode 100644 test/distributed/org/apache/cassandra/distributed/InstanceConfig.java
delete mode 100644 test/distributed/org/apache/cassandra/distributed/InvokableInstance.java
delete mode 100644 test/distributed/org/apache/cassandra/distributed/TestCluster.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/UpgradeableCluster.java
copy src/java/org/apache/cassandra/db/BlacklistedDirectoriesMBean.java => test/distributed/org/apache/cassandra/distributed/api/ICluster.java (71%)
copy src/java/org/apache/cassandra/utils/WrappedInt.java => test/distributed/org/apache/cassandra/distributed/api/ICoordinator.java (64%)
copy test/distributed/org/apache/cassandra/distributed/{LegacyAdapter.java => api/IInstance.java} (53%)
copy test/distributed/org/apache/cassandra/distributed/{LegacyAdapter.java => api/IInstanceConfig.java} (57%)
create mode 100644 test/distributed/org/apache/cassandra/distributed/api/IIsolatedExecutor.java
copy src/java/org/apache/cassandra/db/monitoring/MonitoringState.java => test/distributed/org/apache/cassandra/distributed/api/IListen.java (83%)
copy src/java/org/apache/cassandra/io/FSErrorHandler.java => test/distributed/org/apache/cassandra/distributed/api/IMessage.java (72%)
rename test/distributed/org/apache/cassandra/distributed/{LegacyAdapter.java => api/IMessageFilters.java} (59%)
create mode 100644 test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
rename test/distributed/org/apache/cassandra/distributed/{ => impl}/Coordinator.java (58%)
create mode 100644 test/distributed/org/apache/cassandra/distributed/impl/DelegatingInvokableInstance.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/impl/IInvokableInstance.java
copy src/java/org/apache/cassandra/batchlog/BatchRemoveVerbHandler.java => test/distributed/org/apache/cassandra/distributed/impl/IUpgradeableInstance.java (68%)
rename test/distributed/org/apache/cassandra/distributed/{ => impl}/Instance.java (56%)
create mode 100644 test/distributed/org/apache/cassandra/distributed/impl/InstanceClassLoader.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java
rename test/distributed/org/apache/cassandra/distributed/{ => impl}/InstanceIDDefiner.java (76%)
create mode 100644 test/distributed/org/apache/cassandra/distributed/impl/IsolatedExecutor.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/impl/Listen.java
rename test/distributed/org/apache/cassandra/distributed/{ => impl}/Message.java (64%)
rename test/distributed/org/apache/cassandra/distributed/{ => impl}/MessageFilters.java (78%)
rename test/distributed/org/apache/cassandra/distributed/{ => impl}/RowUtil.java (97%)
create mode 100644 test/distributed/org/apache/cassandra/distributed/impl/Versions.java
rename test/distributed/org/apache/cassandra/distributed/{ => test}/DistributedReadWritePathTest.java (79%)
rename test/distributed/org/apache/cassandra/distributed/{ => test}/DistributedTestBase.java (90%)
create mode 100644 test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTest.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org