[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk * cassandra-3.0: Legacy deserializer can create unexpected boundary range tombstones Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/831c05b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/831c05b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/831c05b1 Branch: refs/heads/trunk Commit: 831c05b1c047cdccbc6a82fe0d3f72302fdfb18a Parents: cd29d44 ab71748 Author: Sylvain Lebresne Authored: Thu Feb 23 15:21:47 2017 +0100 Committer: Sylvain Lebresne Committed: Thu Feb 23 15:21:47 2017 +0100 -- CHANGES.txt | 1 + .../cassandra/db/rows/RangeTombstoneMarker.java | 1 - .../apache/cassandra/service/DataResolver.java | 31 +++-- .../cassandra/service/DataResolverTest.java | 129 ++- 4 files changed, 142 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/831c05b1/CHANGES.txt -- diff --cc CHANGES.txt index 0641011,386029e..f541c9a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,55 -1,19 +1,56 @@@ -3.0.12 +4.0 + * 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-5) + * 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) + + +3.11.0 + * Fix equality comparisons of columns using the duration type (CASSANDRA-13174) + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) + * nodetool stopdaemon errors out (CASSANDRA-13030) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) +Merged from 3.0: + * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237) * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070) * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185) -Merged from 2.2 - * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202) - * Fix failing COPY TO STDOUT (CASSANDRA-12497) - * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222) - * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018) -Merged from 2.1: - * Log stacktrace of uncaught exceptions (CASSANDRA-13108) - -3.0.11 * Use keyspace replication settings on system.size_estimates table
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bdeef40d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bdeef40d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bdeef40d Branch: refs/heads/trunk Commit: bdeef40d4776085c8194d144875f2e15be7955cf Parents: 5dda0ab 8bd6299 Author: Marcus Eriksson Authored: Tue Aug 23 16:46:16 2016 +0200 Committer: Marcus Eriksson Committed: Tue Aug 23 16:46:16 2016 +0200 -- CHANGES.txt | 2 ++ .../org/apache/cassandra/db/Directories.java| 3 +- .../db/compaction/AbstractCompactionTask.java | 7 .../compaction/LeveledCompactionStrategy.java | 7 .../db/compaction/LeveledManifest.java | 36 .../cassandra/io/FSDiskFullWriteError.java | 33 ++ 6 files changed, 87 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdeef40d/CHANGES.txt -- diff --cc CHANGES.txt index 8a95b98,bd1fc5d..fd843dd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,94 -1,13 +1,96 @@@ -3.0.9 +3.10 + * "SELECT * FROM foo LIMIT ;" does not error out (CASSANDRA-12154) + * Define executeLocally() at the ReadQuery Level (CASSANDRA-12474) + * Extend read/write failure messages with a map of replica addresses + to error codes in the v5 native protocol (CASSANDRA-12311) + * Fix rebuild of SASI indexes with existing index files (CASSANDRA-12374) + * Let DatabaseDescriptor not implicitly startup services (CASSANDRA-9054) + * Fix clustering indexes in presence of static columns in SASI (CASSANDRA-12378) + * Fix queries on columns with reversed type on SASI indexes (CASSANDRA-12223) + * Added slow query log (CASSANDRA-12403) + * Count full coordinated request against timeout (CASSANDRA-12256) + * Allow TTL with null value on insert and update (CASSANDRA-12216) + * Make decommission operation resumable (CASSANDRA-12008) + * Add support to one-way targeted repair (CASSANDRA-9876) + * Remove clientutil jar (CASSANDRA-11635) + * Fix compaction throughput throttle (CASSANDRA-12366) + * Delay releasing Memtable memory on flush until PostFlush has finished running (CASSANDRA-12358) + * Cassandra stress should dump all setting on startup (CASSANDRA-11914) + * Make it possible to compact a given token range (CASSANDRA-10643) + * Allow updating DynamicEndpointSnitch properties via JMX (CASSANDRA-12179) + * Collect metrics on queries by consistency level (CASSANDRA-7384) + * Add support for GROUP BY to SELECT statement (CASSANDRA-10707) + * Deprecate memtable_cleanup_threshold and update default for memtable_flush_writers (CASSANDRA-12228) + * Upgrade to OHC 0.4.4 (CASSANDRA-12133) + * Add version command to cassandra-stress (CASSANDRA-12258) + * Create compaction-stress tool (CASSANDRA-11844) + * Garbage-collecting compaction operation and schema option (CASSANDRA-7019) + * Add beta protocol flag for v5 native protocol (CASSANDRA-12142) + * Support filtering on non-PRIMARY KEY columns in the CREATE + MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368) + * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004) + * COPY FROM should raise error for non-existing input files (CASSANDRA-12174) + * Faster write path (CASSANDRA-12269) + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424) + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035) + * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635) + * Prepend snapshot name with "truncated" or "dropped" when a snapshot + is taken before truncating or dropping a table (CASSANDRA-12178) + * Optimize RestrictionSet (CASSANDRA-12153) + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150) + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613) + * Create a system table to expose prepared statements (CASSANDRA-8831) + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970) + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580) + * Add supplied username to authentication error messages (CASSANDRA-12076) + * Remove pre-startup check for open JMX port (CASSANDRA-12074) + * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738) + * Restore resumable hints delivery (CASSANDRA-11960) +Merged from 3.0: + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385) + * Calculate last compacted key on startup (CASSANDRA-6216) * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190) + + +3.9 + * Fix value skipping with counter columns (CASSAND
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f542a2ea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f542a2ea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f542a2ea Branch: refs/heads/trunk Commit: f542a2ea6e72e359e882be69d454f4e55680ad66 Parents: 1df47bd db61372 Author: Dave Brosius Authored: Fri Jul 1 16:16:08 2016 -0400 Committer: Dave Brosius Committed: Fri Jul 1 16:16:08 2016 -0400 -- --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5634cea3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5634cea3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5634cea3 Branch: refs/heads/trunk Commit: 5634cea371b2b469c8ec815477280decb04a24d0 Parents: fb5d7f0 5244787 Author: T Jake Luciani Authored: Tue May 3 09:36:19 2016 -0400 Committer: T Jake Luciani Committed: Tue May 3 09:36:19 2016 -0400 -- --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d1f8e40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d1f8e40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d1f8e40 Branch: refs/heads/trunk Commit: 4d1f8e4045cd6edbeb0cca843078728fb4a34360 Parents: 7bd5773 13daf89 Author: Robert Stupp Authored: Sun Dec 27 17:28:42 2015 +0100 Committer: Robert Stupp Committed: Sun Dec 27 17:28:42 2015 +0100 -- CHANGES.txt | 1 + bin/cqlsh.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d1f8e40/CHANGES.txt -- diff --cc CHANGES.txt index 77d9410,b1a556a..991549a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -36,7 -12,12 +36,8 @@@ Merged from 2.2 * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813) * Add new types to Stress (CASSANDRA-9556) * Add property to allow listening on broadcast interface (CASSANDRA-9748) - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) - * Better handling of SSL connection errors inter-node (CASSANDRA-10816) - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) Merged from 2.1: + * cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875) * Log error when stream session fails (CASSANDRA-9294) * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593) * (cqlsh) further optimise COPY FROM (CASSANDRA-9302) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d1f8e40/bin/cqlsh.py --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/105ccb3d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/105ccb3d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/105ccb3d Branch: refs/heads/trunk Commit: 105ccb3d20492031ac04a8e435d0325b47b39ed1 Parents: 4d6fdaa b55523e Author: Sylvain Lebresne Authored: Fri Dec 11 11:51:49 2015 +0100 Committer: Sylvain Lebresne Committed: Fri Dec 11 11:51:49 2015 +0100 -- bin/cqlsh.py | 14 +- pylib/cqlshlib/copy.py | 647 pylib/cqlshlib/copyutil.py | 646 +++ pylib/cqlshlib/test/basecase.py| 16 +- pylib/cqlshlib/test/cassconnect.py | 6 +- 5 files changed, 659 insertions(+), 670 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/105ccb3d/bin/cqlsh.py --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b39c9c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b39c9c9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b39c9c9 Branch: refs/heads/trunk Commit: 1b39c9c9cc8f0ce3fd56ec036ee2b91866f57751 Parents: 6ed32a3 b408f9e Author: Aleksey Yeschenko Authored: Mon Nov 9 15:45:01 2015 + Committer: Aleksey Yeschenko Committed: Mon Nov 9 15:45:01 2015 + -- CHANGES.txt | 6 ++ src/java/org/apache/cassandra/net/MessagingService.java | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b39c9c9/CHANGES.txt -- diff --cc CHANGES.txt index 88d3fd2,a1f66fa..ed825ac --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,8 +1,14 @@@ +3.2 + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + + 3.0.1 + Merged from 2.1: + * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605) + + 3.0 * Fix AssertionError while flushing memtable due to materialized views incorrectly inserting empty rows (CASSANDRA-10614) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b39c9c9/src/java/org/apache/cassandra/net/MessagingService.java --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d91fb581 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d91fb581 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d91fb581 Branch: refs/heads/trunk Commit: d91fb581eef2295efdab2b2dfc6233f092b0b54e Parents: 9084428 cfbe2d3 Author: Aleksey Yeschenko Authored: Fri Nov 6 15:26:44 2015 + Committer: Aleksey Yeschenko Committed: Fri Nov 6 15:26:44 2015 + -- CHANGES.txt | 1 + bin/cqlsh.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d91fb581/CHANGES.txt --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7cedeca9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7cedeca9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7cedeca9 Branch: refs/heads/trunk Commit: 7cedeca9ac30173dbbc4178b191df6960d8f8190 Parents: d3617a3 d856d3d Author: Tyler Hobbs Authored: Tue Oct 27 09:12:42 2015 -0500 Committer: Tyler Hobbs Committed: Tue Oct 27 09:12:42 2015 -0500 -- bin/cqlsh.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a2dd0cf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a2dd0cf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a2dd0cf Branch: refs/heads/trunk Commit: 3a2dd0cf60f34c242c53d59ad144e76558dface9 Parents: 87f16ca 73781a9 Author: Joshua McKenzie Authored: Fri Oct 23 17:43:32 2015 -0400 Committer: Joshua McKenzie Committed: Fri Oct 23 17:43:32 2015 -0400 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Memtable.java | 28 +- .../db/lifecycle/LifecycleTransaction.java | 39 +- .../db/lifecycle/LogAwareFileLister.java| 3 +- .../apache/cassandra/db/lifecycle/LogFile.java | 263 + .../cassandra/db/lifecycle/LogRecord.java | 192 +-- .../cassandra/db/lifecycle/LogReplica.java | 105 .../cassandra/db/lifecycle/LogReplicaSet.java | 229 .../cassandra/db/lifecycle/LogTransaction.java | 150 +++-- .../apache/cassandra/db/lifecycle/Tracker.java | 4 +- .../cassandra/io/sstable/SSTableTxnWriter.java | 4 +- .../org/apache/cassandra/io/util/FileUtils.java | 20 +- .../cassandra/streaming/StreamReceiveTask.java | 2 +- .../org/apache/cassandra/utils/Throwables.java | 5 + .../unit/org/apache/cassandra/db/ScrubTest.java | 2 +- .../cassandra/db/lifecycle/HelpersTest.java | 2 +- .../db/lifecycle/LogTransactionTest.java| 575 +++ .../db/lifecycle/RealTransactionsTest.java | 6 +- .../io/sstable/SSTableRewriterTest.java | 2 +- 19 files changed, 1232 insertions(+), 400 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a2dd0cf/CHANGES.txt -- diff --cc CHANGES.txt index 2ecad90,bc7c001..dae9264 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.2 + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0 + * Fix LogTransaction checking only a single directory for files (CASSANDRA-10421) * Support encrypted and plain traffic on the same port (CASSANDRA-10559) * Fix handling of range tombstones when reading old format sstables (CASSANDRA-10360) * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
[5/5] cassandra git commit: Merge branch cassandra-3.0 into trunk
Merge branch cassandra-3.0 into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e43fbe0a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e43fbe0a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e43fbe0a Branch: refs/heads/trunk Commit: e43fbe0a79b66b1f68b271f7584f81a33a657401 Parents: 04fa645 a639808 Author: blerer Authored: Fri Oct 23 09:45:04 2015 +0200 Committer: blerer Committed: Fri Oct 23 09:45:09 2015 +0200 -- bin/cqlsh.py | 3 +++ 1 file changed, 3 insertions(+) --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05eb6022 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05eb6022 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05eb6022 Branch: refs/heads/trunk Commit: 05eb6022c3f9638d1581e42a61d390437fc1e627 Parents: f7a19b3 c0a1cce Author: Sylvain Lebresne Authored: Wed Oct 21 15:38:14 2015 +0200 Committer: Sylvain Lebresne Committed: Wed Oct 21 15:38:14 2015 +0200 -- CHANGES.txt | 2 +- .../apache/cassandra/db/SinglePartitionSliceCommandTest.java | 7 +++ 2 files changed, 8 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/05eb6022/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/05eb6022/test/unit/org/apache/cassandra/db/SinglePartitionSliceCommandTest.java --
[5/5] cassandra git commit: Merge branch cassandra-3.0 into trunk
Merge branch cassandra-3.0 into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2af041bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2af041bd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2af041bd Branch: refs/heads/trunk Commit: 2af041bdf6e6d910ce0d4bdf4d780da80b45e030 Parents: f8fa3a4 b13e480 Author: blerer Authored: Wed Oct 21 10:22:12 2015 +0200 Committer: blerer Committed: Wed Oct 21 10:23:20 2015 +0200 -- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/format/big/BigTableWriter.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2af041bd/CHANGES.txt --
[5/5] cassandra git commit: Merge branch cassandra-3.0 into trunk
Merge branch cassandra-3.0 into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/737a3385 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/737a3385 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/737a3385 Branch: refs/heads/trunk Commit: 737a3385ce7aea275a4c8234a4ff43d360c57a84 Parents: 6f2b855 1b93eb4 Author: blerer Authored: Fri Oct 16 14:51:02 2015 +0200 Committer: blerer Committed: Fri Oct 16 14:51:54 2015 +0200 -- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/ResultSet.java| 5 ++ .../apache/cassandra/cql3/UntypedResultSet.java | 6 +-- .../cassandra/cql3/selection/Selection.java | 57 +--- .../cassandra/cql3/selection/Selector.java | 12 + .../cql3/selection/SelectorFactories.java | 20 +++ .../cql3/selection/SimpleSelector.java | 6 +++ .../cql3/statements/SelectStatement.java| 2 +- .../cassandra/db/filter/ColumnFilter.java | 9 +++- .../operations/SelectOrderByTest.java | 52 ++ 10 files changed, 146 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/737a3385/CHANGES.txt -- diff --cc CHANGES.txt index b1feeab,a53a299..eb59885 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ +3.2 + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0-rc2 + * Support empty ColumnFilter for backward compatility on empty IN (CASSANDRA-10471) * Remove Pig support (CASSANDRA-10542) * Fix LogFile throws Exception when assertion is disabled (CASSANDRA-10522) * Revert CASSANDRA-7486, make CMS default GC, move GC config to http://git-wip-us.apache.org/repos/asf/cassandra/blob/737a3385/src/java/org/apache/cassandra/cql3/UntypedResultSet.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/737a3385/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/737a3385/src/java/org/apache/cassandra/db/filter/ColumnFilter.java --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f08d6115 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f08d6115 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f08d6115 Branch: refs/heads/trunk Commit: f08d6115238d3b93eb8c273cd67adc86d647aff1 Parents: f02e13a 174cea0 Author: Aleksey Yeschenko Authored: Wed Oct 14 16:40:00 2015 +0100 Committer: Aleksey Yeschenko Committed: Wed Oct 14 16:40:00 2015 +0100 -- CHANGES.txt | 1 + bin/cqlsh.py | 21 + 2 files changed, 14 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f08d6115/CHANGES.txt --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa0bc75b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa0bc75b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa0bc75b Branch: refs/heads/trunk Commit: aa0bc75bf7806de8fff69d00e587a3d4da79efa3 Parents: d16892a 6d0c96c Author: Aleksey Yeschenko Authored: Wed Oct 14 15:23:09 2015 +0100 Committer: Aleksey Yeschenko Committed: Wed Oct 14 15:23:09 2015 +0100 -- CHANGES.txt | 1 + bin/cqlsh.py | 3 +++ 2 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa0bc75b/CHANGES.txt --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ad9914a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ad9914a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ad9914a Branch: refs/heads/trunk Commit: 1ad9914ad6ca4b4c9b50e2da74016f744c0179b2 Parents: 08d5e14 48889d2 Author: Tyler Hobbs Authored: Tue Oct 13 11:25:54 2015 -0500 Committer: Tyler Hobbs Committed: Tue Oct 13 11:25:54 2015 -0500 -- --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f8358b8e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f8358b8e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f8358b8e Branch: refs/heads/trunk Commit: f8358b8ea7fa1f668e5b4b733e2e6ab77891a7cb Parents: fa07055 028c3f7 Author: Sylvain Lebresne Authored: Fri Oct 9 14:58:54 2015 +0200 Committer: Sylvain Lebresne Committed: Fri Oct 9 14:58:54 2015 +0200 -- .../org/apache/cassandra/db/KeyCacheTest.java | 66 ++-- 1 file changed, 60 insertions(+), 6 deletions(-) --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/991ea862 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/991ea862 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/991ea862 Branch: refs/heads/trunk Commit: 991ea8622dd5f7e886206c139f9f0a74e68f846c Parents: 787b4fc d063207 Author: Sylvain Lebresne Authored: Fri Sep 18 16:33:21 2015 +0200 Committer: Sylvain Lebresne Committed: Fri Sep 18 16:33:21 2015 +0200 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/991ea862/CHANGES.txt --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd601557 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd601557 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd601557 Branch: refs/heads/trunk Commit: bd6015572c351a4d63c6757ebf7d4b9865c3a8e1 Parents: 9967303 3355caf Author: Aleksey Yeschenko Authored: Fri Sep 18 12:44:46 2015 +0100 Committer: Aleksey Yeschenko Committed: Fri Sep 18 12:44:46 2015 +0100 -- .../locator/GossipingPropertyFileSnitch.java | 14 +- .../apache/cassandra/locator/PropertyFileSnitch.java | 14 +- .../org/apache/cassandra/locator/TokenMetadata.java | 2 ++ .../org/apache/cassandra/service/StorageService.java | 3 ++- 4 files changed, 22 insertions(+), 11 deletions(-) --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5cf5716 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5cf5716 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5cf5716 Branch: refs/heads/trunk Commit: f5cf5716789b70f47868c8b47c540068b78c6a46 Parents: 5ba0adf fde97c3 Author: Sam Tunnicliffe Authored: Wed Sep 16 17:28:24 2015 +0100 Committer: Sam Tunnicliffe Committed: Wed Sep 16 17:28:24 2015 +0100 -- ...ore-3.0.0-alpha3-8bd064d-SNAPSHOT-shaded.jar | Bin 2218913 -> 0 bytes ...ore-3.0.0-alpha3-d56dd0b-SNAPSHOT-shaded.jar | Bin 0 -> 2216851 bytes ...iver-internal-only-3.0.0a2.post0-96883eb.zip | Bin 230630 -> 0 bytes ...iver-internal-only-3.0.0a2.post0-fecbd54.zip | Bin 0 -> 230674 bytes .../org/apache/cassandra/config/CFMetaData.java | 13 +- src/java/org/apache/cassandra/cql3/Cql.g| 3 +- .../cql3/statements/AlterTableStatement.java| 23 ++-- .../cql3/statements/CreateIndexStatement.java | 38 ++ .../cql3/statements/IndexPropDefs.java | 5 + .../cassandra/cql3/statements/IndexTarget.java | 102 +--- src/java/org/apache/cassandra/index/Index.java | 13 ++ .../cassandra/index/SecondaryIndexManager.java | 19 ++- .../index/internal/CassandraIndex.java | 111 + .../apache/cassandra/schema/IndexMetadata.java | 119 ++- .../org/apache/cassandra/schema/Indexes.java| 34 -- .../cassandra/schema/LegacySchemaMigrator.java | 31 ++--- .../apache/cassandra/schema/SchemaKeyspace.java | 46 +-- .../cassandra/thrift/ThriftConversion.java | 65 +++--- .../unit/org/apache/cassandra/SchemaLoader.java | 17 ++- .../entities/FrozenCollectionsTest.java | 6 +- .../validation/entities/SecondaryIndexTest.java | 67 ++- .../org/apache/cassandra/db/CleanupTest.java| 4 +- .../apache/cassandra/db/DirectoriesTest.java| 6 +- .../apache/cassandra/db/RangeTombstoneTest.java | 16 ++- .../apache/cassandra/db/SecondaryIndexTest.java | 41 +++ .../org/apache/cassandra/index/StubIndex.java | 6 +- .../index/internal/CustomCassandraIndex.java| 93 ++- .../org/apache/cassandra/schema/DefsTest.java | 38 ++ .../schema/LegacySchemaMigratorTest.java| 12 +- 29 files changed, 494 insertions(+), 434 deletions(-) --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3ff8df0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3ff8df0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3ff8df0 Branch: refs/heads/trunk Commit: f3ff8df0543e24284806908e3861189b4c28e92a Parents: 48da81d 8134f09 Author: Aleksey Yeschenko Authored: Wed Sep 16 12:05:22 2015 +0100 Committer: Aleksey Yeschenko Committed: Wed Sep 16 12:05:22 2015 +0100 -- CHANGES.txt | 1 + .../locator/GossipingPropertyFileSnitch.java| 1 + .../cassandra/locator/PropertyFileSnitch.java | 1 + .../apache/cassandra/locator/TokenMetadata.java | 142 ++--- .../cassandra/service/StorageService.java | 16 ++ .../cassandra/locator/TokenMetadataTest.java| 213 ++- 6 files changed, 335 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3ff8df0/CHANGES.txt --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c59a352e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c59a352e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c59a352e Branch: refs/heads/trunk Commit: c59a352e1dc507a63fc741305e31e34cba50cc8b Parents: 492507d 30f39a2 Author: Sylvain Lebresne Authored: Fri Sep 11 16:49:01 2015 +0200 Committer: Sylvain Lebresne Committed: Fri Sep 11 16:49:01 2015 +0200 -- CHANGES.txt| 1 + bin/cqlsh.py | 128 +++--- pylib/cqlshlib/__init__.py | 1 - pylib/cqlshlib/cql3handling.py | 83 - pylib/cqlshlib/cqlhandling.py | 10 +- pylib/cqlshlib/displaying.py | 12 +- pylib/cqlshlib/formatting.py | 42 +++-- pylib/cqlshlib/helptopics.py | 6 +- pylib/cqlshlib/pylexotron.py | 55 +- pylib/cqlshlib/saferscanner.py | 8 +- pylib/cqlshlib/sslhandling.py | 4 +- pylib/cqlshlib/util.py | 1 + pylib/cqlshlib/wcwidth.py | 326 ++-- 13 files changed, 414 insertions(+), 263 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c59a352e/CHANGES.txt --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be7eb4a0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be7eb4a0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be7eb4a0 Branch: refs/heads/trunk Commit: be7eb4a07a42d3e6c3c52447bd692b98a47e8fca Parents: e5acb56 55fb5cd Author: Tyler Hobbs Authored: Wed Sep 9 17:18:29 2015 -0500 Committer: Tyler Hobbs Committed: Wed Sep 9 17:18:29 2015 -0500 -- CHANGES.txt | 1 + bin/cqlsh.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be7eb4a0/CHANGES.txt --
[5/5] cassandra git commit: Merge branch cassandra-3.0 into trunk
Merge branch cassandra-3.0 into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5acb560 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5acb560 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5acb560 Branch: refs/heads/trunk Commit: e5acb56043984efcc677f395087ed9b012f28ee0 Parents: c5408a3 cc0038b Author: blerer Authored: Wed Sep 9 22:22:33 2015 +0200 Committer: blerer Committed: Wed Sep 9 22:22:55 2015 +0200 -- .../validation/entities/CollectionsTest.java | 19 +++ 1 file changed, 19 insertions(+) --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c749a778 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c749a778 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c749a778 Branch: refs/heads/trunk Commit: c749a7780186c876e83df9cdf40fa62691877615 Parents: 86faf8c 6dd2413 Author: blerer Authored: Fri Sep 4 21:38:58 2015 +0200 Committer: blerer Committed: Fri Sep 4 21:39:05 2015 +0200 -- bin/cqlsh.py | 28 +++- 1 file changed, 15 insertions(+), 13 deletions(-) --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86faf8cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86faf8cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86faf8cb Branch: refs/heads/trunk Commit: 86faf8cb3ca2d193c7a5b9c2cfa2f098ff46070a Parents: 10fa329 2e3727e Author: blerer Authored: Fri Sep 4 21:13:18 2015 +0200 Committer: blerer Committed: Fri Sep 4 21:13:42 2015 +0200 -- NEWS.txt| 6 +- doc/cql3/CQL.textile| 13 +- .../cassandra/config/ColumnDefinition.java | 6 +- .../cassandra/cql3/AbstractConditions.java | 65 ++ .../apache/cassandra/cql3/ColumnConditions.java | 167 .../apache/cassandra/cql3/ColumnIdentifier.java | 56 +- .../org/apache/cassandra/cql3/Conditions.java | 100 +++ src/java/org/apache/cassandra/cql3/Cql.g| 6 +- .../cassandra/cql3/IfExistsCondition.java | 36 + .../cassandra/cql3/IfNotExistsCondition.java| 36 + src/java/org/apache/cassandra/cql3/Json.java| 36 +- .../org/apache/cassandra/cql3/Operations.java | 135 .../cassandra/cql3/SingleColumnRelation.java| 1 + .../apache/cassandra/cql3/UpdateParameters.java | 9 +- .../restrictions/StatementRestrictions.java | 246 -- .../cql3/statements/BatchStatement.java | 91 +-- .../cql3/statements/CQL3CasRequest.java | 14 +- .../cql3/statements/DeleteStatement.java| 99 +-- .../cql3/statements/ModificationStatement.java | 765 +-- .../cql3/statements/SelectStatement.java| 9 +- .../cql3/statements/StatementType.java | 138 .../cql3/statements/UpdateStatement.java| 198 +++-- .../cql3/statements/UpdatesCollector.java | 130 src/java/org/apache/cassandra/db/CBuilder.java | 9 +- .../org/apache/cassandra/db/RangeTombstone.java | 4 +- src/java/org/apache/cassandra/db/Slices.java| 9 + .../cassandra/io/sstable/CQLSSTableWriter.java | 7 +- .../cassandra/cql3/MaterializedViewTest.java| 33 + .../cql3/validation/entities/UFAuthTest.java| 8 +- .../entities/UFIdentificationTest.java | 44 +- .../cql3/validation/operations/BatchTest.java | 79 +- .../cql3/validation/operations/DeleteTest.java | 681 - .../cql3/validation/operations/InsertTest.java | 233 ++ .../operations/InsertUpdateIfConditionTest.java | 28 +- .../cql3/validation/operations/UpdateTest.java | 447 +++ .../cassandra/db/RangeTombstoneListTest.java| 222 +- 36 files changed, 3384 insertions(+), 782 deletions(-) --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5c721d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5c721d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5c721d1 Branch: refs/heads/trunk Commit: c5c721d182efb74496a3a1bf68fd7275a6961cb5 Parents: 1c310a6 eb01654 Author: Tyler Hobbs Authored: Thu Sep 3 15:05:59 2015 -0500 Committer: Tyler Hobbs Committed: Thu Sep 3 15:05:59 2015 -0500 -- --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/829b9b78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/829b9b78 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/829b9b78 Branch: refs/heads/trunk Commit: 829b9b78c04d0645b1f3e842de68ca598c5e1250 Parents: 966bea7 e9c0e17 Author: Joshua McKenzie Authored: Thu Sep 3 12:42:30 2015 -0400 Committer: Joshua McKenzie Committed: Thu Sep 3 12:42:30 2015 -0400 -- CHANGES.txt | 1 + bin/cassandra.bat | 2 +- conf/cassandra-env.ps1| 4 ++-- src/java/org/apache/cassandra/db/ReadCommand.java | 9 - 4 files changed, 4 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/829b9b78/CHANGES.txt --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae7afb7a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae7afb7a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae7afb7a Branch: refs/heads/trunk Commit: ae7afb7a8fee7ed65af515a8f05ee1755f43b827 Parents: 05caec7 0828e24 Author: Robert Stupp Authored: Mon Aug 31 11:07:39 2015 +0200 Committer: Robert Stupp Committed: Mon Aug 31 11:07:39 2015 +0200 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae7afb7a/CHANGES.txt --
[5/5] cassandra git commit: Merge branch cassandra-3.0 into trunk
Merge branch cassandra-3.0 into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74f4bc33 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74f4bc33 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74f4bc33 Branch: refs/heads/trunk Commit: 74f4bc331fa8e4f9b417fb961dc5bd208b9088a1 Parents: 0f980e5 c1740a2 Author: blerer Authored: Wed Aug 26 15:26:17 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:31:22 2015 +0200 -- CHANGES.txt | 1 + conf/cassandra.yaml | 4 ++-- src/java/org/apache/cassandra/config/Config.java | 2 +- .../org/apache/cassandra/serializers/MapSerializer.java | 11 --- .../org/apache/cassandra/serializers/SetSerializer.java | 3 +-- 5 files changed, 5 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/74f4bc33/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/74f4bc33/src/java/org/apache/cassandra/config/Config.java --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/171889c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/171889c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/171889c8 Branch: refs/heads/trunk Commit: 171889c803545ee81ec7a723d048f2ed13dfb9f7 Parents: 14dcc48 df52cd6 Author: Marcus Eriksson Authored: Thu Aug 20 18:16:16 2015 +0200 Committer: Marcus Eriksson Committed: Thu Aug 20 18:16:16 2015 +0200 -- doc/cql3/CQL.textile | 29 - 1 file changed, 16 insertions(+), 13 deletions(-) --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cabdb03a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cabdb03a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cabdb03a Branch: refs/heads/trunk Commit: cabdb03a9f63a05d1f6e3b27fafde8b2e6385c23 Parents: b83b674 96d41f0 Author: Aleksey Yeschenko Authored: Wed Aug 19 17:30:00 2015 +0300 Committer: Aleksey Yeschenko Committed: Wed Aug 19 17:30:00 2015 +0300 -- CHANGES.txt | 1 + NEWS.txt| 9 +- conf/cassandra.yaml | 13 + .../org/apache/cassandra/config/Config.java | 7 +- .../cassandra/config/DatabaseDescriptor.java| 51 +- .../apache/cassandra/db/BatchlogManager.java| 84 ++- .../cassandra/db/HintedHandOffManager.java | 543 +-- .../cassandra/db/HintedHandOffManagerMBean.java | 1 + src/java/org/apache/cassandra/db/Mutation.java | 33 +- .../org/apache/cassandra/db/SystemKeyspace.java | 31 +- .../cassandra/db/commitlog/CommitLog.java | 20 +- src/java/org/apache/cassandra/gms/Gossiper.java | 14 + .../cassandra/hints/ChecksummedDataInput.java | 114 .../cassandra/hints/EncodedHintMessage.java | 89 +++ src/java/org/apache/cassandra/hints/Hint.java | 130 + .../org/apache/cassandra/hints/HintMessage.java | 130 + .../apache/cassandra/hints/HintResponse.java| 58 ++ .../apache/cassandra/hints/HintVerbHandler.java | 89 +++ .../org/apache/cassandra/hints/HintsBuffer.java | 261 + .../apache/cassandra/hints/HintsBufferPool.java | 120 .../apache/cassandra/hints/HintsCatalog.java| 128 + .../apache/cassandra/hints/HintsDescriptor.java | 242 + .../cassandra/hints/HintsDispatchExecutor.java | 199 +++ .../cassandra/hints/HintsDispatchTrigger.java | 85 +++ .../apache/cassandra/hints/HintsDispatcher.java | 228 .../org/apache/cassandra/hints/HintsReader.java | 312 +++ .../apache/cassandra/hints/HintsService.java| 291 ++ .../cassandra/hints/HintsServiceMBean.java | 43 ++ .../org/apache/cassandra/hints/HintsStore.java | 210 +++ .../cassandra/hints/HintsWriteExecutor.java | 235 .../org/apache/cassandra/hints/HintsWriter.java | 272 ++ .../cassandra/hints/LegacyHintsMigrator.java| 243 + .../apache/cassandra/hints/package-info.java| 44 ++ .../cassandra/metrics/HintedHandoffMetrics.java | 3 +- .../cassandra/metrics/HintsServiceMetrics.java | 25 + .../apache/cassandra/net/MessagingService.java | 9 +- .../cassandra/service/CassandraDaemon.java | 4 + .../apache/cassandra/service/StartupChecks.java | 43 +- .../apache/cassandra/service/StorageProxy.java | 209 +++ .../cassandra/service/StorageService.java | 68 ++- .../org/apache/cassandra/tools/NodeProbe.java | 2 +- .../org/apache/cassandra/utils/FBUtilities.java | 32 +- .../org/apache/cassandra/utils/Throwables.java | 90 ++- test/conf/cassandra.yaml| 1 + .../cassandra/hints/HintsWriteThenReadTest.java | 191 +++ .../OffsetAwareConfigurationLoader.java | 1 + .../apache/cassandra/db/HintedHandOffTest.java | 150 - .../cassandra/db/commitlog/CommitLogTest.java | 4 +- .../hints/ChecksummedDataInputTest.java | 112 .../apache/cassandra/hints/HintMessageTest.java | 79 +++ .../org/apache/cassandra/hints/HintTest.java| 231 .../apache/cassandra/hints/HintsBufferTest.java | 236 .../cassandra/hints/HintsCatalogTest.java | 88 +++ .../cassandra/hints/HintsDescriptorTest.java| 153 ++ .../apache/cassandra/hints/HintsTestUtil.java | 60 ++ .../hints/LegacyHintsMigratorTest.java | 195 +++ .../metrics/HintedHandOffMetricsTest.java | 56 ++ .../cassandra/service/StorageProxyTest.java | 3 +- 58 files changed, 5468 insertions(+), 907 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cabdb03a/CHANGES.txt -- diff --cc CHANGES.txt index eba9e36,0d17235..a78a19c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ +3.2 + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0.0-beta1 + * Rewrite hinted handoff (CASSANDRA-6230) * Fix query on static compact tables (CASSANDRA-10093) * Fix race during construction of commit log (CASSANDRA-10049) * Add option to only purge repaired tombstones (CASSANDRA-6434) http://git-wip-us.apache.org/repos/asf/cassandra/blob/cabdb03a/src/java/org/apache/cassandra/config/Config.java
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91e3d342 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91e3d342 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91e3d342 Branch: refs/heads/trunk Commit: 91e3d34210e593f3ae03070865d1f346f3b3bac7 Parents: 30a704e 6c69f07 Author: Marcus Eriksson Authored: Tue Aug 18 10:59:53 2015 +0200 Committer: Marcus Eriksson Committed: Tue Aug 18 10:59:53 2015 +0200 -- .../DateTieredCompactionStrategy.java | 7 +++ .../DateTieredCompactionStrategyOptions.java| 21 .../DateTieredCompactionStrategyTest.java | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8537 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8537 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8537 Branch: refs/heads/trunk Commit: 8537932d5ea0e3c41a562f848e6ce84526cb Parents: 35b2ec4 d2da760 Author: Benedict Elliott Smith Authored: Mon Aug 17 09:53:26 2015 +0100 Committer: Benedict Elliott Smith Committed: Mon Aug 17 09:53:26 2015 +0100 -- NEWS.txt | 3 +++ 1 file changed, 3 insertions(+) --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ae27a32 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ae27a32 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ae27a32 Branch: refs/heads/trunk Commit: 6ae27a320b79cd41c010d92b1656b6ae3b7a134f Parents: c41412a 136e700 Author: Marcus Eriksson Authored: Mon Aug 17 08:50:49 2015 +0200 Committer: Marcus Eriksson Committed: Mon Aug 17 08:50:49 2015 +0200 -- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 48 +--- .../DateTieredCompactionStrategy.java | 13 +- .../DateTieredCompactionStrategyTest.java | 1 + 4 files changed, 54 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ae27a32/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ae27a32/src/java/org/apache/cassandra/db/ColumnFamilyStore.java --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e8741f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e8741f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e8741f2 Branch: refs/heads/trunk Commit: 9e8741f28fbb27803d0cf95bbe34621f2ede80c6 Parents: b1c7398 213aab8 Author: Marcus Eriksson Authored: Tue Aug 11 10:22:03 2015 +0200 Committer: Marcus Eriksson Committed: Tue Aug 11 10:22:03 2015 +0200 -- CHANGES.txt | 1 + .../cassandra/tools/SSTableExpiredBlockers.java | 136 +++ .../cassandra/db/compaction/TTLExpiryTest.java | 32 + tools/bin/sstableexpiredblockers| 54 tools/bin/sstableexpiredblockers.bat| 23 5 files changed, 246 insertions(+) --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8e00295 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8e00295 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8e00295 Branch: refs/heads/trunk Commit: a8e00295923f5d72cee6783b1e06cecbba8ba0a6 Parents: 85098de 10e4781 Author: Tyler Hobbs Authored: Fri Aug 7 15:35:36 2015 -0500 Committer: Tyler Hobbs Committed: Fri Aug 7 15:35:36 2015 -0500 -- CHANGES.txt | 2 ++ bin/cqlsh.py | 9 - 2 files changed, 10 insertions(+), 1 deletion(-) --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf8ac1ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf8ac1ac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf8ac1ac Branch: refs/heads/trunk Commit: bf8ac1acdd233cf609574c523d2b5f25fff1234b Parents: 0bfc642 ef59624 Author: Benedict Elliott Smith Authored: Thu Aug 6 16:08:27 2015 +0200 Committer: Benedict Elliott Smith Committed: Thu Aug 6 16:08:27 2015 +0200 -- --
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0bfc6423 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0bfc6423 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0bfc6423 Branch: refs/heads/trunk Commit: 0bfc6423c2ae6b11a76221943844fba67faa0d0c Parents: fe8fbc8 0dd50a6 Author: Jonathan Ellis Authored: Thu Aug 6 08:28:38 2015 -0500 Committer: Jonathan Ellis Committed: Thu Aug 6 08:28:38 2015 -0500 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 19 +- .../compaction/CompactionStrategyManager.java | 24 +- .../apache/cassandra/net/MessagingService.java | 6 + .../org/apache/cassandra/repair/RepairJob.java | 17 +- .../apache/cassandra/repair/RepairJobDesc.java | 41 +- .../repair/RepairMessageVerbHandler.java| 4 +- .../apache/cassandra/repair/RepairRunnable.java | 45 +- .../apache/cassandra/repair/RepairSession.java | 48 +- .../cassandra/repair/RepairSessionResult.java | 6 +- .../org/apache/cassandra/repair/SyncTask.java | 6 +- .../repair/SystemDistributedKeyspace.java | 27 +- .../apache/cassandra/repair/TreeResponse.java | 8 +- .../apache/cassandra/repair/ValidationTask.java | 14 +- .../org/apache/cassandra/repair/Validator.java | 83 +-- .../repair/messages/ValidationComplete.java | 47 +- .../cassandra/service/ActiveRepairService.java | 4 +- .../org/apache/cassandra/utils/MerkleTrees.java | 434 +++ .../serialization/3.0/gms.EndpointState.bin | Bin 0 -> 73 bytes test/data/serialization/3.0/gms.Gossip.bin | Bin 0 -> 158 bytes .../serialization/3.0/service.SyncComplete.bin | Bin 0 -> 362 bytes .../serialization/3.0/service.SyncRequest.bin | Bin 0 -> 219 bytes .../3.0/service.ValidationComplete.bin | Bin 0 -> 1251 bytes .../3.0/service.ValidationRequest.bin | Bin 0 -> 167 bytes .../cassandra/AbstractSerializationsTester.java | 3 +- .../LeveledCompactionStrategyTest.java | 2 +- .../cassandra/repair/LocalSyncTaskTest.java | 23 +- .../cassandra/repair/RepairSessionTest.java | 3 +- .../apache/cassandra/repair/ValidatorTest.java | 19 +- .../cassandra/service/SerializationsTest.java | 28 +- .../apache/cassandra/utils/MerkleTreeTest.java | 1 - .../apache/cassandra/utils/MerkleTreesTest.java | 538 +++ 32 files changed, 1256 insertions(+), 195 deletions(-) --
