[pkgsrc/trunk]: pkgsrc/databases/apache-cassandra2 databases/apache-cassandra...

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/330eb9b48a86
branches:  trunk
changeset: 381488:330eb9b48a86
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Fri Jun 08 09:34:01 2018 +0000

description:
databases/apache-cassandra2: Update to 2.2.12.

2.2.12
======

Upgrading
---------
- See MAXIMUM TTL EXPIRATION DATE NOTICE above.
- Cassandra is now relying on the JVM options to properly shutdown on OutOfMemoryError. By default it will
  rely on the OnOutOfMemoryError option as the ExitOnOutOfMemoryError and CrashOnOutOfMemoryError options
  are not supported by the older 1.7 and 1.8 JVMs. A warning will be logged at startup if none of those JVM
  options are used. See CASSANDRA-13006 for more details.
- Cassandra is not logging anymore by default an Heap histogram on OutOfMemoryError. To enable that behavior
  set the 'cassandra.printHeapHistogramOnOutOfMemoryError' System property to 'true'. See CASSANDRA-13006
  for more details.

2.2.11
======

Upgrading
---------
- Nothing specific to this release, but please see 2.2 if you are upgrading
  from a previous version.

2.2.10
======

Upgrading
---------
- Nothing specific to this release, but please see 2.2 if you are upgrading
  from a previous version.

2.2.9
=====

Upgrading
---------
- Compaction now correctly drops sstables out of CompactionTask when there
  isn't enough disk space to perform the full compaction.  This should reduce
  pending compaction tasks on systems with little remaining disk space.

Deprecation
-----------

Since the security manager added in 3.0 only allows Java and JavaScript
UDFs to be run, UDFs for other languages are deprecated and support for
non-Java and non-JavaScript UDFs is deprecated in 2.2 and has been removed
in version 3.0.11.

2.2.8
=====

Upgrading
---------
- The ReversedType behaviour has been corrected for clustering columns of
  BYTES type containing empty value. Scrub should be run on the existing
  SSTables containing a descending clustering column of BYTES type to correct
  their ordering. See CASSANDRA-12127 for more details.

2.2.7
=====

New features
------------
- JSON timestamps are now in UTC and contain the timezone information, see
  CASSANDRA-11137 for more details.

Upgrading
---------
- Ec2MultiRegionSnitch will no longer automatically set broadcast_rpc_address
  to the public instance IP if this property is defined on cassandra.yaml.


2.2.6
=====

Upgrading
---------
- Nothing specific to this release, but please see 2.2 if you are upgrading
  from a previous version.

2.2.5
=====

Upgrading
---------
- Nothing specific to this release, but please see 2.2 if you are upgrading
  from a previous version.

2.2.4
=====

Deprecation
-----------
- Pig support has been deprecated, and will be removed in 3.0.
  Please see CASSANDRA-10542 for more details.
- Configuration parameter memory_allocator in cassandra.yaml has been deprecated
  and will be removed in 3.0.0. As mentioned below for 2.2.0, jemalloc is
  automatically preloaded on Unix platforms.

Operations
----------
- Switching data center or racks is no longer an allowed operation on a node
  which has data. Instead, the node will need to be decommissioned and
  rebootstrapped. If moving from the SimpleSnitch, make sure that the data
  center and rack containing all current nodes is named "datacenter1" and
  "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
  -Dcassandra.ignore_dc=true.
- Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
- GC logging is now enabled by default (but you can disable it if you want by
  commenting the relevant lines of the cassandra-env file).

Upgrading
---------
- The default for the inter-DC stream throughput setting
  (inter_dc_stream_throughput_outbound_megabits_per_sec in cassandra.yaml) is
  the same than the one for intra-DC one (200Mbps) instead of being unlimited.
  Having it unlimited was never intended and was a bug.

New features
------------
- Time windows in DTCS are now limited to 1 day by default to be able to
  handle bootstrap and repair in a better way. To get the old behaviour,
  increase max_window_size_seconds.
- DTCS option max_sstable_age_days is now deprecated and defaults to 1000 days.
- Native protocol server now allows both SSL and non-SSL connections on
  the same port.

2.2.3
=====

Upgrading
---------
- Nothing specific to this release, but please see 2.2 if you are upgrading
  from a previous version.


2.2.2
=====

Upgrading
---------
- Version 1 and 2 of the native protocol are now deprecated and support
  will be removed in Cassandra 3.0. You are encouraged to upgrade to a
  client driver using version 3 of the native protocol.

Changed Defaults
----------------
- commitlog_total_space_in_mb will use the smaller of 8192, and 1/4
  of the total space of the commitlog volume. (Before: always used
  8192)
- Incremental repair is on by default since 2.2.0, run full repairs by
  providing the '-full' parameter to nodetool repair.
- Parallel repairs are the default since 2.2.0, run sequential repairs
  by providing the '-seq' parameter to nodetool repair.
- The following INFO logs were reduced to DEBUG level and will now show
  on debug.log instead of system.log:
   - Memtable flushing actions
   - Commit log replayed files
   - Compacted sstables
   - SStable opening (SSTableReader)

New features
------------
- Custom QueryHandlers can retrieve the column specifications for the bound
  variables from QueryOptions by using the hasColumnSpecifications()
  and getColumnSpecifications() methods.
- A new default assynchronous log appender debug.log was created in addition
  to  the system.log appender in order to provide more detailed log debugging.
  In order to disable debug logging, you must comment-out the ASYNCDEBUGLOG
  appender on conf/logback.xml. See CASSANDRA-10241 for more information.


2.2.1
=====

Upgrading
---------
 - Nothing specific to this release, but please see 2.2 if you are upgrading
   from a previous version.

New features
------------
- COUNT(*) and COUNT(1) can be selected with other columns or functions


2.2
===

Upgrading
---------
- The authentication & authorization subsystems have been redesigned to
  support role based access control (RBAC), resulting in a change to the
  schema of the system_auth keyspace. See below for more detail.
  For systems already using the internal auth implementations, the process
  for converting existing data during a rolling upgrade is straightforward.
  As each node is restarted, it will attempt to convert any data in the
  legacy tables into the new schema. Until enough nodes to satisfy the
  replication strategy for the system_auth keyspace are upgraded and so have
  the new schema, this conversion will fail with the failure being reported
  in the system log.
  During the upgrade, Cassandra's internal auth classes will continue to use
  the legacy tables, so clients experience no disruption. Issuing DCL
  statements during an upgrade is not supported.
  Once all nodes are upgraded, an operator with superuser privileges should
  drop the legacy tables, system_auth.users, system_auth.credentials and
  system_auth.permissions. Doing so will prompt Cassandra to switch over to
  the new tables without requiring any further intervention.
  While the legacy tables are present a restarted node will re-run the data
  conversion and report the outcome so that operators can verify that it is
  safe to drop them.

New features
------------
- The LIMIT clause applies now only to the number of rows returned to the user,
  not to the number of row queried. By consequence, queries using aggregates will not
  be impacted by the LIMIT clause anymore.
- Very large batches will now be rejected (defaults to 50kb). This
  can be customized by modifying batch_size_fail_threshold_in_kb.
- Selecting columns,scalar functions, UDT fields, writetime or ttl together
  with aggregated is now possible. The value returned for the columns,
  scalar functions, UDT fields, writetime and ttl will be the ones for
  the first row matching the query.
- Windows is now a supported platform. Powershell execution for startup scripts
  is highly recommended and can be enabled via an administrator command-prompt
  with: 'powershell set-executionpolicy unrestricted'
- It is now possible to do major compactions when using leveled compaction.
  Doing that will take all sstables and compact them out in levels. The
  levels will be non overlapping so doing this will still not be something
  you want to do very often since it might cause more compactions for a while.
  It is also possible to split output when doing a major compaction with
  STCS - files will be split in sizes 50%, 25%, 12.5% etc of the total size.
  This might be a bit better than old major compactions which created one big
  file on disk.
- A new tool has been added bin/sstableverify that checks for errors/bitrot
  in all sstables.  Unlike scrub, this is a non-invasive tool.
- Authentication & Authorization APIs have been updated to introduce
  roles. Roles and Permissions granted to them are inherited, supporting
  role based access control. The role concept supercedes that of users
  and CQL constructs such as CREATE USER are deprecated but retained for
  compatibility. The requirement to explicitly create Roles in Cassandra
  even when auth is handled by an external system has been removed, so
  authentication & authorization can be delegated to such systems in their
  entirety.
- In addition to the above, Roles are also first class resources and can be the
  subject of permissions. Users (roles) can now be granted permissions on other
  roles, including CREATE, ALTER, DROP & AUTHORIZE, which removesthe need for
  superuser privileges in order to perform user/role management operations.
- Creators of database resources (Keyspaces, Tables, Roles) are now automatically
  granted all permissions on them (if the IAuthorizer implementation supports
  this).
- SSTable file name is changed. Now you don't have Keyspace/CF name
  in file name. Also, secondary index has its own directory under parent's
  directory.
- Support for user-defined functions and user-defined aggregates have
  been added to CQL.
  ************************************************************************
  IMPORTANT NOTE: user-defined functions can be used to execute
  arbitrary and possibly evil code in Cassandra 2.2, and are
  therefore disabled by default.  To enable UDFs edit
  cassandra.yaml and set enable_user_defined_functions to true.

  CASSANDRA-9402 will add a security manager for UDFs in Cassandra
  3.0.  This will inherently be backwards-incompatible with any 2.2
  UDF that perform insecure operations such as opening a socket or
  writing to the filesystem.

  Per the previous note about adding a security manager in 3.0, this security manager
  means that non JavaScipt UDF's won't run, there for their use is deprecated.
  ************************************************************************
- Row-cache is now fully off-heap.
- jemalloc is now automatically preloaded and used on Linux and OS-X if
  installed.
- Please ensure on Unix platforms that there is no libjnadispath.so
  installed which is accessible by Cassandra. Old versions of
  libjna packages (< 4.0.0) will cause problems - e.g. Debian Wheezy
  contains libjna versin 3.2.x.
- The node now keeps up when streaming is failed during bootstrapping. You can
  use new `nodetool bootstrap resume` command to continue streaming after resolving
  an issue.
- Protocol version 4 specifies that bind variables do not require having a
  value when executing a statement. Bind variables without a value are
  called 'unset'. The 'unset' bind variable is serialized as the int
  value '-2' without following bytes.
  In an EXECUTE or BATCH request an unset bind value does not modify the value and
  does not create a tombstone, an unset bind ttl is treated as 'unlimited',
  an unset bind timestamp is treated as 'now', an unset bind counter operation
  does not change the counter value.
  Unset tuple field, UDT field and map key are not allowed.
  In a QUERY request an unset limit is treated as 'unlimited'.
  Unset WHERE clauses with unset partition column, clustering column
  or index column are not allowed.
- New `ByteType` (cql tinyint). 1-byte signed integer
- New `ShortType` (cql smallint). 2-byte signed integer
- New `SimpleDateType` (cql date). 4-byte unsigned integer
- New `TimeType` (cql time). 8-byte long
- The toDate(timeuuid), toTimestamp(timeuuid) and toUnixTimestamp(timeuuid) functions have been added to allow
  to convert from timeuuid into date type, timestamp type and bigint raw value.
  The functions unixTimestampOf(timeuuid) and dateOf(timeuuid) have been deprecated.
- The toDate(timestamp) and toUnixTimestamp(timestamp) functions have been added to allow
  to convert from timestamp into date type and bigint raw value.
- The toTimestamp(date) and toUnixTimestamp(date) functions have been added to allow
  to convert from date into timestamp type and bigint raw value.
- SizeTieredCompactionStrategy parameter cold_reads_to_omit has been removed.
- The default JVM flag -XX:+PerfDisableSharedMem will cause the following tools JVM
  to stop working: jps, jstack, jinfo, jmc, jcmd as well as 3rd party tools like Jolokia.
  If you wish to use these tools you can comment this flag out in cassandra-env.{sh,ps1}

Upgrading
---------
- Thrift rpc is no longer being started by default.
  Set `start_rpc` parameter to `true` to enable it.
- Pig's CqlStorage has been removed, use CqlNativeStorage instead
- Pig's CassandraStorage has been deprecated. CassandraStorage
  should only be used against tables created via thrift.
  Use CqlNativeStorage for all other tables.
- IAuthenticator been updated to remove responsibility for user/role
  maintenance and is now solely responsible for validating credentials,
  This is primarily done via SASL, though an optional method exists for
  systems which need support for the Thrift login() method.
- IRoleManager interface has been added which takes over the maintenance
  functions from IAuthenticator. IAuthorizer is mainly unchanged. Auth data
  in systems using the stock internal implementations PasswordAuthenticator
  & CassandraAuthorizer will be automatically converted during upgrade,
  with minimal operator intervention required. Custom implementations will
  require modification, though these can be used in conjunction with the
  stock CassandraRoleManager so providing an IRoleManager implementation
  should not usually be necessary.
- Fat client support has been removed since we have push notifications to clients
- cassandra-cli has been removed. Please use cqlsh instead.
- YamlFileNetworkTopologySnitch has been removed; switch to
  GossipingPropertyFileSnitch instead.
- CQL2 has been removed entirely in this release (previously deprecated
  in 2.0.0). Please switch to CQL3 if you haven't already done so.
- The results of CQL3 queries containing an IN restriction will be ordered

diffstat:

 databases/apache-cassandra2/Makefile |    12 +-
 databases/apache-cassandra2/PLIST    |  1326 ++++++++++++++++++++-------------
 databases/apache-cassandra2/distinfo |    10 +-
 3 files changed, 817 insertions(+), 531 deletions(-)

diffs (truncated from 2752 to 300 lines):

diff -r 6659714ec899 -r 330eb9b48a86 databases/apache-cassandra2/Makefile
--- a/databases/apache-cassandra2/Makefile      Fri Jun 08 07:51:33 2018 +0000
+++ b/databases/apache-cassandra2/Makefile      Fri Jun 08 09:34:01 2018 +0000
@@ -1,20 +1,22 @@
-# $NetBSD: Makefile,v 1.2 2017/01/09 22:13:19 fhajny Exp $
+# $NetBSD: Makefile,v 1.3 2018/06/08 09:34:01 fhajny Exp $
 #
 
-CASSANDRA_VER= 2.1.16
+CASSANDRA_VER= 2.2.12
 
 MASTER_SITES=  ${MASTER_SITE_APACHE:=cassandra/${CASSANDRA_VER:C/-.*//}/}
 
 DEPENDS+=      snappy-java10>=1.0.5:../../devel/snappy-java10
 
-BINFILES=      cassandra cassandra-cli cassandra.in.sh cqlsh debug-cql         \
+USE_JAVA2=     6
+
+BINFILES=      cassandra cassandra.in.sh cqlsh cqlsh.py debug-cql              \
                nodetool sstablekeys sstableloader sstablescrub sstableupgrade  \
-               stop-server
+               sstableverify stop-server
 DOCFILES=      CHANGES LICENSE NEWS NOTICE
 EGFILES=       cassandra-env.sh cassandra-rackdc.properties                    \
                cassandra-topology.properties cassandra.yaml                    \
                commitlog_archiving.properties cqlshrc.sample                   \
-               logback-tools.xml logback.xml cassandra-topology.yaml           \
+               hotspot_compiler logback-tools.xml logback.xml                  \
                metrics-reporter-config-sample.yaml
 
 .include "../../databases/apache-cassandra/Makefile.common"
diff -r 6659714ec899 -r 330eb9b48a86 databases/apache-cassandra2/PLIST
--- a/databases/apache-cassandra2/PLIST Fri Jun 08 07:51:33 2018 +0000
+++ b/databases/apache-cassandra2/PLIST Fri Jun 08 09:34:01 2018 +0000
@@ -1,14 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2017/01/09 22:13:19 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/06/08 09:34:01 fhajny Exp $
 share/cassandra/bin/cassandra
-share/cassandra/bin/cassandra-cli
 share/cassandra/bin/cassandra.in.sh
 share/cassandra/bin/cqlsh
+share/cassandra/bin/cqlsh.py
 share/cassandra/bin/debug-cql
 share/cassandra/bin/nodetool
 share/cassandra/bin/sstablekeys
 share/cassandra/bin/sstableloader
 share/cassandra/bin/sstablescrub
 share/cassandra/bin/sstableupgrade
+share/cassandra/bin/sstableverify
 share/cassandra/bin/stop-server
 share/cassandra/interface/cassandra.thrift
 share/cassandra/javadoc/allclasses-frame.html
@@ -21,49 +22,59 @@
 share/cassandra/javadoc/org/apache/cassandra/auth/AllowAllAuthenticator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/AllowAllAuthorizer.html
 share/cassandra/javadoc/org/apache/cassandra/auth/AllowAllInternodeAuthenticator.html
-share/cassandra/javadoc/org/apache/cassandra/auth/Auth.AuthMigrationListener.html
-share/cassandra/javadoc/org/apache/cassandra/auth/Auth.html
+share/cassandra/javadoc/org/apache/cassandra/auth/AuthKeyspace.html
+share/cassandra/javadoc/org/apache/cassandra/auth/AuthMigrationListener.html
 share/cassandra/javadoc/org/apache/cassandra/auth/AuthenticatedUser.html
 share/cassandra/javadoc/org/apache/cassandra/auth/CassandraAuthorizer.html
+share/cassandra/javadoc/org/apache/cassandra/auth/CassandraRoleManager.html
 share/cassandra/javadoc/org/apache/cassandra/auth/DataResource.html
-share/cassandra/javadoc/org/apache/cassandra/auth/IAuthenticator.Option.html
+share/cassandra/javadoc/org/apache/cassandra/auth/FunctionResource.html
+share/cassandra/javadoc/org/apache/cassandra/auth/IAuthenticator.SaslNegotiator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/IAuthenticator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/IAuthorizer.html
 share/cassandra/javadoc/org/apache/cassandra/auth/IInternodeAuthenticator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/IResource.html
-share/cassandra/javadoc/org/apache/cassandra/auth/ISaslAwareAuthenticator.SaslAuthenticator.html
-share/cassandra/javadoc/org/apache/cassandra/auth/ISaslAwareAuthenticator.html
-share/cassandra/javadoc/org/apache/cassandra/auth/LegacyAuthenticator.html
-share/cassandra/javadoc/org/apache/cassandra/auth/LegacyAuthorizer.html
+share/cassandra/javadoc/org/apache/cassandra/auth/IRoleManager.Option.html
+share/cassandra/javadoc/org/apache/cassandra/auth/IRoleManager.html
 share/cassandra/javadoc/org/apache/cassandra/auth/PasswordAuthenticator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/Permission.html
 share/cassandra/javadoc/org/apache/cassandra/auth/PermissionDetails.html
 share/cassandra/javadoc/org/apache/cassandra/auth/PermissionsCache.html
 share/cassandra/javadoc/org/apache/cassandra/auth/PermissionsCacheMBean.html
 share/cassandra/javadoc/org/apache/cassandra/auth/Resources.html
+share/cassandra/javadoc/org/apache/cassandra/auth/RoleOptions.html
+share/cassandra/javadoc/org/apache/cassandra/auth/RoleResource.html
+share/cassandra/javadoc/org/apache/cassandra/auth/Roles.html
+share/cassandra/javadoc/org/apache/cassandra/auth/RolesCache.html
+share/cassandra/javadoc/org/apache/cassandra/auth/RolesCacheMBean.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/AllowAllAuthenticator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/AllowAllAuthorizer.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/AllowAllInternodeAuthenticator.html
-share/cassandra/javadoc/org/apache/cassandra/auth/class-use/Auth.AuthMigrationListener.html
-share/cassandra/javadoc/org/apache/cassandra/auth/class-use/Auth.html
+share/cassandra/javadoc/org/apache/cassandra/auth/class-use/AuthKeyspace.html
+share/cassandra/javadoc/org/apache/cassandra/auth/class-use/AuthMigrationListener.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/AuthenticatedUser.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/CassandraAuthorizer.html
+share/cassandra/javadoc/org/apache/cassandra/auth/class-use/CassandraRoleManager.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/DataResource.html
-share/cassandra/javadoc/org/apache/cassandra/auth/class-use/IAuthenticator.Option.html
+share/cassandra/javadoc/org/apache/cassandra/auth/class-use/FunctionResource.html
+share/cassandra/javadoc/org/apache/cassandra/auth/class-use/IAuthenticator.SaslNegotiator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/IAuthenticator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/IAuthorizer.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/IInternodeAuthenticator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/IResource.html
-share/cassandra/javadoc/org/apache/cassandra/auth/class-use/ISaslAwareAuthenticator.SaslAuthenticator.html
-share/cassandra/javadoc/org/apache/cassandra/auth/class-use/ISaslAwareAuthenticator.html
-share/cassandra/javadoc/org/apache/cassandra/auth/class-use/LegacyAuthenticator.html
-share/cassandra/javadoc/org/apache/cassandra/auth/class-use/LegacyAuthorizer.html
+share/cassandra/javadoc/org/apache/cassandra/auth/class-use/IRoleManager.Option.html
+share/cassandra/javadoc/org/apache/cassandra/auth/class-use/IRoleManager.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/PasswordAuthenticator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/Permission.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/PermissionDetails.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/PermissionsCache.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/PermissionsCacheMBean.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/Resources.html
+share/cassandra/javadoc/org/apache/cassandra/auth/class-use/RoleOptions.html
+share/cassandra/javadoc/org/apache/cassandra/auth/class-use/RoleResource.html
+share/cassandra/javadoc/org/apache/cassandra/auth/class-use/Roles.html
+share/cassandra/javadoc/org/apache/cassandra/auth/class-use/RolesCache.html
+share/cassandra/javadoc/org/apache/cassandra/auth/class-use/RolesCacheMBean.html
 share/cassandra/javadoc/org/apache/cassandra/auth/package-frame.html
 share/cassandra/javadoc/org/apache/cassandra/auth/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/auth/package-tree.html
@@ -73,6 +84,7 @@
 share/cassandra/javadoc/org/apache/cassandra/cache/AutoSavingCache.Writer.html
 share/cassandra/javadoc/org/apache/cassandra/cache/AutoSavingCache.html
 share/cassandra/javadoc/org/apache/cassandra/cache/CacheKey.html
+share/cassandra/javadoc/org/apache/cassandra/cache/CacheProvider.html
 share/cassandra/javadoc/org/apache/cassandra/cache/CachingOptions.KeyCache.Type.html
 share/cassandra/javadoc/org/apache/cassandra/cache/CachingOptions.KeyCache.html
 share/cassandra/javadoc/org/apache/cassandra/cache/CachingOptions.RowCache.Type.html
@@ -85,6 +97,8 @@
 share/cassandra/javadoc/org/apache/cassandra/cache/IRowCacheEntry.html
 share/cassandra/javadoc/org/apache/cassandra/cache/InstrumentingCache.html
 share/cassandra/javadoc/org/apache/cassandra/cache/KeyCacheKey.html
+share/cassandra/javadoc/org/apache/cassandra/cache/NopCacheProvider.html
+share/cassandra/javadoc/org/apache/cassandra/cache/OHCProvider.html
 share/cassandra/javadoc/org/apache/cassandra/cache/RefCountedMemory.html
 share/cassandra/javadoc/org/apache/cassandra/cache/RowCacheKey.html
 share/cassandra/javadoc/org/apache/cassandra/cache/RowCacheSentinel.html
@@ -95,6 +109,7 @@
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/AutoSavingCache.Writer.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/AutoSavingCache.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/CacheKey.html
+share/cassandra/javadoc/org/apache/cassandra/cache/class-use/CacheProvider.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/CachingOptions.KeyCache.Type.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/CachingOptions.KeyCache.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/CachingOptions.RowCache.Type.html
@@ -107,6 +122,8 @@
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/IRowCacheEntry.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/InstrumentingCache.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/KeyCacheKey.html
+share/cassandra/javadoc/org/apache/cassandra/cache/class-use/NopCacheProvider.html
+share/cassandra/javadoc/org/apache/cassandra/cache/class-use/OHCProvider.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/RefCountedMemory.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/RowCacheKey.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/RowCacheSentinel.html
@@ -116,76 +133,44 @@
 share/cassandra/javadoc/org/apache/cassandra/cache/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/cache/package-tree.html
 share/cassandra/javadoc/org/apache/cassandra/cache/package-use.html
-share/cassandra/javadoc/org/apache/cassandra/cli/CliClient.ColumnFamilyArgument.html
-share/cassandra/javadoc/org/apache/cassandra/cli/CliClient.Function.html
-share/cassandra/javadoc/org/apache/cassandra/cli/CliClient.html
-share/cassandra/javadoc/org/apache/cassandra/cli/CliCommandHelp.html
-share/cassandra/javadoc/org/apache/cassandra/cli/CliCompiler.ANTLRNoCaseStringStream.html
-share/cassandra/javadoc/org/apache/cassandra/cli/CliCompiler.html
-share/cassandra/javadoc/org/apache/cassandra/cli/CliCompleter.html
-share/cassandra/javadoc/org/apache/cassandra/cli/CliMain.html
-share/cassandra/javadoc/org/apache/cassandra/cli/CliOptions.html
-share/cassandra/javadoc/org/apache/cassandra/cli/CliSessionState.html
-share/cassandra/javadoc/org/apache/cassandra/cli/CliUserHelp.html
-share/cassandra/javadoc/org/apache/cassandra/cli/CliUtils.html
-share/cassandra/javadoc/org/apache/cassandra/cli/class-use/CliClient.ColumnFamilyArgument.html
-share/cassandra/javadoc/org/apache/cassandra/cli/class-use/CliClient.Function.html
-share/cassandra/javadoc/org/apache/cassandra/cli/class-use/CliClient.html
-share/cassandra/javadoc/org/apache/cassandra/cli/class-use/CliCommandHelp.html
-share/cassandra/javadoc/org/apache/cassandra/cli/class-use/CliCompiler.ANTLRNoCaseStringStream.html
-share/cassandra/javadoc/org/apache/cassandra/cli/class-use/CliCompiler.html
-share/cassandra/javadoc/org/apache/cassandra/cli/class-use/CliCompleter.html
-share/cassandra/javadoc/org/apache/cassandra/cli/class-use/CliMain.html
-share/cassandra/javadoc/org/apache/cassandra/cli/class-use/CliOptions.html
-share/cassandra/javadoc/org/apache/cassandra/cli/class-use/CliSessionState.html
-share/cassandra/javadoc/org/apache/cassandra/cli/class-use/CliUserHelp.html
-share/cassandra/javadoc/org/apache/cassandra/cli/class-use/CliUtils.html
-share/cassandra/javadoc/org/apache/cassandra/cli/package-frame.html
-share/cassandra/javadoc/org/apache/cassandra/cli/package-summary.html
-share/cassandra/javadoc/org/apache/cassandra/cli/package-tree.html
-share/cassandra/javadoc/org/apache/cassandra/cli/package-use.html
 share/cassandra/javadoc/org/apache/cassandra/client/RingCache.html
 share/cassandra/javadoc/org/apache/cassandra/client/class-use/RingCache.html
 share/cassandra/javadoc/org/apache/cassandra/client/package-frame.html
 share/cassandra/javadoc/org/apache/cassandra/client/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/client/package-tree.html
 share/cassandra/javadoc/org/apache/cassandra/client/package-use.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.html
+share/cassandra/javadoc/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/IExecutorMBean.html
+share/cassandra/javadoc/org/apache/cassandra/concurrent/ExecutorLocal.html
+share/cassandra/javadoc/org/apache/cassandra/concurrent/ExecutorLocals.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/JMXConfigurableThreadPoolExecutor.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/JMXConfigurableThreadPoolExecutorMBean.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/JMXEnabledSharedExecutorPool.JMXEnabledSEPExecutor.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/JMXEnabledSharedExecutorPool.JMXEnabledSEPExecutorMBean.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/JMXEnabledSharedExecutorPool.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutor.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutorMBean.html
+share/cassandra/javadoc/org/apache/cassandra/concurrent/LocalAwareExecutorService.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/NamedThreadFactory.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/SEPExecutor.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/ScheduledExecutors.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/SharedExecutorPool.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/Stage.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/StageManager.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/TracingAwareExecutorService.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/AbstractTracingAwareExecutorService.html
+share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/AbstractLocalAwareExecutorService.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/DebuggableScheduledThreadPoolExecutor.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/DebuggableThreadPoolExecutor.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/IExecutorMBean.html
+share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/ExecutorLocal.html
+share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/ExecutorLocals.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/JMXConfigurableThreadPoolExecutor.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/JMXConfigurableThreadPoolExecutorMBean.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/JMXEnabledSharedExecutorPool.JMXEnabledSEPExecutor.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/JMXEnabledSharedExecutorPool.JMXEnabledSEPExecutorMBean.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/JMXEnabledSharedExecutorPool.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/JMXEnabledThreadPoolExecutor.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/JMXEnabledThreadPoolExecutorMBean.html
+share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/LocalAwareExecutorService.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/NamedThreadFactory.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/SEPExecutor.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/ScheduledExecutors.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/SharedExecutorPool.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/Stage.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/StageManager.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/TracingAwareExecutorService.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/package-frame.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/package-tree.html
@@ -211,10 +196,10 @@
 share/cassandra/javadoc/org/apache/cassandra/config/EncryptionOptions.html
 share/cassandra/javadoc/org/apache/cassandra/config/IndexType.html
 share/cassandra/javadoc/org/apache/cassandra/config/KSMetaData.html
+share/cassandra/javadoc/org/apache/cassandra/config/ParameterizedClass.html
 share/cassandra/javadoc/org/apache/cassandra/config/ReadRepairDecision.html
 share/cassandra/javadoc/org/apache/cassandra/config/RequestSchedulerOptions.html
 share/cassandra/javadoc/org/apache/cassandra/config/Schema.html
-share/cassandra/javadoc/org/apache/cassandra/config/SeedProviderDef.html
 share/cassandra/javadoc/org/apache/cassandra/config/TriggerDefinition.html
 share/cassandra/javadoc/org/apache/cassandra/config/UTMetaData.html
 share/cassandra/javadoc/org/apache/cassandra/config/YamlConfigurationLoader.html
@@ -239,10 +224,10 @@
 share/cassandra/javadoc/org/apache/cassandra/config/class-use/EncryptionOptions.html
 share/cassandra/javadoc/org/apache/cassandra/config/class-use/IndexType.html
 share/cassandra/javadoc/org/apache/cassandra/config/class-use/KSMetaData.html
+share/cassandra/javadoc/org/apache/cassandra/config/class-use/ParameterizedClass.html
 share/cassandra/javadoc/org/apache/cassandra/config/class-use/ReadRepairDecision.html
 share/cassandra/javadoc/org/apache/cassandra/config/class-use/RequestSchedulerOptions.html
 share/cassandra/javadoc/org/apache/cassandra/config/class-use/Schema.html
-share/cassandra/javadoc/org/apache/cassandra/config/class-use/SeedProviderDef.html
 share/cassandra/javadoc/org/apache/cassandra/config/class-use/TriggerDefinition.html
 share/cassandra/javadoc/org/apache/cassandra/config/class-use/UTMetaData.html
 share/cassandra/javadoc/org/apache/cassandra/config/class-use/YamlConfigurationLoader.html
@@ -250,70 +235,12 @@
 share/cassandra/javadoc/org/apache/cassandra/config/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/config/package-tree.html
 share/cassandra/javadoc/org/apache/cassandra/config/package-use.html
-share/cassandra/javadoc/org/apache/cassandra/cql/AbstractModification.html
-share/cassandra/javadoc/org/apache/cassandra/cql/AlterTableStatement.OperationType.html
-share/cassandra/javadoc/org/apache/cassandra/cql/AlterTableStatement.html
-share/cassandra/javadoc/org/apache/cassandra/cql/Attributes.html
-share/cassandra/javadoc/org/apache/cassandra/cql/BatchStatement.html
-share/cassandra/javadoc/org/apache/cassandra/cql/CFPropDefs.html
-share/cassandra/javadoc/org/apache/cassandra/cql/CQLStatement.html
-share/cassandra/javadoc/org/apache/cassandra/cql/CreateColumnFamilyStatement.html
-share/cassandra/javadoc/org/apache/cassandra/cql/CreateIndexStatement.html
-share/cassandra/javadoc/org/apache/cassandra/cql/CreateKeyspaceStatement.html
-share/cassandra/javadoc/org/apache/cassandra/cql/DeleteStatement.html
-share/cassandra/javadoc/org/apache/cassandra/cql/DropIndexStatement.html
-share/cassandra/javadoc/org/apache/cassandra/cql/Operation.OperationType.html
-share/cassandra/javadoc/org/apache/cassandra/cql/Operation.html
-share/cassandra/javadoc/org/apache/cassandra/cql/QueryProcessor.html
-share/cassandra/javadoc/org/apache/cassandra/cql/Relation.html
-share/cassandra/javadoc/org/apache/cassandra/cql/SelectExpression.html
-share/cassandra/javadoc/org/apache/cassandra/cql/SelectStatement.html
-share/cassandra/javadoc/org/apache/cassandra/cql/StatementType.html
-share/cassandra/javadoc/org/apache/cassandra/cql/Term.html
-share/cassandra/javadoc/org/apache/cassandra/cql/UpdateStatement.html
-share/cassandra/javadoc/org/apache/cassandra/cql/WhereClause.html
-share/cassandra/javadoc/org/apache/cassandra/cql/class-use/AbstractModification.html
-share/cassandra/javadoc/org/apache/cassandra/cql/class-use/AlterTableStatement.OperationType.html
-share/cassandra/javadoc/org/apache/cassandra/cql/class-use/AlterTableStatement.html
-share/cassandra/javadoc/org/apache/cassandra/cql/class-use/Attributes.html
-share/cassandra/javadoc/org/apache/cassandra/cql/class-use/BatchStatement.html