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:54:01 UTC

[cassandra] branch trunk updated (5ec6842 -> 2209115)

This is an automated email from the ASF dual-hosted git repository.

benedict pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 5ec6842  Docs: Clarify PartitionSize table metric documentation
     new c100f1a  Multi-version in-JVM dtests
     new aa2a5c6  Merge branch 'cassandra-2.2' into cassandra-3.0
     new a6059f1  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 2209115  Merge branch 'cassandra-3.11' into trunk

The 24480 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:
 .circleci/config.yml                               |   2 +-
 CHANGES.txt                                        |   5 -
 build.xml                                          |  11 +-
 doc/source/operating/metrics.rst                   |   6 +-
 .../org/apache/cassandra/audit/AuditEvent.java     |   2 +-
 .../org/apache/cassandra/audit/AuditLogFilter.java |   3 -
 .../apache/cassandra/audit/AuditLogManager.java    |  21 --
 src/java/org/apache/cassandra/auth/AuthCache.java  |   6 +-
 src/java/org/apache/cassandra/auth/Role.java       |   4 +-
 src/java/org/apache/cassandra/auth/Roles.java      |   4 +-
 .../AbstractLocalAwareExecutorService.java         |  10 +-
 .../cassandra/concurrent/InfiniteLoopExecutor.java |   3 +-
 .../cassandra/concurrent/NamedThreadFactory.java   |   6 +-
 src/java/org/apache/cassandra/config/Config.java   |  16 +-
 .../cassandra/config/DatabaseDescriptor.java       |   3 +
 src/java/org/apache/cassandra/cql3/Terms.java      |   2 +-
 .../apache/cassandra/cql3/functions/TimeFcts.java  |   4 +-
 .../apache/cassandra/cql3/selection/Selector.java  |   1 +
 .../statements/schema/AlterTableStatement.java     |   2 +-
 .../cassandra/db/ColumnFamilyStoreMBean.java       |   1 +
 src/java/org/apache/cassandra/db/LivenessInfo.java |   4 +-
 .../cassandra/db/compaction/ActiveCompactions.java |   2 +-
 .../cassandra/db/compaction/CompactionManager.java |   1 +
 .../db/compaction/CompactionStrategyManager.java   |  16 +-
 .../org/apache/cassandra/db/filter/DataLimits.java |   2 +-
 .../org/apache/cassandra/db/rows/BTreeRow.java     |   2 +-
 .../org/apache/cassandra/db/rows/ColumnData.java   |   2 +-
 src/java/org/apache/cassandra/db/rows/Row.java     |   2 +-
 .../db/rows/ThrottledUnfilteredIterator.java       |   4 +-
 .../org/apache/cassandra/db/rows/Unfiltered.java   |   2 +-
 .../cassandra/dht/RangeFetchMapCalculator.java     |   6 +-
 .../org/apache/cassandra/diag/DiagnosticEvent.java |   2 -
 .../diag/LastEventIdBroadcasterMBean.java          |   3 +-
 .../cassandra/hadoop/cql3/CqlBulkOutputFormat.java |   7 +-
 .../cassandra/hadoop/cql3/CqlOutputFormat.java     |   3 +-
 .../cassandra/index/SecondaryIndexManager.java     |   2 +-
 .../sasi/analyzer/StandardTokenizerInterface.java  |   2 +-
 .../cassandra/io/sstable/format/SSTableReader.java |   4 +-
 .../cassandra/locator/AbstractEndpointSnitch.java  |   4 +-
 .../apache/cassandra/locator/IEndpointSnitch.java  |   2 +-
 .../apache/cassandra/locator/TokenMetadata.java    |   6 +-
 .../apache/cassandra/metrics/KeyspaceMetrics.java  |   2 +-
 src/java/org/apache/cassandra/net/MessageOut.java  |   2 +-
 .../org/apache/cassandra/net/MessagingService.java |   2 +-
 .../apache/cassandra/net/async/NettyFactory.java   |   4 +-
 .../repair/consistent/ConsistentSession.java       |  42 +--
 .../cassandra/repair/consistent/LocalSessions.java |   2 +-
 src/java/org/apache/cassandra/schema/Schema.java   |   2 +-
 .../service/EmbeddedCassandraService.java          |   1 +
 .../cassandra/service/StorageServiceMBean.java     |   2 +-
 src/java/org/apache/cassandra/tools/NodeProbe.java |   3 +-
 .../transport/frame/FrameBodyTransformer.java      |   2 +-
 .../cassandra/utils/CoalescingStrategies.java      |   2 +-
 .../org/apache/cassandra/utils/FBUtilities.java    |   9 +
 .../org/apache/cassandra/utils/btree/BTree.java    |   4 +-
 .../StreamingTombstoneHistogramBuilder.java        |   7 +-
 test/conf/cassandra-murmur.yaml                    |   2 +-
 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  | 311 ----------------
 .../cassandra/distributed/UpgradeableCluster.java  |  70 ++++
 .../apache/cassandra/distributed/api/ICluster.java |  18 +-
 .../cassandra/distributed/api/ICoordinator.java    |  37 +-
 .../cassandra/distributed/api/IInstance.java       |  42 +--
 .../cassandra/distributed/api/IInstanceConfig.java |  28 +-
 .../distributed/api/IIsolatedExecutor.java         | 127 +++++++
 .../apache/cassandra/distributed/api/IListen.java  |   9 +-
 .../apache/cassandra/distributed/api/IMessage.java |  17 +-
 .../cassandra/distributed/api/IMessageFilters.java |  36 +-
 .../distributed/impl/AbstractCluster.java          | 406 +++++++++++++++++++++
 .../distributed/{ => impl}/Coordinator.java        |  67 ++--
 .../impl/DelegatingInvokableInstance.java          | 196 ++++++++++
 .../distributed/impl/IInvokableInstance.java       |  68 ++++
 .../distributed/impl/IUpgradeableInstance.java     |  18 +-
 .../cassandra/distributed/{ => impl}/Instance.java | 325 +++++++++--------
 .../distributed/impl/InstanceClassLoader.java      | 103 ++++++
 .../cassandra/distributed/impl/InstanceConfig.java | 236 ++++++++++++
 .../distributed/{ => impl}/InstanceIDDefiner.java  |  15 +-
 .../distributed/impl/IsolatedExecutor.java         | 165 +++++++++
 .../apache/cassandra/distributed/impl/Listen.java  |  24 +-
 .../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   |  38 +-
 .../{ => test}/DistributedTestBase.java            |  12 +-
 .../cassandra/distributed/upgrade/UpgradeTest.java |  53 +++
 .../distributed/upgrade/UpgradeTestBase.java       | 156 ++++++++
 .../apache/cassandra/LogbackStatusListener.java    |   2 +-
 .../config/DatabaseDescriptorRefTest.java          |  30 +-
 .../unit/org/apache/cassandra/cql3/PagingTest.java |   7 +-
 .../compaction/CompactionStrategyManagerTest.java  |   3 +-
 95 files changed, 2400 insertions(+), 1234 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/repair/asymmetric/PreferedNodeFilter.java => test/distributed/org/apache/cassandra/distributed/api/ICluster.java (76%)
 copy src/java/org/apache/cassandra/utils/WrappedInt.java => test/distributed/org/apache/cassandra/distributed/api/ICoordinator.java (64%)
 copy src/java/org/apache/cassandra/net/ForwardToContainer.java => test/distributed/org/apache/cassandra/distributed/api/IInstance.java (53%)
 copy src/java/org/apache/cassandra/gms/IFailureDetectionEventListener.java => test/distributed/org/apache/cassandra/distributed/api/IInstanceConfig.java (58%)
 create mode 100644 test/distributed/org/apache/cassandra/distributed/api/IIsolatedExecutor.java
 copy src/java/org/apache/cassandra/io/util/CheckedFunction.java => test/distributed/org/apache/cassandra/distributed/api/IListen.java (83%)
 copy src/java/org/apache/cassandra/repair/asymmetric/PreferedNodeFilter.java => test/distributed/org/apache/cassandra/distributed/api/IMessage.java (76%)
 copy src/java/org/apache/cassandra/tools/nodetool/HostStatWithPort.java => test/distributed/org/apache/cassandra/distributed/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 (59%)
 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/db/BlacklistedDirectoriesMBean.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
 copy src/java/org/apache/cassandra/audit/DiagnosticEventAuditLogger.java => test/distributed/org/apache/cassandra/distributed/impl/Listen.java (57%)
 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 (80%)
 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