Merge branch 'cassandra-3.11' into trunk

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76c1b555
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76c1b555
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76c1b555

Branch: refs/heads/trunk
Commit: 76c1b555708fd91e126e9d86920e81793b599d16
Parents: 07b0aca 65a4682
Author: Aleksey Yeshchenko <alek...@apple.com>
Authored: Thu Aug 16 15:45:53 2018 +0100
Committer: Aleksey Yeshchenko <alek...@apple.com>
Committed: Thu Aug 16 15:47:09 2018 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 NEWS.txt                                        | 10 +++
 doc/cql3/CQL.textile                            |  2 +-
 src/java/org/apache/cassandra/db/Columns.java   | 22 +++++--
 .../org/apache/cassandra/db/ColumnsTest.java    | 69 +++++++++++++++++++-
 5 files changed, 96 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/76c1b555/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 67e85f6,6464667..4cd4cc5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,282 -1,7 +1,284 @@@
 +4.0
 + * Allocate ReentrantLock on-demand in java11 AtomicBTreePartitionerBase 
(CASSANDRA-14637)
 + * Make all existing virtual tables use LocalPartitioner (CASSANDRA-14640)
 + * Revert 4.0 GC alg back to CMS (CASANDRA-14636)
 + * Remove hardcoded java11 jvm args in idea workspace files (CASSANDRA-14627)
 + * Update netty to 4.1.128 (CASSANDRA-14633)
 + * Add a virtual table to expose thread pools (CASSANDRA-14523)
 + * Add a virtual table to expose caches (CASSANDRA-14538)
 + * Fix toDate function for timestamp arguments (CASSANDRA-14502)
 + * Revert running dtests by default in circleci (CASSANDRA-14614)
 + * Stream entire SSTables when possible (CASSANDRA-14556)
 + * Add experimental support for Java 11 (CASSANDRA-9608)
 + * Make PeriodicCommitLogService.blockWhenSyncLagsNanos configurable 
(CASSANDRA-14580)
 + * Improve logging in MessageInHandler's constructor (CASSANDRA-14576)
 + * Set broadcast address in internode messaging handshake (CASSANDRA-14579)
 + * Wait for schema agreement prior to building MVs (CASSANDRA-14571)
 + * Make all DDL statements idempotent and not dependent on global state 
(CASSANDRA-13426)
 + * Bump the hints messaging version to match the current one (CASSANDRA-14536)
 + * OffsetAwareConfigurationLoader doesn't set ssl storage port causing bind 
errors in CircleCI (CASSANDRA-14546)
 + * Report why native_transport_port fails to bind (CASSANDRA-14544)
 + * Optimize internode messaging protocol (CASSANDRA-14485)
 + * Internode messaging handshake sends wrong messaging version number 
(CASSANDRA-14540)
 + * Add a virtual table to expose active client connections (CASSANDRA-14458)
 + * Clean up and refactor client metrics (CASSANDRA-14524)
 + * Nodetool import row cache invalidation races with adding sstables to 
tracker (CASSANDRA-14529)
 + * Fix assertions in LWTs after TableMetadata was made immutable 
(CASSANDRA-14356)
 + * Abort compactions quicker (CASSANDRA-14397)
 + * Support light-weight transactions in cassandra-stress (CASSANDRA-13529)
 + * Make AsyncOneResponse use the correct timeout (CASSANDRA-14509)
 + * Add option to sanity check tombstones on reads/compactions 
(CASSANDRA-14467)
 + * Add a virtual table to expose all running sstable tasks (CASSANDRA-14457)
 + * Let nodetool import take a list of directories (CASSANDRA-14442)
 + * Avoid unneeded memory allocations / cpu for disabled log levels 
(CASSANDRA-14488)
 + * Implement virtual keyspace interface (CASSANDRA-7622)
 + * nodetool import cleanup and improvements (CASSANDRA-14417)
 + * Bump jackson version to >= 2.9.5 (CASSANDRA-14427)
 + * Allow nodetool toppartitions without specifying table (CASSANDRA-14360)
 + * Audit logging for database activity (CASSANDRA-12151)
 + * Clean up build artifacts in docs container (CASSANDRA-14432)
 + * Minor network authz improvements (Cassandra-14413)
 + * Automatic sstable upgrades (CASSANDRA-14197)
 + * Replace deprecated junit.framework.Assert usages with org.junit.Assert 
(CASSANDRA-14431)
 + * Cassandra-stress throws NPE if insert section isn't specified in user 
profile (CASSSANDRA-14426)
 + * List clients by protocol versions `nodetool clientstats --by-protocol` 
(CASSANDRA-14335)
 + * Improve LatencyMetrics performance by reducing write path processing 
(CASSANDRA-14281)
 + * Add network authz (CASSANDRA-13985)
 + * Use the correct IP/Port for Streaming when localAddress is left unbound 
(CASSANDRA-14389)
 + * nodetool listsnapshots is missing local system keyspace snapshots 
(CASSANDRA-14381)
 + * Remove StreamCoordinator.streamExecutor thread pool (CASSANDRA-14402)
 + * Rename nodetool --with-port to --print-port to disambiguate from --port 
(CASSANDRA-14392)
 + * Client TOPOLOGY_CHANGE messages have wrong port. (CASSANDRA-14398)
 + * Add ability to load new SSTables from a separate directory (CASSANDRA-6719)
 + * Eliminate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Bind to correct local address in 4.0 streaming (CASSANDRA-14362)
 + * Use standard Amazon naming for datacenter and rack in Ec2Snitch 
(CASSANDRA-7839)
 + * Fix junit failure for SSTableReaderTest (CASSANDRA-14387)
 + * Abstract write path for pluggable storage (CASSANDRA-14118)
 + * nodetool describecluster should be more informative (CASSANDRA-13853)
 + * Compaction performance improvements (CASSANDRA-14261) 
 + * Refactor Pair usage to avoid boxing ints/longs (CASSANDRA-14260)
 + * Add options to nodetool tablestats to sort and limit output 
(CASSANDRA-13889)
 + * Rename internals to reflect CQL vocabulary (CASSANDRA-14354)
 + * Add support for hybrid MIN(), MAX() speculative retry policies
 +   (CASSANDRA-14293, CASSANDRA-14338, CASSANDRA-14352)
 + * Fix some regressions caused by 14058 (CASSANDRA-14353)
 + * Abstract repair for pluggable storage (CASSANDRA-14116)
 + * Add meaningful toString() impls (CASSANDRA-13653)
 + * Add sstableloader option to accept target keyspace name (CASSANDRA-13884)
 + * Move processing of EchoMessage response to gossip stage (CASSANDRA-13713)
 + * Add coordinator write metric per CF (CASSANDRA-14232)
 + * Correct and clarify SSLFactory.getSslContext method and call sites 
(CASSANDRA-14314)
 + * Handle static and partition deletion properly on 
ThrottledUnfilteredIterator (CASSANDRA-14315)
 + * NodeTool clientstats should show SSL Cipher (CASSANDRA-14322)
 + * Add ability to specify driver name and version (CASSANDRA-14275)
 + * Abstract streaming for pluggable storage (CASSANDRA-14115)
 + * Forced incremental repairs should promote sstables if they can 
(CASSANDRA-14294)
 + * Use Murmur3 for validation compactions (CASSANDRA-14002)
 + * Comma at the end of the seed list is interpretated as localhost 
(CASSANDRA-14285)
 + * Refactor read executor and response resolver, abstract read repair 
(CASSANDRA-14058)
 + * Add optional startup delay to wait until peers are ready (CASSANDRA-13993)
 + * Add a few options to nodetool verify (CASSANDRA-14201)
 + * CVE-2017-5929 Security vulnerability and redefine default log rotation 
policy (CASSANDRA-14183)
 + * Use JVM default SSL validation algorithm instead of custom default 
(CASSANDRA-13259)
 + * Better document in code InetAddressAndPort usage post 7544, incorporate 
port into UUIDGen node (CASSANDRA-14226)
 + * Fix sstablemetadata date string for minLocalDeletionTime (CASSANDRA-14132)
 + * Make it possible to change neverPurgeTombstones during runtime 
(CASSANDRA-14214)
 + * Remove GossipDigestSynVerbHandler#doSort() (CASSANDRA-14174)
 + * Add nodetool clientlist (CASSANDRA-13665)
 + * Revert ProtocolVersion changes from CASSANDRA-7544 (CASSANDRA-14211)
 + * Non-disruptive seed node list reload (CASSANDRA-14190)
 + * Nodetool tablehistograms to print statics for all the tables 
(CASSANDRA-14185)
 + * Migrate dtests to use pytest and python3 (CASSANDRA-14134)
 + * Allow storage port to be configurable per node (CASSANDRA-7544)
 + * Make sub-range selection for non-frozen collections return null instead of 
empty (CASSANDRA-14182)
 + * BloomFilter serialization format should not change byte ordering 
(CASSANDRA-9067)
 + * Remove unused on-heap BloomFilter implementation (CASSANDRA-14152)
 + * Delete temp test files on exit (CASSANDRA-14153)
 + * Make PartitionUpdate and Mutation immutable (CASSANDRA-13867)
 + * Fix CommitLogReplayer exception for CDC data (CASSANDRA-14066)
 + * Fix cassandra-stress startup failure (CASSANDRA-14106)
 + * Remove initialDirectories from CFS (CASSANDRA-13928)
 + * Fix trivial log format error (CASSANDRA-14015)
 + * Allow sstabledump to do a json object per partition (CASSANDRA-13848)
 + * Add option to optimise merkle tree comparison across replicas 
(CASSANDRA-3200)
 + * Remove unused and deprecated methods from AbstractCompactionStrategy 
(CASSANDRA-14081)
 + * Fix Distribution.average in cassandra-stress (CASSANDRA-14090)
 + * Support a means of logging all queries as they were invoked 
(CASSANDRA-13983)
 + * Presize collections (CASSANDRA-13760)
 + * Add GroupCommitLogService (CASSANDRA-13530)
 + * Parallelize initial materialized view build (CASSANDRA-12245)
 + * Fix flaky SecondaryIndexManagerTest.assert[Not]MarkedAsBuilt 
(CASSANDRA-13965)
 + * Make LWTs send resultset metadata on every request (CASSANDRA-13992)
 + * Fix flaky indexWithFailedInitializationIsNotQueryableAfterPartialRebuild 
(CASSANDRA-13963)
 + * Introduce leaf-only iterator (CASSANDRA-9988)
 + * Upgrade Guava to 23.3 and Airline to 0.8 (CASSANDRA-13997)
 + * Allow only one concurrent call to StatusLogger (CASSANDRA-12182)
 + * Refactoring to specialised functional interfaces (CASSANDRA-13982)
 + * Speculative retry should allow more friendly params (CASSANDRA-13876)
 + * Throw exception if we send/receive repair messages to incompatible nodes 
(CASSANDRA-13944)
 + * Replace usages of MessageDigest with Guava's Hasher (CASSANDRA-13291)
 + * Add nodetool cmd to print hinted handoff window (CASSANDRA-13728)
 + * Fix some alerts raised by static analysis (CASSANDRA-13799)
 + * Checksum sstable metadata (CASSANDRA-13321, CASSANDRA-13593)
 + * Add result set metadata to prepared statement MD5 hash calculation 
(CASSANDRA-10786)
 + * Refactor GcCompactionTest to avoid boxing (CASSANDRA-13941)
 + * Expose recent histograms in JmxHistograms (CASSANDRA-13642)
 + * Fix buffer length comparison when decompressing in netty-based streaming 
(CASSANDRA-13899)
 + * Properly close StreamCompressionInputStream to release any ByteBuf 
(CASSANDRA-13906)
 + * Add SERIAL and LOCAL_SERIAL support for cassandra-stress (CASSANDRA-13925)
 + * LCS needlessly checks for L0 STCS candidates multiple times 
(CASSANDRA-12961)
 + * Correctly close netty channels when a stream session ends (CASSANDRA-13905)
 + * Update lz4 to 1.4.0 (CASSANDRA-13741)
 + * Optimize Paxos prepare and propose stage for local requests 
(CASSANDRA-13862)
 + * Throttle base partitions during MV repair streaming to prevent OOM 
(CASSANDRA-13299)
 + * Use compaction threshold for STCS in L0 (CASSANDRA-13861)
 + * Fix problem with min_compress_ratio: 1 and disallow ratio < 1 
(CASSANDRA-13703)
 + * Add extra information to SASI timeout exception (CASSANDRA-13677)
 + * Add incremental repair support for --hosts, --force, and subrange repair 
(CASSANDRA-13818)
 + * Rework CompactionStrategyManager.getScanners synchronization 
(CASSANDRA-13786)
 + * Add additional unit tests for batch behavior, TTLs, Timestamps 
(CASSANDRA-13846)
 + * Add keyspace and table name in schema validation exception 
(CASSANDRA-13845)
 + * Emit metrics whenever we hit tombstone failures and warn thresholds 
(CASSANDRA-13771)
 + * Make netty EventLoopGroups daemon threads (CASSANDRA-13837)
 + * Race condition when closing stream sessions (CASSANDRA-13852)
 + * NettyFactoryTest is failing in trunk on macOS (CASSANDRA-13831)
 + * Allow changing log levels via nodetool for related classes 
(CASSANDRA-12696)
 + * Add stress profile yaml with LWT (CASSANDRA-7960)
 + * Reduce memory copies and object creations when acting on ByteBufs 
(CASSANDRA-13789)
 + * Simplify mx4j configuration (Cassandra-13578)
 + * Fix trigger example on 4.0 (CASSANDRA-13796)
 + * Force minumum timeout value (CASSANDRA-9375)
 + * Use netty for streaming (CASSANDRA-12229)
 + * Use netty for internode messaging (CASSANDRA-8457)
 + * Add bytes repaired/unrepaired to nodetool tablestats (CASSANDRA-13774)
 + * Don't delete incremental repair sessions if they still have sstables 
(CASSANDRA-13758)
 + * Fix pending repair manager index out of bounds check (CASSANDRA-13769)
 + * Don't use RangeFetchMapCalculator when RF=1 (CASSANDRA-13576)
 + * Don't optimise trivial ranges in RangeFetchMapCalculator (CASSANDRA-13664)
 + * Use an ExecutorService for repair commands instead of new 
Thread(..).start() (CASSANDRA-13594)
 + * Fix race / ref leak in anticompaction (CASSANDRA-13688)
 + * Expose tasks queue length via JMX (CASSANDRA-12758)
 + * Fix race / ref leak in PendingRepairManager (CASSANDRA-13751)
 + * Enable ppc64le runtime as unsupported architecture (CASSANDRA-13615)
 + * Improve sstablemetadata output (CASSANDRA-11483)
 + * Support for migrating legacy users to roles has been dropped 
(CASSANDRA-13371)
 + * Introduce error metrics for repair (CASSANDRA-13387)
 + * Refactoring to primitive functional interfaces in AuthCache 
(CASSANDRA-13732)
 + * Update metrics to 3.1.5 (CASSANDRA-13648)
 + * batch_size_warn_threshold_in_kb can now be set at runtime (CASSANDRA-13699)
 + * Avoid always rebuilding secondary indexes at startup (CASSANDRA-13725)
 + * Upgrade JMH from 1.13 to 1.19 (CASSANDRA-13727)
 + * Upgrade SLF4J from 1.7.7 to 1.7.25 (CASSANDRA-12996)
 + * Default for start_native_transport now true if not set in config 
(CASSANDRA-13656)
 + * Don't add localhost to the graph when calculating where to stream from 
(CASSANDRA-13583)
 + * Make CDC availability more deterministic via hard-linking (CASSANDRA-12148)
 + * Allow skipping equality-restricted clustering columns in ORDER BY clause 
(CASSANDRA-10271)
 + * Use common nowInSec for validation compactions (CASSANDRA-13671)
 + * Improve handling of IR prepare failures (CASSANDRA-13672)
 + * Send IR coordinator messages synchronously (CASSANDRA-13673)
 + * Flush system.repair table before IR finalize promise (CASSANDRA-13660)
 + * Fix column filter creation for wildcard queries (CASSANDRA-13650)
 + * Add 'nodetool getbatchlogreplaythrottle' and 'nodetool 
setbatchlogreplaythrottle' (CASSANDRA-13614)
 + * fix race condition in PendingRepairManager (CASSANDRA-13659)
 + * Allow noop incremental repair state transitions (CASSANDRA-13658)
 + * Run repair with down replicas (CASSANDRA-10446)
 + * Added started & completed repair metrics (CASSANDRA-13598)
 + * Added started & completed repair metrics (CASSANDRA-13598)
 + * Improve secondary index (re)build failure and concurrency handling 
(CASSANDRA-10130)
 + * Improve calculation of available disk space for compaction 
(CASSANDRA-13068)
 + * Change the accessibility of RowCacheSerializer for third party row cache 
plugins (CASSANDRA-13579)
 + * Allow sub-range repairs for a preview of repaired data (CASSANDRA-13570)
 + * NPE in IR cleanup when columnfamily has no sstables (CASSANDRA-13585)
 + * Fix Randomness of stress values (CASSANDRA-12744)
 + * Allow selecting Map values and Set elements (CASSANDRA-7396)
 + * Fast and garbage-free Streaming Histogram (CASSANDRA-13444)
 + * Update repairTime for keyspaces on completion (CASSANDRA-13539)
 + * Add configurable upper bound for validation executor threads 
(CASSANDRA-13521)
 + * Bring back maxHintTTL propery (CASSANDRA-12982)
 + * Add testing guidelines (CASSANDRA-13497)
 + * Add more repair metrics (CASSANDRA-13531)
 + * RangeStreamer should be smarter when picking endpoints for streaming 
(CASSANDRA-4650)
 + * Avoid rewrapping an exception thrown for cache load functions 
(CASSANDRA-13367)
 + * Log time elapsed for each incremental repair phase (CASSANDRA-13498)
 + * Add multiple table operation support to cassandra-stress (CASSANDRA-8780)
 + * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
 + * Fix WriteResponseHandlerTest is sensitive to test execution order 
(CASSANDRA-13421)
 + * Improve incremental repair logging (CASSANDRA-13468)
 + * Start compaction when incremental repair finishes (CASSANDRA-13454)
 + * Add repair streaming preview (CASSANDRA-13257)
 + * Cleanup isIncremental/repairedAt usage (CASSANDRA-13430)
 + * Change protocol to allow sending key space independent of query string 
(CASSANDRA-10145)
 + * Make gc_log and gc_warn settable at runtime (CASSANDRA-12661)
 + * Take number of files in L0 in account when estimating remaining compaction 
tasks (CASSANDRA-13354)
 + * Skip building views during base table streams on range movements 
(CASSANDRA-13065)
 + * Improve error messages for +/- operations on maps and tuples 
(CASSANDRA-13197)
 + * Remove deprecated repair JMX APIs (CASSANDRA-11530)
 + * Fix version check to enable streaming keep-alive (CASSANDRA-12929)
 + * Make it possible to monitor an ideal consistency level separate from 
actual consistency level (CASSANDRA-13289)
 + * Outbound TCP connections ignore internode authenticator (CASSANDRA-13324)
 + * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360)
 + * Cleanup ParentRepairSession after repairs (CASSANDRA-13359)
 + * Upgrade snappy-java to 1.1.2.6 (CASSANDRA-13336)
 + * Incremental repair not streaming correct sstables (CASSANDRA-13328)
 + * Upgrade the jna version to 4.3.0 (CASSANDRA-13300)
 + * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID 
functions (CASSANDRA-13132)
 + * Remove config option index_interval (CASSANDRA-10671)
 + * Reduce lock contention for collection types and serializers 
(CASSANDRA-13271)
 + * Make it possible to override MessagingService.Verb ids (CASSANDRA-13283)
 + * Avoid synchronized on prepareForRepair in ActiveRepairService 
(CASSANDRA-9292)
 + * Adds the ability to use uncompressed chunks in compressed files 
(CASSANDRA-10520)
 + * Don't flush sstables when streaming for incremental repair 
(CASSANDRA-13226)
 + * Remove unused method (CASSANDRA-13227)
 + * Fix minor bugs related to #9143 (CASSANDRA-13217)
 + * Output warning if user increases RF (CASSANDRA-13079)
 + * Remove pre-3.0 streaming compatibility code for 4.0 (CASSANDRA-13081)
 + * Add support for + and - operations on dates (CASSANDRA-11936)
 + * Fix consistency of incrementally repaired data (CASSANDRA-9143)
 + * Increase commitlog version (CASSANDRA-13161)
 + * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425)
 + * Refactor ColumnCondition (CASSANDRA-12981)
 + * Parallelize streaming of different keyspaces (CASSANDRA-4663)
 + * Improved compactions metrics (CASSANDRA-13015)
 + * Speed-up start-up sequence by avoiding un-needed flushes (CASSANDRA-13031)
 + * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855)
 + * Thrift removal (CASSANDRA-11115)
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 + * Use new token allocation for non bootstrap case as well (CASSANDRA-13080)
 + * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084)
 + * Require forceful decommission if number of nodes is less than replication 
factor (CASSANDRA-12510)
 + * Allow IN restrictions on column families with collections (CASSANDRA-12654)
 + * Log message size in trace message in OutboundTcpConnection 
(CASSANDRA-13028)
 + * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
 + * Add mutation size and batch metrics (CASSANDRA-12649)
 + * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
 + * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
 + * Conditionally update index built status to avoid unnecessary flushes 
(CASSANDRA-12969)
 + * cqlsh auto completion: refactor definition of compaction strategy options 
(CASSANDRA-12946)
 + * Add support for arithmetic operators (CASSANDRA-11935)
 + * Add histogram for delay to deliver hints (CASSANDRA-13234)
 + * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
 + * Changing `max_hint_window_in_ms` at runtime (CASSANDRA-11720)
 + * Trivial format error in StorageProxy (CASSANDRA-13551)
 + * Nodetool repair can hang forever if we lose the notification for the 
repair completing/failing (CASSANDRA-13480)
 + * Anticompaction can cause noisy log messages (CASSANDRA-13684)
 + * Switch to client init for sstabledump (CASSANDRA-13683)
 + * CQLSH: Don't pause when capturing data (CASSANDRA-13743)
 + * nodetool clearsnapshot requires --all to clear all snapshots 
(CASSANDRA-13391)
 + * Correctly count range tombstones in traces and tombstone thresholds 
(CASSANDRA-8527)
 + * cqlshrc.sample uses incorrect option for time formatting (CASSANDRA-14243)
 +
 +
  3.11.4
  Merged from 3.0:
+  * Fix static column order for SELECT * wildcard queries (CASSANDRA-14638)
+  * sstableloader should use discovered broadcast address to connect 
intra-cluster (CASSANDRA-14522)
   * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
   Merged from 2.2:
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/76c1b555/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 3fab849,ea53c36..9d0da9b
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -33,157 -42,16 +33,167 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +4.0
 +===
 +
 +New features
 +------------
 +   - *Experimental* support for Java 11 has been added. JVM options that 
differ between or are
 +     specific for Java 8 and 11 have been moved from jvm.options into 
jvm8.options and jvm11.options.
 +     IMPORTANT: Running C* on Java 11 is *experimental* and do it at your own 
risk.
 +     Compilation recommendations: configure Java 11 SDK via JAVA_HOME and 
Java 8 SDK via JAVA8_HOME.
 +     Release builds require Java 11 + Java 8. Development builds can use Java 
8 without 11.
 +   - LCS now respects the max_threshold parameter when compacting - this was 
hard coded to 32
 +     before, but now it is possible to do bigger compactions when compacting 
from L0 to L1.
 +     This also applies to STCS-compactions in L0 - if there are more than 32 
sstables in L0
 +     we will compact at most max_threshold sstables in an L0 STCS compaction. 
See CASSANDRA-14388
 +     for more information.
 +   - There is now an option to automatically upgrade sstables after Cassandra 
upgrade, enable
 +     either in `cassandra.yaml:automatic_sstable_upgrade` or via JMX during 
runtime. See
 +     CASSANDRA-14197.
 +   - `nodetool refresh` has been deprecated in favour of `nodetool import` - 
see CASSANDRA-6719
 +     for details
 +   - An experimental option to compare all merkle trees together has been 
added - for example, in
 +     a 3 node cluster with 2 replicas identical and 1 out-of-date, with this 
option enabled, the
 +     out-of-date replica will only stream a single copy from up-to-date 
replica. Enable it by adding
 +     "-os" to nodetool repair. See CASSANDRA-3200.
 +   - The currentTimestamp, currentDate, currentTime and currentTimeUUID 
functions have been added.
 +     See CASSANDRA-13132
 +   - Support for arithmetic operations between `timestamp`/`date` and 
`duration` has been added.
 +     See CASSANDRA-11936
 +   - Support for arithmetic operations on number has been added. See 
CASSANDRA-11935
 +   - Preview expected streaming required for a repair (nodetool repair 
--preview), and validate the
 +     consistency of repaired data between nodes (nodetool repair --validate). 
See CASSANDRA-13257
 +   - Support for selecting Map values and Set elements has been added for 
SELECT queries. See CASSANDRA-7396
 +   - Change-Data-Capture has been modified to make CommitLogSegments available
 +     immediately upon creation via hard-linking the files. This means that 
incomplete
 +     segments will be available in cdc_raw rather than fully flushed. See 
documentation
 +     and CASSANDRA-12148 for more detail.
 +   - The initial build of materialized views can be parallelized. The number 
of concurrent builder
 +     threads is specified by the property 
`cassandra.yaml:concurrent_materialized_view_builders`.
 +     This property can be modified at runtime through both JMX and the new 
`setconcurrentviewbuilders`
 +     and `getconcurrentviewbuilders` nodetool commands. See CASSANDRA-12245 
for more details.
 +   - There is now a binary full query log based on Chronicle Queue that can 
be controlled using
 +     nodetool enablefullquerylog, disablefullquerylog, and resetfullquerylog. 
The log
 +     contains all queries invoked, approximate time they were invoked, any 
parameters necessary
 +     to bind wildcard values, and all query options. A human readable version 
of the log can be
 +     dumped or tailed using the new bin/fqltool utility. The full query log 
is designed to be safe
 +     to use in production and limits utilization of heap memory and disk 
space with limits
 +     you can specify when enabling the log.
 +     See nodetool and fqltool help text for more information.
 +   - SSTableDump now supports the -l option to output each partition as it's 
own json object
 +     See CASSANDRA-13848 for more detail
 +   - Metric for coordinator writes per table has been added. See 
CASSANDRA-14232
 +   - Nodetool cfstats now has options to sort by various metrics as well as 
limit results.
 +   - Operators can restrict login user activity to one or more datacenters. 
See `network_authorizer`
 +     in cassandra.yaml, and the docs for create and alter role statements. 
CASSANDRA-13985
 +   - Roles altered from login=true to login=false will prevent existing 
connections from executing any
 +     statements after the cache has been refreshed. CASSANDRA-13985
 +   - Support for audit logging of database activity. If enabled, logs every 
incoming
 +     CQL command request, Authentication (successful as well as unsuccessful 
login) to a node.
 +   - Faster streaming of entire SSTables using ZeroCopy APIs. If enabled, 
Cassandra will use stream
 +     entire SSTables, significantly speeding up transfers. Any streaming 
related operations will see
 +     corresponding improvement. See CASSANDRA-14556.
 +
 +Upgrading
 +---------
 +    - Cassandra 4.0 removed support for COMPACT STORAGE tables. All Compact 
Tables
 +      have to be migrated using `ALTER ... DROP COMPACT STORAGE` statement in 
3.0/3.11.
 +      Cassandra starting 4.0 will not start if flags indicate that the table 
is non-CQL.
 +      Syntax for creating compact tables is also deprecated.
 +    - Support for legacy auth tables in the system_auth keyspace (users,
 +      permissions, credentials) and the migration code has been removed. 
Migration
 +      of these legacy auth tables must have been completed before the upgrade 
to
 +      4.0 and the legacy tables must have been removed. See the 'Upgrading' 
section
 +      for version 2.2 for migration instructions.
 +    - Cassandra 4.0 removed support for the deprecated Thrift interface. 
Amongst
 +      other things, this implies the removal of all yaml options related to 
thrift
 +      ('start_rpc', rpc_port, ...).
 +    - Cassandra 4.0 removed support for any pre-3.0 format. This means you
 +      cannot upgrade from a 2.x version to 4.0 directly, you have to upgrade 
to
 +      a 3.0.x/3.x version first (and run upgradesstable). In particular, this
 +      mean Cassandra 4.0 cannot load or read pre-3.0 sstables in any way: you
 +      will need to upgrade those sstable in 3.0.x/3.x first.
 +    - Upgrades from 3.0.x or 3.x are supported since 3.0.13 or 3.11.0, 
previous
 +      versions will causes issues during rolling upgrades (CASSANDRA-13274).
 +    - Cassandra will no longer allow invalid keyspace replication options, 
such
 +      as invalid datacenter names for NetworkTopologyStrategy. Operators MUST
 +      add new nodes to a datacenter before they can set set ALTER or CREATE
 +      keyspace replication policies using that datacenter. Existing keyspaces
 +      will continue to operate, but CREATE and ALTER will validate that all
 +      datacenters specified exist in the cluster.
 +    - Cassandra 4.0 fixes a problem with incremental repair which caused 
repaired
 +      data to be inconsistent between nodes. The fix changes the behavior of 
both
 +      full and incremental repairs. For full repairs, data is no longer marked
 +      repaired. For incremental repairs, anticompaction is run at the 
beginning
 +      of the repair, instead of at the end. If incremental repair was being 
used
 +      prior to upgrading, a full repair should be run after upgrading to 
resolve
 +      any inconsistencies.
 +    - Config option index_interval has been removed (it was deprecated since 
2.0)
 +    - Deprecated repair JMX APIs are removed.
 +    - The version of snappy-java has been upgraded to 1.1.2.6
 +      - the miniumum value for internode message timeouts is 10ms. 
Previously, any
 +        positive value was allowed. See cassandra.yaml entries like
 +        read_request_timeout_in_ms for more details.
 +      - Cassandra 4.0 allows a single port to be used for both secure and 
insecure
 +        connections between cassandra nodes (CASSANDRA-10404). See the yaml 
for
 +        specific property changes, and see the security doc for full details.
 +    - Due to the parallelization of the initial build of materialized views,
 +      the per token range view building status is stored in the new table
 +      `system.view_builds_in_progress`. The old table 
`system.views_builds_in_progress`
 +      is no longer used and can be removed. See CASSANDRA-12245 for more 
details.
 +      - Config option commitlog_sync_batch_window_in_ms has been deprecated 
as it's
 +        documentation has been incorrect and the setting itself near useless.
 +        Batch mode remains a valid commit log mode, however.
 +      - There is a new commit log mode, group, which is similar to batch mode
 +        but blocks for up to a configurable number of milliseconds between 
disk flushes.
 +      - nodetool clearsnapshot now required the --all flag to remove all 
snapshots.
 +        Previous behavior would delete all snapshots by default.
 +    - Nodes are now identified by a combination of IP, and storage port.
 +      Existing JMX APIs, nodetool, and system tables continue to work
 +      and accept/return just an IP, but there is a new
 +      version of each that works with the full unambiguous identifier.
 +      You should prefer these over the deprecated ambiguous versions that only
 +      work with an IP. This was done to support multiple instances per IP.
 +      Additionally we are moving to only using a single port for encrypted and
 +      unencrypted traffic and if you want multiple instances per IP you must
 +      first switch encrypted traffic to the storage port and not a separate
 +      encrypted port. If you want to use multiple instances per IP
 +      with SSL you will need to use StartTLS on storage_port and set
 +      outgoing_encrypted_port_source to gossip outbound connections
 +      know what port to connect to for each instance. Before changing
 +      storage port or native port at nodes you must first upgrade the entire 
cluster
 +      and clients to 4.0 so they can handle the port not being consistent 
across
 +      the cluster.
 +    - Names of AWS regions/availability zones have been cleaned up to more 
correctly
 +      match the Amazon names. There is now a new option in 
conf/cassandra-rackdc.properties
 +      that lets users enable the correct names for new clusters, or use the 
legacy
 +      names for existing clusters. See conf/cassandra-rackdc.properties for 
details.
 +    - Background repair has been removed. dclocal_read_repair_chance and
 +      read_repair_chance table options have been removed and are now rejected.
 +      See CASSANDRA-13910 for details.
 +
 +Materialized Views
 +-------------------
 +   - Following a discussion regarding concerns about the design and safety of 
Materialized Views, the C* development
 +     community no longer recommends them for production use, and considers 
them experimental. Warnings messages will
 +     now be logged when they are created. (See 
https://www.mail-archive.com/dev@cassandra.apache.org/msg11511.html)
 +   - An 'enable_materialized_views' flag has been added to cassandra.yaml to 
allow operators to prevent creation of
 +     views
 +   - CREATE MATERIALIZED VIEW syntax has become stricter. Partition key 
columns are no longer implicitly considered
 +     to be NOT NULL, and no base primary key columns get automatically 
included in view definition. You have to
 +     specify them explicitly now.
 +
+ 3.11.4
+ ======
+ 
+ Upgrading
+ ---------
+     - The order of static columns in SELECT * has been fixed to match that of 
2.0 and 2.1 - they are now sorted
+       alphabetically again, by their name, just like regular columns are. If 
you use prepared statements and
+       SELECT * queries, and have both simple and collection static columns in 
those tables, and are upgrading from an
+       earlier 3.0 version, then you might be affected by this change. Please 
see CASSANDRA-14638 for details.
+ 
  3.11.3
  =====
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/76c1b555/doc/cql3/CQL.textile
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/76c1b555/src/java/org/apache/cassandra/db/Columns.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/Columns.java
index 00cdf4a,c7808b3..bced4b7
--- a/src/java/org/apache/cassandra/db/Columns.java
+++ b/src/java/org/apache/cassandra/db/Columns.java
@@@ -53,13 -52,22 +53,22 @@@ public class Columns extends AbstractCo
  {
      public static final Serializer serializer = new Serializer();
      public static final Columns NONE = new Columns(BTree.empty(), 0);
-     private static final ColumnMetadata FIRST_COMPLEX =
+ 
 -    private static final ColumnDefinition FIRST_COMPLEX_STATIC =
 -        new ColumnDefinition("",
 -                             "",
 -                             
ColumnIdentifier.getInterned(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
UTF8Type.instance),
 -                             SetType.getInstance(UTF8Type.instance, true),
 -                             ColumnDefinition.NO_POSITION,
 -                             ColumnDefinition.Kind.STATIC);
 -
 -    private static final ColumnDefinition FIRST_COMPLEX_REGULAR =
 -        new ColumnDefinition("",
 -                             "",
 -                             
ColumnIdentifier.getInterned(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
UTF8Type.instance),
 -                             SetType.getInstance(UTF8Type.instance, true),
 -                             ColumnDefinition.NO_POSITION,
 -                             ColumnDefinition.Kind.REGULAR);
++    private static final ColumnMetadata FIRST_COMPLEX_STATIC =
++        new ColumnMetadata("",
++                           "",
++                           
ColumnIdentifier.getInterned(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
UTF8Type.instance),
++                           SetType.getInstance(UTF8Type.instance, true),
++                           ColumnMetadata.NO_POSITION,
++                           ColumnMetadata.Kind.STATIC);
++
++    private static final ColumnMetadata FIRST_COMPLEX_REGULAR =
 +        new ColumnMetadata("",
 +                           "",
 +                           
ColumnIdentifier.getInterned(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
UTF8Type.instance),
 +                           SetType.getInstance(UTF8Type.instance, true),
 +                           ColumnMetadata.NO_POSITION,
 +                           ColumnMetadata.Kind.REGULAR);
  
      private final Object[] columns;
      private final int complexIdx; // Index of the first complex column
@@@ -102,11 -110,14 +111,14 @@@
  
      private static int findFirstComplexIdx(Object[] tree)
      {
-         // have fast path for common no-complex case
+         if (BTree.isEmpty(tree))
+             return 0;
+ 
          int size = BTree.size(tree);
-         if (!BTree.isEmpty(tree) && BTree.<ColumnMetadata>findByIndex(tree, 
size - 1).isSimple())
-             return size;
-         return BTree.ceilIndex(tree, Comparator.naturalOrder(), 
FIRST_COMPLEX);
 -        ColumnDefinition last = BTree.findByIndex(tree, size - 1);
++        ColumnMetadata last = BTree.findByIndex(tree, size - 1);
+         return last.isSimple()
+              ? size
+              : BTree.ceilIndex(tree, Comparator.naturalOrder(), 
last.isStatic() ? FIRST_COMPLEX_STATIC : FIRST_COMPLEX_REGULAR);
      }
  
      /**

http://git-wip-us.apache.org/repos/asf/cassandra/blob/76c1b555/test/unit/org/apache/cassandra/db/ColumnsTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/ColumnsTest.java
index 6a3b86f,e3b93de..dae0d0a
--- a/test/unit/org/apache/cassandra/db/ColumnsTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnsTest.java
@@@ -29,8 -30,12 +30,9 @@@ import com.google.common.collect.Lists
  import org.junit.AfterClass;
  import org.junit.Test;
  
 -import junit.framework.Assert;
 -import org.apache.cassandra.MockSchema;
 -import org.apache.cassandra.config.CFMetaData;
 -import org.apache.cassandra.config.ColumnDefinition;
 +import org.junit.Assert;
  import org.apache.cassandra.config.DatabaseDescriptor;
+ import org.apache.cassandra.db.marshal.AbstractType;
  import org.apache.cassandra.db.marshal.SetType;
  import org.apache.cassandra.db.marshal.UTF8Type;
  import org.apache.cassandra.io.util.DataInputBuffer;
@@@ -134,10 -136,10 +136,10 @@@ public class ColumnsTes
      {
          List<String> names = new ArrayList<>();
          for (int i = 0; i < 50; i++)
-             names.add("clustering_" + i);
+             names.add("regular_" + i);
  
 -        List<ColumnDefinition> defs = new ArrayList<>();
 +        List<ColumnMetadata> defs = new ArrayList<>();
-         addClustering(names, defs);
+         addRegular(names, defs);
  
          Columns columns = Columns.from(new HashSet<>(defs));
  
@@@ -149,6 -151,62 +151,62 @@@
          Assert.assertTrue(columns.containsAll(subset));
      }
  
+     @Test
+     public void testStaticColumns()
+     {
 -        testColumns(ColumnDefinition.Kind.STATIC);
++        testColumns(ColumnMetadata.Kind.STATIC);
+     }
+ 
+     @Test
+     public void testRegularColumns()
+     {
 -        testColumns(ColumnDefinition.Kind.REGULAR);
++        testColumns(ColumnMetadata.Kind.REGULAR);
+     }
+ 
 -    private void testColumns(ColumnDefinition.Kind kind)
++    private void testColumns(ColumnMetadata.Kind kind)
+     {
 -        List<ColumnDefinition> definitions = ImmutableList.of(
++        List<ColumnMetadata> definitions = ImmutableList.of(
+             def("a", UTF8Type.instance, kind),
+             def("b", SetType.getInstance(UTF8Type.instance, true), kind),
+             def("c", UTF8Type.instance, kind),
+             def("d", SetType.getInstance(UTF8Type.instance, true), kind),
+             def("e", UTF8Type.instance, kind),
+             def("f", SetType.getInstance(UTF8Type.instance, true), kind),
+             def("g", UTF8Type.instance, kind),
+             def("h", SetType.getInstance(UTF8Type.instance, true), kind)
+         );
+         Columns columns = Columns.from(definitions);
+ 
+         // test simpleColumnCount()
+         Assert.assertEquals(4, columns.simpleColumnCount());
+ 
+         // test simpleColumns()
 -        List<ColumnDefinition> simpleColumnsExpected =
++        List<ColumnMetadata> simpleColumnsExpected =
+             ImmutableList.of(definitions.get(0), definitions.get(2), 
definitions.get(4), definitions.get(6));
 -        List<ColumnDefinition> simpleColumnsActual = new ArrayList<>();
++        List<ColumnMetadata> simpleColumnsActual = new ArrayList<>();
+         Iterators.addAll(simpleColumnsActual, columns.simpleColumns());
+         Assert.assertEquals(simpleColumnsExpected, simpleColumnsActual);
+ 
+         // test complexColumnCount()
+         Assert.assertEquals(4, columns.complexColumnCount());
+ 
+         // test complexColumns()
 -        List<ColumnDefinition> complexColumnsExpected =
++        List<ColumnMetadata> complexColumnsExpected =
+             ImmutableList.of(definitions.get(1), definitions.get(3), 
definitions.get(5), definitions.get(7));
 -        List<ColumnDefinition> complexColumnsActual = new ArrayList<>();
++        List<ColumnMetadata> complexColumnsActual = new ArrayList<>();
+         Iterators.addAll(complexColumnsActual, columns.complexColumns());
+         Assert.assertEquals(complexColumnsExpected, complexColumnsActual);
+ 
+         // test size()
+         Assert.assertEquals(8, columns.size());
+ 
+         // test selectOrderIterator()
 -        List<ColumnDefinition> columnsExpected = definitions;
 -        List<ColumnDefinition> columnsActual = new ArrayList<>();
++        List<ColumnMetadata> columnsExpected = definitions;
++        List<ColumnMetadata> columnsActual = new ArrayList<>();
+         Iterators.addAll(columnsActual, columns.selectOrderIterator());
+         Assert.assertEquals(columnsExpected, columnsActual);
+     }
+ 
      private void testSerializeSubset(ColumnsCheck input) throws IOException
      {
          testSerializeSubset(input.columns, input.columns, input.definitions);
@@@ -393,29 -451,33 +451,34 @@@
      {
          int i = 0;
          for (String name : names)
 -            results.add(ColumnDefinition.clusteringDef(cfMetaData, 
bytes(name), UTF8Type.instance, i++));
 +            results.add(ColumnMetadata.clusteringColumn(TABLE_METADATA, 
bytes(name), UTF8Type.instance, i++));
      }
  
 -    private static void addRegular(List<String> names, List<ColumnDefinition> 
results)
 +    private static void addRegular(List<String> names, List<ColumnMetadata> 
results)
      {
          for (String name : names)
 -            results.add(ColumnDefinition.regularDef(cfMetaData, bytes(name), 
UTF8Type.instance));
 +            results.add(ColumnMetadata.regularColumn(TABLE_METADATA, 
bytes(name), UTF8Type.instance));
      }
  
 -    private static <V> void addComplex(List<String> names, 
List<ColumnDefinition> results)
 +    private static <V> void addComplex(List<String> names, 
List<ColumnMetadata> results)
      {
          for (String name : names)
 -            results.add(ColumnDefinition.regularDef(cfMetaData, bytes(name), 
SetType.getInstance(UTF8Type.instance, true)));
 +            results.add(ColumnMetadata.regularColumn(TABLE_METADATA, 
bytes(name), SetType.getInstance(UTF8Type.instance, true)));
      }
  
 -    private static ColumnDefinition def(String name, AbstractType<?> type, 
ColumnDefinition.Kind kind)
++    private static ColumnMetadata def(String name, AbstractType<?> type, 
ColumnMetadata.Kind kind)
+     {
 -        return new ColumnDefinition(cfMetaData, bytes(name), type, 
ColumnDefinition.NO_POSITION, kind);
++        return new ColumnMetadata(TABLE_METADATA, bytes(name), type, 
ColumnMetadata.NO_POSITION, kind);
+     }
+ 
 -    private static CFMetaData mock(Columns columns)
 +    private static TableMetadata mock(Columns columns)
      {
          if (columns.isEmpty())
 -            return cfMetaData;
 -        CFMetaData.Builder builder = 
CFMetaData.Builder.create(cfMetaData.ksName, cfMetaData.cfName);
 +            return TABLE_METADATA;
 +
 +        TableMetadata.Builder builder = 
TableMetadata.builder(TABLE_METADATA.keyspace, TABLE_METADATA.name);
          boolean hasPartitionKey = false;
 -        for (ColumnDefinition def : columns)
 +        for (ColumnMetadata def : columns)
          {
              switch (def.kind)
              {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to