[6/6] 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/5e59b238 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e59b238 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e59b238 Branch: refs/heads/trunk Commit: 5e59b238fb7f36a835e6aa22cdc8df635a25abd8 Parents: e7fb063 9dd805d Author: Michael Shuler Authored: Wed Sep 28 13:11:21 2016 -0500 Committer: Michael Shuler Committed: Wed Sep 28 13:11:21 2016 -0500 -- --
[6/6] 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/bddfd643 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bddfd643 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bddfd643 Branch: refs/heads/trunk Commit: bddfd643b0d1ccebf129a10fa0e0a60289c9dea0 Parents: c92928b 405a828 Author: Michael Shuler Authored: Fri Sep 23 16:44:23 2016 -0500 Committer: Michael Shuler Committed: Fri Sep 23 16:44:23 2016 -0500 -- --
[6/6] 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/703506c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/703506c3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/703506c3 Branch: refs/heads/trunk Commit: 703506c3c7f42da49f56421467533471b0c6ddda Parents: 81fd9c6 82d1600 Author: Aleksey Yeschenko Authored: Wed Sep 21 18:14:58 2016 -0700 Committer: Aleksey Yeschenko Committed: Wed Sep 21 18:15:48 2016 -0700 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/gms/Gossiper.java| 4 ++-- .../apache/cassandra/service/StorageService.java | 17 ++--- 3 files changed, 17 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/703506c3/CHANGES.txt -- diff --cc CHANGES.txt index d6fcab8,0524e49..df3c775 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -82,56 -29,12 +82,57 @@@ 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) + * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499) +Merged from 2.2: ++ * Fix exceptions when enabling gossip on nodes that haven't joined the ring (CASSANDRA-12253) + * Fix authentication problem when invoking clqsh copy from a SOURCE command (CASSANDRA-12642) + * Decrement pending range calculator jobs counter in finally block + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481) + * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523) + * Fail repair on non-existing table (CASSANDRA-12279) + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522) + + +3.8, 3.9 + * Fix value skipping with counter columns (CASSANDRA-11726) + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205) + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236) + * Fix hdr logging for single operation workloads (CASSANDRA-12145) + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034) + * Improve details in compaction log message (CASSANDRA-12080) + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911) + * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993) + * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579) + * Move skip_stop_words filter before stemming (CASSANDRA-12078) + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957) + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966) + * Add cross-DC latency metrics (CASSANDRA-11596) + * Allow terms in selection clause (CASSANDRA-10783) + * Add bind variables to trace (CASSANDRA-11719) + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) + * Add Change-Data-Capture (CASSANDRA-8844) +Merged from 3.0: + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195) * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) - * Backport CASSANDRA-12002 (CASSANDRA-12177) * Make su
[6/6] 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/81fd9c6c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81fd9c6c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81fd9c6c Branch: refs/heads/trunk Commit: 81fd9c6c2beadf69df670ce611fc1ca706aae7ec Parents: 91180ed 47b50b4 Author: Stefania Alborghetti Authored: Thu Sep 22 09:01:52 2016 +0800 Committer: Stefania Alborghetti Committed: Thu Sep 22 09:01:52 2016 +0800 -- CHANGES.txt | 1 + bin/cqlsh.py | 18 -- 2 files changed, 13 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/81fd9c6c/CHANGES.txt -- diff --cc CHANGES.txt index 98e4f78,d9db977..d6fcab8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -82,55 -28,12 +82,56 @@@ 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) + * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499) +Merged from 2.2: ++ * Fix authentication problem when invoking clqsh copy from a SOURCE command (CASSANDRA-12642) + * Decrement pending range calculator jobs counter in finally block + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481) + * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523) + * Fail repair on non-existing table (CASSANDRA-12279) + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522) + + +3.8, 3.9 + * Fix value skipping with counter columns (CASSANDRA-11726) + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205) + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236) + * Fix hdr logging for single operation workloads (CASSANDRA-12145) + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034) + * Improve details in compaction log message (CASSANDRA-12080) + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911) + * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993) + * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579) + * Move skip_stop_words filter before stemming (CASSANDRA-12078) + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957) + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966) + * Add cross-DC latency metrics (CASSANDRA-11596) + * Allow terms in selection clause (CASSANDRA-10783) + * Add bind variables to trace (CASSANDRA-11719) + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) + * Add Change-Data-Capture (CASSANDRA-8844) +Merged from 3.0: + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195) * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) - * Backport CASSANDRA-12002 (CASSANDRA-12177) * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) - * Fix potential bad messaging service message for paged range reads - within mixed-version 3.x clusters (CASSANDRA-12249) * Change commitl
[6/6] 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/e7b278a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7b278a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7b278a4 Branch: refs/heads/trunk Commit: e7b278a45dad4dae292ff837b6e89c3c63e281e1 Parents: bcd274f fc1cbde Author: Tyler Hobbs Authored: Wed Sep 21 13:55:01 2016 -0500 Committer: Tyler Hobbs Committed: Wed Sep 21 13:55:01 2016 -0500 -- CHANGES.txt | 1 + .../service/PendingRangeCalculatorService.java| 18 +++--- 2 files changed, 12 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7b278a4/CHANGES.txt -- diff --cc CHANGES.txt index f49171e,b873eb1..d72ea79 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -81,54 -26,12 +81,55 @@@ 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) + * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499) +Merged from 2.2: ++ * Decrement pending range calculator jobs counter in finally block + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481) + * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523) + * Fail repair on non-existing table (CASSANDRA-12279) + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522) + + +3.8, 3.9 + * Fix value skipping with counter columns (CASSANDRA-11726) + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205) + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236) + * Fix hdr logging for single operation workloads (CASSANDRA-12145) + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034) + * Improve details in compaction log message (CASSANDRA-12080) + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911) + * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993) + * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579) + * Move skip_stop_words filter before stemming (CASSANDRA-12078) + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957) + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966) + * Add cross-DC latency metrics (CASSANDRA-11596) + * Allow terms in selection clause (CASSANDRA-10783) + * Add bind variables to trace (CASSANDRA-11719) + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) + * Add Change-Data-Capture (CASSANDRA-8844) +Merged from 3.0: + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195) * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) - * Backport CASSANDRA-12002 (CASSANDRA-12177) * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) - * Fix potential bad messaging service message for paged range reads - within mixed-version 3.x clusters (CASSANDRA-12249) * Change commitlog and sstables to track dirty and clean i
[6/6] 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/98958375 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98958375 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98958375 Branch: refs/heads/trunk Commit: 9895837557137b96bb12d371e42138770539e82d Parents: 262f167 cded276 Author: Carl Yeksigian Authored: Thu Sep 1 17:12:43 2016 -0400 Committer: Carl Yeksigian Committed: Thu Sep 1 17:12:43 2016 -0400 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/98958375/CHANGES.txt -- diff --cc CHANGES.txt index af4bda5,5cf351a..2f8ee61 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,62 -1,4 +1,61 @@@ -3.0.9 +3.10 - * Add local address entry in PropertyFileSnitch (CASSANDRA-11332) + * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567) + * Add keep-alive to streaming (CASSANDRA-11841) + * Tracing payload is passed through newSession(..) (CASSANDRA-11706) + * avoid deleting non existing sstable files and improve related log messages (CASSANDRA-12261) + * json/yaml output format for nodetool compactionhistory (CASSANDRA-12486) + * Retry all internode messages once after a connection is + closed and reopened (CASSANDRA-12192) + * Add support to rebuild from targeted replica (CASSANDRA-9875) + * Add sequence distribution type to cassandra stress (CASSANDRA-12490) + * "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, 12550) + * 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
[6/6] 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/45f96c86 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45f96c86 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45f96c86 Branch: refs/heads/trunk Commit: 45f96c86e640ed9694c4341cb82788e669ae655c Parents: ce84226 20dd606 Author: Stefania Alborghetti Authored: Thu Sep 1 10:22:01 2016 +0800 Committer: Stefania Alborghetti Committed: Thu Sep 1 10:22:01 2016 +0800 -- CHANGES.txt| 1 + pylib/cqlshlib/test/cassconnect.py | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45f96c86/CHANGES.txt -- diff --cc CHANGES.txt index 66b6d1d,0d425d6..1d26edf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -66,51 -10,12 +66,52 @@@ 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) +Merged from 2.2: ++ * cqlshlib tests: increase default execute timeout (CASSANDRA-12481) + * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523) + * Fail repair on non-existing table (CASSANDRA-12279) + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522) + + +3.8, 3.9 + * Fix value skipping with counter columns (CASSANDRA-11726) + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205) + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236) + * Fix hdr logging for single operation workloads (CASSANDRA-12145) + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034) + * Improve details in compaction log message (CASSANDRA-12080) + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911) + * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993) + * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579) + * Move skip_stop_words filter before stemming (CASSANDRA-12078) + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957) + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966) + * Add cross-DC latency metrics (CASSANDRA-11596) + * Allow terms in selection clause (CASSANDRA-10783) + * Add bind variables to trace (CASSANDRA-11719) + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) + * Add Change-Data-Capture (CASSANDRA-8844) +Merged from 3.0: * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) - * Backport CASSANDRA-12002 (CASSANDRA-12177) * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) - * Fix potential bad messaging service message for paged range reads - within mixed-version 3.x clusters (CASSANDRA-12249) * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828) * NullPointerException during compaction on table with static columns (CASSANDRA-12336) * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823) http://git-wip-us.apache.org/repos/asf/cassandra
[6/6] 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/0cd48f76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cd48f76 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cd48f76 Branch: refs/heads/trunk Commit: 0cd48f76d8744d9bdabc65b6218bb82ff9014cb3 Parents: 8a3f0e1 e4a53f4 Author: Aleksey Yeschenko Authored: Wed Aug 31 20:26:39 2016 +0100 Committer: Aleksey Yeschenko Committed: Wed Aug 31 20:27:53 2016 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 5 +- .../apache/cassandra/gms/VersionedValue.java| 6 + .../apache/cassandra/locator/TokenMetadata.java | 52 +- .../cassandra/service/LoadBroadcaster.java | 2 +- .../cassandra/service/StorageService.java | 182 ++- 6 files changed, 197 insertions(+), 51 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cd48f76/CHANGES.txt -- diff --cc CHANGES.txt index a0f6055,30931d3..0edfc76 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -64,50 -9,12 +64,51 @@@ 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) +Merged from 2.2: ++ * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523) + * Fail repair on non-existing table (CASSANDRA-12279) + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522) + + +3.8, 3.9 + * Fix value skipping with counter columns (CASSANDRA-11726) + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205) + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236) + * Fix hdr logging for single operation workloads (CASSANDRA-12145) + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034) + * Improve details in compaction log message (CASSANDRA-12080) + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911) + * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993) + * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579) + * Move skip_stop_words filter before stemming (CASSANDRA-12078) + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957) + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966) + * Add cross-DC latency metrics (CASSANDRA-11596) + * Allow terms in selection clause (CASSANDRA-10783) + * Add bind variables to trace (CASSANDRA-11719) + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) + * Add Change-Data-Capture (CASSANDRA-8844) +Merged from 3.0: * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) - * Backport CASSANDRA-12002 (CASSANDRA-12177) * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) - * Fix potential bad messaging service message for paged range reads - within mixed-version 3.x clusters (CASSANDRA-12249) * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828) * NullPointerExce
[6/6] 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/a214e182 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a214e182 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a214e182 Branch: refs/heads/trunk Commit: a214e18284217884c2f5c4a80b9550e3b650da47 Parents: 3f97744 3483418 Author: Aleksey Yeschenko Authored: Tue Aug 30 16:55:27 2016 +0100 Committer: Aleksey Yeschenko Committed: Tue Aug 30 16:55:27 2016 +0100 -- CHANGES.txt | 1 + .../cassandra/repair/messages/RepairOption.java | 6 +- .../cassandra/service/StorageService.java | 2 +- .../repair/messages/RepairOptionTest.java | 20 4 files changed, 27 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a214e182/CHANGES.txt -- diff --cc CHANGES.txt index cad06bf,5349c14..6b1acb5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -63,49 -8,12 +63,50 @@@ 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) +Merged from 2.2: + * Fail repair on non-existing table (CASSANDRA-12279) ++ * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522) + + +3.8, 3.9 + * Fix value skipping with counter columns (CASSANDRA-11726) + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205) + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236) + * Fix hdr logging for single operation workloads (CASSANDRA-12145) + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034) + * Improve details in compaction log message (CASSANDRA-12080) + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911) + * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993) + * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579) + * Move skip_stop_words filter before stemming (CASSANDRA-12078) + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957) + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966) + * Add cross-DC latency metrics (CASSANDRA-11596) + * Allow terms in selection clause (CASSANDRA-10783) + * Add bind variables to trace (CASSANDRA-11719) + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) + * Add Change-Data-Capture (CASSANDRA-8844) +Merged from 3.0: * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) - * Backport CASSANDRA-12002 (CASSANDRA-12177) * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) - * Fix potential bad messaging service message for paged range reads - within mixed-version 3.x clusters (CASSANDRA-12249) * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828) * NullPointerException during compaction on table with static columns (CASSANDRA-12336) * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823) http://git-wip-us.apache.org/repos/asf/cassa
[6/6] 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/3f977440 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f977440 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f977440 Branch: refs/heads/trunk Commit: 3f9774403893f49780b97d50dd0959e6e67dee03 Parents: f629808 8303fd1 Author: Aleksey Yeschenko Authored: Tue Aug 30 16:34:25 2016 +0100 Committer: Aleksey Yeschenko Committed: Tue Aug 30 16:37:46 2016 +0100 -- CHANGES.txt | 2 ++ .../org/apache/cassandra/repair/RepairRunnable.java | 16 +--- 2 files changed, 15 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f977440/CHANGES.txt -- diff --cc CHANGES.txt index 2135173,fcbf1e4..cad06bf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -63,47 -8,12 +63,49 @@@ 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) ++Merged from 2.2: ++ * Fail repair on non-existing table (CASSANDRA-12279) + + +3.8, 3.9 + * Fix value skipping with counter columns (CASSANDRA-11726) + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205) + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236) + * Fix hdr logging for single operation workloads (CASSANDRA-12145) + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034) + * Improve details in compaction log message (CASSANDRA-12080) + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911) + * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993) + * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579) + * Move skip_stop_words filter before stemming (CASSANDRA-12078) + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957) + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966) + * Add cross-DC latency metrics (CASSANDRA-11596) + * Allow terms in selection clause (CASSANDRA-10783) + * Add bind variables to trace (CASSANDRA-11719) + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) + * Add Change-Data-Capture (CASSANDRA-8844) +Merged from 3.0: * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) - * Backport CASSANDRA-12002 (CASSANDRA-12177) * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) - * Fix potential bad messaging service message for paged range reads - within mixed-version 3.x clusters (CASSANDRA-12249) * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828) * NullPointerException during compaction on table with static columns (CASSANDRA-12336) * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f977440/src/java/org/apache/cassandra/repair/RepairRunnable.java --
[6/6] 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/03659d7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03659d7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03659d7b Branch: refs/heads/trunk Commit: 03659d7b944701964e6f6657830ca96e4f47149e Parents: fdfc2d8 431ecdb Author: Stefania Alborghetti Authored: Thu Aug 25 09:11:01 2016 +0800 Committer: Stefania Alborghetti Committed: Thu Aug 25 09:11:01 2016 +0800 -- CHANGES.txt| 1 + pylib/cqlshlib/copyutil.py | 16 +--- 2 files changed, 14 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03659d7b/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03659d7b/pylib/cqlshlib/copyutil.py --
[6/6] 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/732b1018 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/732b1018 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/732b1018 Branch: refs/heads/trunk Commit: 732b1018354c548fab5e3044b5df8dcdde7a5927 Parents: 824cb76 407dc30 Author: Tyler Hobbs Authored: Wed Aug 24 16:52:47 2016 -0500 Committer: Tyler Hobbs Committed: Wed Aug 24 16:52:47 2016 -0500 -- --
[6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk * cassandra-3.0: Allow nodetool info to run with readonly JMX access Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/46570239 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46570239 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46570239 Branch: refs/heads/trunk Commit: 465702399c064ede65e42a08be5f29103cb16b57 Parents: c310add 0d7eb18 Author: Sylvain Lebresne Authored: Thu Jun 23 11:13:03 2016 +0200 Committer: Sylvain Lebresne Committed: Thu Jun 23 11:13:03 2016 +0200 -- CHANGES.txt | 1 + .../cassandra/locator/EndpointSnitchInfo.java | 11 +++ .../locator/EndpointSnitchInfoMBean.java | 9 + .../org/apache/cassandra/tools/NodeProbe.java | 18 ++ 4 files changed, 23 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46570239/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46570239/src/java/org/apache/cassandra/tools/NodeProbe.java --
[6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk * cassandra-3.0: Fix CompressorTest on non-x86 environment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/233c0306 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/233c0306 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/233c0306 Branch: refs/heads/trunk Commit: 233c030662e365441434dba7144684ffd5925908 Parents: 0ebc0e4 d354ddc Author: Sylvain Lebresne Authored: Thu Jun 23 10:46:39 2016 +0200 Committer: Sylvain Lebresne Committed: Thu Jun 23 10:46:39 2016 +0200 -- test/unit/org/apache/cassandra/io/compress/CompressorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[6/6] 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/5382f4ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5382f4ec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5382f4ec Branch: refs/heads/trunk Commit: 5382f4ec39e45b4b1c01df5d8fe8019ddcead4ac Parents: fb781c9 b657223 Author: Stefania Alborghetti Authored: Tue Jun 21 08:37:08 2016 +0200 Committer: Stefania Alborghetti Committed: Tue Jun 21 08:37:08 2016 +0200 -- --
[6/6] 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/88229a47 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88229a47 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88229a47 Branch: refs/heads/trunk Commit: 88229a47a847532d04041047d2db40411d04f49b Parents: 0e9d6bf 0a0e97d Author: Sam Tunnicliffe Authored: Mon Jun 20 14:19:27 2016 +0100 Committer: Sam Tunnicliffe Committed: Mon Jun 20 14:19:27 2016 +0100 -- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 123 +++ .../org/apache/cassandra/transport/Server.java | 22 ++-- 3 files changed, 36 insertions(+), 110 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/88229a47/CHANGES.txt -- diff --cc CHANGES.txt index a0f7c56,7873742..d09cd5a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,7 +1,24 @@@ -3.0.8 +3.8 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002) + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966) + * Add cross-DC latency metrics (CASSANDRA-11596) + * Allow terms in selection clause (CASSANDRA-10783) + * Add bind variables to trace (CASSANDRA-11719) + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) + * Add Change-Data-Capture (CASSANDRA-8844) +Merged from 3.0: * Add TimeWindowCompactionStrategy (CASSANDRA-9666) Merged from 2.2: + * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038) * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984) Merged from 2.1: * Cache local ranges when calculating repair neighbors (CASSANDRA-11934) http://git-wip-us.apache.org/repos/asf/cassandra/blob/88229a47/src/java/org/apache/cassandra/service/StorageService.java -- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 334d251,394220d..dda2320 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -28,22 -24,11 +24,13 @@@ import java.net.UnknownHostException import java.nio.ByteBuffer; import java.util.*; import java.util.Map.Entry; - import java.util.concurrent.CopyOnWriteArrayList; - import java.util.concurrent.ExecutionException; - import java.util.concurrent.ExecutorService; - import java.util.concurrent.Future; - import java.util.concurrent.FutureTask; - import java.util.concurrent.TimeUnit; - import java.util.concurrent.TimeoutException; + import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import java.util.regex.MatchResult; +import java.util.regex.Pattern; import javax.annotation.Nullable; - import javax.management.JMX; - import javax.management.MBeanServer; - import javax.management.NotificationBroadcasterSupport; - import javax.management.ObjectName; + import javax.management.*; import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; http://git-wip-us.apache.org/repos/asf/cassandra/blob/88229a47/src/java/org/apache/cassandra/transport/Server.java --
[6/6] 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/6c9c0911 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c9c0911 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c9c0911 Branch: refs/heads/trunk Commit: 6c9c0911852c6d198c52d89d1fdb7da8036ef44d Parents: 0ff8ab0 dbc40b1 Author: Josh McKenzie Authored: Fri Jun 17 12:50:24 2016 -0400 Committer: Josh McKenzie Committed: Fri Jun 17 12:50:24 2016 -0400 -- test/unit/org/apache/cassandra/db/marshal/TimeTypeTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --
[6/6] 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/f0613bf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0613bf6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0613bf6 Branch: refs/heads/trunk Commit: f0613bf6dafe405b5f65f56e436df1959172c245 Parents: 9530b27 c59897b Author: Stefania Alborghetti Authored: Fri Jun 10 15:18:58 2016 -0500 Committer: Stefania Alborghetti Committed: Fri Jun 10 15:18:58 2016 -0500 -- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0613bf6/CHANGES.txt -- diff --cc CHANGES.txt index 309a48d,fd2fe79..d699f93 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,9 +1,24 @@@ -3.0.8 +3.8 + * Add bind variables to trace (CASSANDRA-11719) + * Switch counter shards' clock to timestamps (CASSANDRA-9811) + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853) + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718) + * Support older ant versions (CASSANDRA-11807) + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623) + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546) + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578) + * Faster streaming (CASSANDRA-9766) + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425) + * Add repaired percentage metric (CASSANDRA-11503) +Merged from 3.0: * Add TimeWindowCompactionStrategy (CASSANDRA-9666) - + Merged from 2.2: + * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984) -3.0.7 +3.7 + * Support multiple folders for user defined compaction tasks (CASSANDRA-11765) + * Fix race in CompactionStrategyManager's pause/resume (CASSANDRA-11922) +Merged from 3.0: * Fix legacy serialization of Thrift-generated non-compound range tombstones when communicating with 2.x nodes (CASSANDRA-11930) * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0613bf6/src/java/org/apache/cassandra/service/StorageService.java --
[6/6] 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/bc784668 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc784668 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc784668 Branch: refs/heads/trunk Commit: bc7846680e82b2c728adbc1f35e11c09c659dd33 Parents: 5bdf318 5a5d0a1 Author: Benedict Elliott Smith Authored: Wed May 18 21:51:57 2016 +0100 Committer: Benedict Elliott Smith Committed: Wed May 18 21:51:57 2016 +0100 -- .../apache/cassandra/db/ColumnFamilyStore.java | 41 +--- 1 file changed, 19 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc784668/src/java/org/apache/cassandra/db/ColumnFamilyStore.java --
[6/6] 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/0e5f2c80 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e5f2c80 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e5f2c80 Branch: refs/heads/trunk Commit: 0e5f2c807cfaf8c308ae01b8ef1a65915220c578 Parents: 5b85022 943e732 Author: Sam Tunnicliffe Authored: Fri Apr 29 11:55:33 2016 +0100 Committer: Sam Tunnicliffe Committed: Fri Apr 29 11:59:02 2016 +0100 -- CHANGES.txt | 1 + .../validation/operations/SelectSingleColumnRelationTest.java| 4 2 files changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e5f2c80/CHANGES.txt --
[6/6] 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/0e52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e52 Branch: refs/heads/trunk Commit: 0e524eaf71cad06407685dd8b947aac2179e Parents: 29d4a82 8bfe09f Author: Marcus Eriksson Authored: Wed Apr 27 10:11:08 2016 +0200 Committer: Marcus Eriksson Committed: Wed Apr 27 10:11:08 2016 +0200 -- CHANGES.txt | 1 + .../apache/cassandra/db/compaction/CompactionManager.java| 8 2 files changed, 1 insertion(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e52/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e52/src/java/org/apache/cassandra/db/compaction/CompactionManager.java --
[6/6] 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/bc8a56d2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc8a56d2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc8a56d2 Branch: refs/heads/trunk Commit: bc8a56d24da4c5e851952dfcd422d34c6130ce0d Parents: ef5bbed caae987 Author: Sam Tunnicliffe Authored: Thu Apr 21 18:44:39 2016 +0100 Committer: Sam Tunnicliffe Committed: Thu Apr 21 18:44:39 2016 +0100 -- --
[6/6] 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/2b08690d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b08690d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b08690d Branch: refs/heads/trunk Commit: 2b08690deffce2b0b297e8638eb7961903ab4b46 Parents: 95d927d c568efe Author: Stefania Alborghetti Authored: Thu Apr 21 09:46:36 2016 +0800 Committer: Stefania Alborghetti Committed: Thu Apr 21 09:48:22 2016 +0800 -- CHANGES.txt| 1 + pylib/cqlshlib/copyutil.py | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b08690d/CHANGES.txt -- diff --cc CHANGES.txt index 6e3efb6,6fffe2a..f6ec738 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -64,6 -9,8 +64,7 @@@ Merged from 3.0 header is received (CASSANDRA-11464) * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120) Merged from 2.2: - * cqlsh: COPY FROM should use regular inserts for single statement batches and - report errors correctly if workers processes crash on initialization (CASSANDRA-11474) ++ * cqlsh: COPY FROM should report errors correctly if workers processes crash on initialization (CASSANDRA-11474) * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) * Allow only DISTINCT queries with partition keys restrictions (CASSANDRA-11339) * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b08690d/pylib/cqlshlib/copyutil.py --
[6/6] 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/85c518cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85c518cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85c518cb Branch: refs/heads/trunk Commit: 85c518cb36b9634c76e2c2f07808dbc330e629de Parents: fb13df4 7f4b5e3 Author: Aleksey Yeschenko Authored: Mon Apr 18 15:26:37 2016 +0100 Committer: Aleksey Yeschenko Committed: Mon Apr 18 15:26:37 2016 +0100 -- CHANGES.txt| 3 ++- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/85c518cb/CHANGES.txt -- diff --cc CHANGES.txt index 05ebc7c,6586299..fd8514c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,57 -1,6 +1,56 @@@ -3.0.6 +3.6 + * Fix handling of empty slices (CASSANDRA-11513) + * Make number of cores used by cqlsh COPY visible to testing code (CASSANDRA-11437) + * Allow filtering on clustering columns for queries without secondary indexes (CASSANDRA-11310) + * Refactor Restriction hierarchy (CASSANDRA-11354) + * Eliminate allocations in R/W path (CASSANDRA-11421) + * Update Netty to 4.0.36 (CASSANDRA-11567) + * Fix PER PARTITION LIMIT for queries requiring post-query ordering (CASSANDRA-11556) + * Allow instantiation of UDTs and tuples in UDFs (CASSANDRA-10818) + * Support UDT in CQLSSTableWriter (CASSANDRA-10624) + * Support for non-frozen user-defined types, updating + individual fields of user-defined types (CASSANDRA-7423) + * Make LZ4 compression level configurable (CASSANDRA-11051) + * Allow per-partition LIMIT clause in CQL (CASSANDRA-7017) + * Make custom filtering more extensible with UserExpression (CASSANDRA-11295) + * Improve field-checking and error reporting in cassandra.yaml (CASSANDRA-10649) + * Print CAS stats in nodetool proxyhistograms (CASSANDRA-11507) + * More user friendly error when providing an invalid token to nodetool (CASSANDRA-9348) + * Add static column support to SASI index (CASSANDRA-11183) + * Support EQ/PREFIX queries in SASI CONTAINS mode without tokenization (CASSANDRA-11434) + * Support LIKE operator in prepared statements (CASSANDRA-11456) + * Add a command to see if a Materialized View has finished building (CASSANDRA-9967) + * Log endpoint and port associated with streaming operation (CASSANDRA-8777) + * Print sensible units for all log messages (CASSANDRA-9692) + * Upgrade Netty to version 4.0.34 (CASSANDRA-11096) + * Break the CQL grammar into separate Parser and Lexer (CASSANDRA-11372) + * Compress only inter-dc traffic by default (CASSANDRA-) + * Add metrics to track write amplification (CASSANDRA-11420) + * cassandra-stress: cannot handle "value-less" tables (CASSANDRA-7739) + * Add/drop multiple columns in one ALTER TABLE statement (CASSANDRA-10411) + * Add require_endpoint_verification opt for internode encryption (CASSANDRA-9220) + * Add auto import java.util for UDF code block (CASSANDRA-11392) + * Add --hex-format option to nodetool getsstables (CASSANDRA-11337) + * sstablemetadata should print sstable min/max token (CASSANDRA-7159) + * Do not wrap CassandraException in TriggerExecutor (CASSANDRA-9421) + * COPY TO should have higher double precision (CASSANDRA-11255) + * Stress should exit with non-zero status after failure (CASSANDRA-10340) + * Add client to cqlsh SHOW_SESSION (CASSANDRA-8958) + * Fix nodetool tablestats keyspace level metrics (CASSANDRA-11226) + * Store repair options in parent_repair_history (CASSANDRA-11244) + * Print current leveling in sstableofflinerelevel (CASSANDRA-9588) + * Change repair message for keyspaces with RF 1 (CASSANDRA-11203) + * Remove hard-coded SSL cipher suites and protocols (CASSANDRA-10508) + * Improve concurrency in CompactionStrategyManager (CASSANDRA-10099) + * (cqlsh) interpret CQL type for formatting blobs (CASSANDRA-11274) + * Refuse to start and print txn log information in case of disk + corruption (CASSANDRA-10112) + * Resolve some eclipse-warnings (CASSANDRA-11086) + * (cqlsh) Show static columns in a different color (CASSANDRA-11059) + * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207) +Merged from 3.0: * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410) * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485) - * Allow only DISTINCT queries with partition keys or static columns restrictions (CASSANDRA-11339) * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470) * Notify indexers o
[6/6] 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/6d43fc98 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d43fc98 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d43fc98 Branch: refs/heads/trunk Commit: 6d43fc981299eb3eabc781af8572bdfc9f3cb37e Parents: cb1a634 4238cdd Author: Aleksey Yeschenko Authored: Mon Apr 11 20:07:50 2016 +0100 Committer: Aleksey Yeschenko Committed: Mon Apr 11 20:07:50 2016 +0100 -- CHANGES.txt | 1 + .../cassandra/hadoop/cql3/CqlConfigHelper.java | 58 +--- 2 files changed, 40 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d43fc98/CHANGES.txt --
[6/6] 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/1aeeff47 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1aeeff47 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1aeeff47 Branch: refs/heads/trunk Commit: 1aeeff47ada8a81965d5fd70f8a40c6511dd0cb8 Parents: 2ae587f f0cd326 Author: Yuki Morishita Authored: Mon Apr 11 11:31:56 2016 -0500 Committer: Yuki Morishita Committed: Mon Apr 11 11:31:56 2016 -0500 -- CHANGES.txt | 1 + .../apache/cassandra/repair/RepairRunnable.java | 10 ++ .../cassandra/service/ActiveRepairService.java | 11 ++ .../cassandra/service/StorageService.java | 28 - .../progress/jmx/LegacyJMXProgressSupport.java | 107 + .../jmx/LegacyJMXProgressSupportTest.java | 118 +++ 6 files changed, 269 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aeeff47/CHANGES.txt -- diff --cc CHANGES.txt index 3adde47,8c40e63..f399fd9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -46,15 -5,10 +46,16 @@@ Merged from 3.0 header is received (CASSANDRA-11464) * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120) Merged from 2.2: + * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) -3.0.5 + +3.5 + * StaticTokenTreeBuilder should respect posibility of duplicate tokens (CASSANDRA-11525) + * Correctly fix potential assertion error during compaction (CASSANDRA-11353) + * Avoid index segment stitching in RAM which lead to OOM on big SSTable files (CASSANDRA-11383) + * Fix clustering and row filters for LIKE queries on clustering columns (CASSANDRA-11397) +Merged from 3.0: * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943) * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320) * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aeeff47/src/java/org/apache/cassandra/repair/RepairRunnable.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aeeff47/src/java/org/apache/cassandra/service/StorageService.java --
[6/6] 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/bd633377 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd633377 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd633377 Branch: refs/heads/trunk Commit: bd633377a9b3fd4e0660e000cc31980ab3441ae1 Parents: 1a73af7 04a75a6 Author: Josh McKenzie Authored: Wed Apr 6 18:57:43 2016 -0400 Committer: Josh McKenzie Committed: Wed Apr 6 18:57:43 2016 -0400 -- conf/cassandra-env.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd633377/conf/cassandra-env.ps1 --
[6/6] 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/a7b138ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7b138ad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7b138ad Branch: refs/heads/trunk Commit: a7b138ad61a26b28848bf188243a799ddee50852 Parents: 0fe80fb f52f299 Author: Robert Stupp Authored: Mon Apr 4 14:10:40 2016 +0200 Committer: Robert Stupp Committed: Mon Apr 4 14:10:40 2016 +0200 -- CHANGES.txt | 2 ++ .../apache/cassandra/net/IncomingStreamingConnection.java | 9 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7b138ad/CHANGES.txt -- diff --cc CHANGES.txt index e5ee3d8,d03705a..13e9325 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,41 -1,9 +1,43 @@@ -3.0.6 +3.6 + * Support EQ/PREFIX queries in SASI CONTAINS mode without tokenization (CASSANDRA-11434) + * Support LIKE operator in prepared statements (CASSANDRA-11456) + * Add a command to see if a Materialized View has finished building (CASSANDRA-9967) + * Log endpoint and port associated with streaming operation (CASSANDRA-8777) + * Print sensible units for all log messages (CASSANDRA-9692) + * Upgrade Netty to version 4.0.34 (CASSANDRA-11096) + * Break the CQL grammar into separate Parser and Lexer (CASSANDRA-11372) + * Compress only inter-dc traffic by default (CASSANDRA-) + * Add metrics to track write amplification (CASSANDRA-11420) + * cassandra-stress: cannot handle "value-less" tables (CASSANDRA-7739) + * Add/drop multiple columns in one ALTER TABLE statement (CASSANDRA-10411) + * Add require_endpoint_verification opt for internode encryption (CASSANDRA-9220) + * Add auto import java.util for UDF code block (CASSANDRA-11392) + * Add --hex-format option to nodetool getsstables (CASSANDRA-11337) + * sstablemetadata should print sstable min/max token (CASSANDRA-7159) + * Do not wrap CassandraException in TriggerExecutor (CASSANDRA-9421) + * COPY TO should have higher double precision (CASSANDRA-11255) + * Stress should exit with non-zero status after failure (CASSANDRA-10340) + * Add client to cqlsh SHOW_SESSION (CASSANDRA-8958) + * Fix nodetool tablestats keyspace level metrics (CASSANDRA-11226) + * Store repair options in parent_repair_history (CASSANDRA-11244) + * Print current leveling in sstableofflinerelevel (CASSANDRA-9588) + * Change repair message for keyspaces with RF 1 (CASSANDRA-11203) + * Remove hard-coded SSL cipher suites and protocols (CASSANDRA-10508) + * Improve concurrency in CompactionStrategyManager (CASSANDRA-10099) + * (cqlsh) interpret CQL type for formatting blobs (CASSANDRA-11274) + * Refuse to start and print txn log information in case of disk + corruption (CASSANDRA-10112) + * Resolve some eclipse-warnings (CASSANDRA-11086) + * (cqlsh) Show static columns in a different color (CASSANDRA-11059) + * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207) + Merged from 2.2: + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) -3.0.5 +3.5 + * Avoid index segment stitching in RAM which lead to OOM on big SSTable files (CASSANDRA-11383) + * Fix clustering and row filters for LIKE queries on clustering columns (CASSANDRA-11397) +Merged from 3.0: * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943) * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320) * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)
[6/6] 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/84db205b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84db205b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84db205b Branch: refs/heads/trunk Commit: 84db205b4143d5c937617db3c38d1fef5c263441 Parents: 001bdd3 6328590 Author: Aleksey Yeschenko Authored: Mon Feb 29 17:20:13 2016 + Committer: Aleksey Yeschenko Committed: Mon Feb 29 17:20:13 2016 + -- CHANGES.txt | 1 + .../apache/cassandra/security/SSLFactory.java | 41 ++ .../thrift/CustomTThreadPoolServer.java | 4 +- .../org/apache/cassandra/transport/Server.java | 3 +- .../cassandra/transport/SimpleClient.java | 3 +- test/conf/keystore.jks | Bin 0 -> 2191 bytes .../cassandra/security/SSLFactoryTest.java | 75 +++ 7 files changed, 108 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/84db205b/CHANGES.txt -- diff --cc CHANGES.txt index 0c9eba1,a7b5c8a..744f06f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -51,6 -21,6 +51,7 @@@ Merged from 3.0 properly (CASSANDRA-11050) * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239) Merged from 2.2: ++ * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216) * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167) * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840) http://git-wip-us.apache.org/repos/asf/cassandra/blob/84db205b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java --
[6/6] 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/11d7eb3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11d7eb3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11d7eb3b Branch: refs/heads/trunk Commit: 11d7eb3ba32e2abe01a14017477846ab884b09f6 Parents: e1a14f5 d7cb6f6 Author: Jason Brown Authored: Fri Feb 26 14:50:32 2016 -0800 Committer: Jason Brown Committed: Fri Feb 26 14:51:33 2016 -0800 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/dht/Range.java| 20 +++- .../org/apache/cassandra/dht/RangeTest.java | 15 +++ 3 files changed, 27 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/11d7eb3b/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/11d7eb3b/src/java/org/apache/cassandra/dht/Range.java --
[6/6] 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/5edd148c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5edd148c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5edd148c Branch: refs/heads/trunk Commit: 5edd148c25be8ca409442718f3044e2b12d7c948 Parents: 29066af b0f2266 Author: Robert Stupp Authored: Sat Feb 20 11:01:55 2016 +0100 Committer: Robert Stupp Committed: Sat Feb 20 11:01:55 2016 +0100 -- CHANGES.txt | 1 + .../apache/cassandra/schema/SchemaKeyspace.java | 8 ++- .../validation/operations/AggregationTest.java | 60 +++- 3 files changed, 65 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5edd148c/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5edd148c/src/java/org/apache/cassandra/schema/SchemaKeyspace.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5edd148c/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java --
[6/6] 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/aca2a1dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aca2a1dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aca2a1dc Branch: refs/heads/trunk Commit: aca2a1dcfdc5210a68ea13affdd819f8f4108a54 Parents: 14420a9 6503335 Author: Carl Yeksigian Authored: Thu Feb 18 15:51:44 2016 -0500 Committer: Carl Yeksigian Committed: Thu Feb 18 15:55:14 2016 -0500 -- CHANGES.txt | 3 +-- bin/cqlsh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aca2a1dc/CHANGES.txt -- diff --cc CHANGES.txt index 9821f1c,275bc04..830bef1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,4 +1,31 @@@ -3.0.4 +3.4 + * fix TrackerTest to handle new notifications (CASSANDRA-11178) + * add SASI validation for partitioner and complex columns (CASSANDRA-11169) + * Add caching of encrypted credentials in PasswordAuthenticator (CASSANDRA-7715) + * fix SASI memtable switching on flush (CASSANDRA-11159) + * Remove duplicate offline compaction tracking (CASSANDRA-11148) + * fix EQ semantics of analyzed SASI indexes (CASSANDRA-11130) + * Support long name output for nodetool commands (CASSANDRA-7950) + * Encrypted hints (CASSANDRA-11040) + * SASI index options validation (CASSANDRA-11136) + * Optimize disk seek using min/max column name meta data when the LIMIT clause is used + (CASSANDRA-8180) + * Add LIKE support to CQL3 (CASSANDRA-11067) + * Generic Java UDF types (CASSANDRA-10819) + * cqlsh: Include sub-second precision in timestamps by default (CASSANDRA-10428) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Integrate SASI index into Cassandra (CASSANDRA-10661) + * Add --skip-flush option to nodetool snapshot + * Skip values for non-queried columns (CASSANDRA-10657) + * Add support for secondary indexes on static columns (CASSANDRA-8103) + * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051) + * Add metric for number of dropped mutations (CASSANDRA-10866) + * Simplify row cache invalidation code (CASSANDRA-10396) + * Support user-defined compaction through nodetool (CASSANDRA-10660) + * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981) + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953) + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838) +Merged from 3.0: - === - 3.0.4 * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) * Add query time validation method on Index (CASSANDRA-11043) * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
[6/6] 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/14420a95 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14420a95 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14420a95 Branch: refs/heads/trunk Commit: 14420a958f7d330a66a63b11f7184ac5d63e3bf1 Parents: 272300a 9b5df24 Author: Robert Stupp Authored: Thu Feb 18 21:40:41 2016 +0100 Committer: Robert Stupp Committed: Thu Feb 18 21:40:41 2016 +0100 -- CHANGES.txt | 1 + build.xml | 15 +-- 2 files changed, 6 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14420a95/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14420a95/build.xml --
[6/6] 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/272300a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/272300a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/272300a5 Branch: refs/heads/trunk Commit: 272300a550f2f31e09d490de75f2a083dbd45f8c Parents: 698c808 4354fb2 Author: Yuki Morishita Authored: Thu Feb 18 11:23:15 2016 -0600 Committer: Yuki Morishita Committed: Thu Feb 18 11:23:15 2016 -0600 -- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 36 .../repair/RepairMessageVerbHandler.java| 43 ++-- 3 files changed, 68 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/272300a5/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/272300a5/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/272300a5/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java --
[6/6] 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/36950f28 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36950f28 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36950f28 Branch: refs/heads/trunk Commit: 36950f289a452609792ef4b196f09aaf82ca486a Parents: 2952500 15ac9e8 Author: Marcus Eriksson Authored: Thu Feb 18 12:51:42 2016 +0100 Committer: Marcus Eriksson Committed: Thu Feb 18 12:51:42 2016 +0100 -- CHANGES.txt | 1 + .../apache/cassandra/db/compaction/CompactionManager.java | 9 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36950f28/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36950f28/src/java/org/apache/cassandra/db/compaction/CompactionManager.java --
[6/6] 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/9492efb3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9492efb3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9492efb3 Branch: refs/heads/trunk Commit: 9492efb3c4ff2cbcdae5944ffd442cda7c50a6c6 Parents: 81ffa52 5dbab32 Author: Joshua McKenzie Authored: Wed Feb 17 19:23:32 2016 -0500 Committer: Joshua McKenzie Committed: Wed Feb 17 19:24:06 2016 -0500 -- CHANGES.txt | 1 + bin/cqlsh.py | 39 +-- conf/cqlshrc.sample | 3 +++ pylib/cqlshlib/formatting.py | 14 +++--- pylib/cqlshlib/test/test_cqlsh_output.py | 18 + 5 files changed, 69 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9492efb3/CHANGES.txt -- diff --cc CHANGES.txt index e6d4c42,a1125f5..b5d0564 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -52,6 -23,6 +52,7 @@@ Merged from 2.2 * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010) ++ * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397) Merged from 2.1: * Use logback setting for 'cassandra -v' command (CASSANDRA-10767) * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9492efb3/bin/cqlsh.py -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9492efb3/pylib/cqlshlib/formatting.py -- diff --cc pylib/cqlshlib/formatting.py index ef7e3fd,dcd08da..6b88bc7 --- a/pylib/cqlshlib/formatting.py +++ b/pylib/cqlshlib/formatting.py @@@ -101,16 -99,16 +101,16 @@@ def color_text(bval, colormap, displayw DEFAULT_NANOTIME_FORMAT = '%H:%M:%S.%N' DEFAULT_DATE_FORMAT = '%Y-%m-%d' -DEFAULT_TIMESTAMP_FORMAT = '%Y-%m-%d %H:%M:%S%z' -if platform.system() == 'Windows': -DEFAULT_TIME_FORMAT = '%Y-%m-%d %H:%M:%S %Z' +DEFAULT_TIMESTAMP_FORMAT = os.environ.get('CQLSH_DEFAULT_TIMESTAMP_FORMAT', '') +if not DEFAULT_TIMESTAMP_FORMAT: +DEFAULT_TIMESTAMP_FORMAT = '%Y-%m-%d %H:%M:%S.%f%z' -class DateTimeFormat(): +class DateTimeFormat: def __init__(self, timestamp_format=DEFAULT_TIMESTAMP_FORMAT, date_format=DEFAULT_DATE_FORMAT, - nanotime_format=DEFAULT_NANOTIME_FORMAT): + nanotime_format=DEFAULT_NANOTIME_FORMAT, timezone=None): self.timestamp_format = timestamp_format self.date_format = date_format self.nanotime_format = nanotime_format http://git-wip-us.apache.org/repos/asf/cassandra/blob/9492efb3/pylib/cqlshlib/test/test_cqlsh_output.py -- diff --cc pylib/cqlshlib/test/test_cqlsh_output.py index c398f69,f867312..c54792d --- a/pylib/cqlshlib/test/test_cqlsh_output.py +++ b/pylib/cqlshlib/test/test_cqlsh_output.py @@@ -370,6 -370,24 +370,24 @@@ class TestCqlshOutput(BaseTestCase) """), ), env={'TZ': 'Etc/UTC'}) + try: + import pytz # test only if pytz is available on PYTHONPATH + self.assertQueriesGiveColoredOutput(( + ('''select timestampcol from has_all_types where num = 0;''', """ + timestampcol + --- ++- + - 2012-05-14 09:53:20-0300 - ++ 2012-05-14 09:53:20.00-0300 ++ GGG + + + (1 rows) + + """), + ), env={'TZ': 'America/Sao_Paulo'}) + except ImportError: + pass def test_boolean_output(self): self.assertCqlverQueriesGiveColoredOutput((
[6/6] 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/097ce387 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/097ce387 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/097ce387 Branch: refs/heads/trunk Commit: 097ce3873f2a1e6474ecca4b11eda9ae5d2b274d Parents: 0d8e853 fcc40e5 Author: Robert Stupp Authored: Wed Feb 17 13:43:00 2016 +0100 Committer: Robert Stupp Committed: Wed Feb 17 13:43:00 2016 +0100 -- CHANGES.txt| 1 + bin/cqlsh.py | 4 ++-- pylib/cqlshlib/cqlhandling.py | 3 ++- pylib/cqlshlib/test/cassconnect.py | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/097ce387/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/097ce387/bin/cqlsh.py --
[6/6] 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/1944bf50 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1944bf50 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1944bf50 Branch: refs/heads/trunk Commit: 1944bf507d66b5c103c136319caeb4a9e3767a69 Parents: a800ca8 efbcd15 Author: Aleksey Yeschenko Authored: Fri Feb 12 17:31:35 2016 + Committer: Aleksey Yeschenko Committed: Fri Feb 12 17:33:14 2016 + -- CHANGES.txt | 5 - src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java | 6 -- src/java/org/apache/cassandra/locator/TokenMetadata.java| 7 +++ 3 files changed, 11 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1944bf50/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1944bf50/src/java/org/apache/cassandra/locator/TokenMetadata.java -- diff --cc src/java/org/apache/cassandra/locator/TokenMetadata.java index d47b681,97c5f10..caa7661 --- a/src/java/org/apache/cassandra/locator/TokenMetadata.java +++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java @@@ -868,20 -869,18 +869,18 @@@ public class TokenMetadat public Token getPredecessor(Token token) { -List tokens = sortedTokens(); +List tokens = sortedTokens(); int index = Collections.binarySearch(tokens, token); - //assert index >= 0 : token + " not found in " + StringUtils.join(tokenToEndpointMap.keySet(), ", "); - if (index < 0) index = -index-1; + assert index >= 0 : token + " not found in " + StringUtils.join(tokenToEndpointMap.keySet(), ", "); -return (Token) (index == 0 ? tokens.get(tokens.size() - 1) : tokens.get(index - 1)); +return index == 0 ? tokens.get(tokens.size() - 1) : tokens.get(index - 1); } public Token getSuccessor(Token token) { -List tokens = sortedTokens(); +List tokens = sortedTokens(); int index = Collections.binarySearch(tokens, token); - //assert index >= 0 : token + " not found in " + StringUtils.join(tokenToEndpointMap.keySet(), ", "); - if (index < 0) return (Token) tokens.get(-index-1); + assert index >= 0 : token + " not found in " + StringUtils.join(tokenToEndpointMap.keySet(), ", "); -return (Token) ((index == (tokens.size() - 1)) ? tokens.get(0) : tokens.get(index + 1)); +return (index == (tokens.size() - 1)) ? tokens.get(0) : tokens.get(index + 1); } /** @return a copy of the bootstrapping tokens map */
[6/6] 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/b0448e66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0448e66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0448e66 Branch: refs/heads/trunk Commit: b0448e66b567bb8dc80acb1cb9c66bbf8b5f461c Parents: ebd6c23 1aa97e3 Author: Benjamin Lerer Authored: Thu Feb 11 10:44:30 2016 +0100 Committer: Benjamin Lerer Committed: Thu Feb 11 10:48:28 2016 +0100 -- CHANGES.txt |1 + .../cql3/restrictions/AbstractRestriction.java | 14 + .../ForwardingPrimaryKeyRestrictions.java |3 +- .../restrictions/MultiColumnRestriction.java| 76 +- .../restrictions/PrimaryKeyRestrictionSet.java | 34 +- .../cql3/restrictions/Restriction.java |4 +- .../cql3/restrictions/RestrictionSet.java |4 +- .../restrictions/SingleColumnRestriction.java |9 +- .../cql3/restrictions/TokenRestriction.java |2 +- .../org/apache/cassandra/db/MultiCBuilder.java | 90 +- .../PrimaryKeyRestrictionSetTest.java | 1174 +++--- .../SelectMultiColumnRelationTest.java | 859 - 12 files changed, 2059 insertions(+), 211 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0448e66/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0448e66/src/java/org/apache/cassandra/cql3/restrictions/AbstractRestriction.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0448e66/src/java/org/apache/cassandra/cql3/restrictions/ForwardingPrimaryKeyRestrictions.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0448e66/src/java/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSet.java -- diff --cc src/java/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSet.java index d24799a,8121858..978ebbc --- a/src/java/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSet.java +++ b/src/java/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSet.java @@@ -163,20 -175,6 +163,30 @@@ final class PrimaryKeyRestrictionSet ex return new PrimaryKeyRestrictionSet(this, restriction); } +// Whether any of the underlying restriction is an IN +private boolean hasIN() +{ +if (isIN()) +return true; + +for (Restriction restriction : restrictions) +{ +if (restriction.isIN()) +return true; +} +return false; +} + ++private boolean hasMultiColumnSlice() ++{ ++for (Restriction restriction : restrictions) ++{ ++if (restriction.isMultiColumn() && restriction.isSlice()) ++return true; ++} ++return false; ++} ++ @Override public NavigableSet valuesAsClustering(QueryOptions options) throws InvalidRequestException { @@@ -204,7 -202,7 +214,7 @@@ @Override public NavigableSet boundsAsClustering(Bound bound, QueryOptions options) throws InvalidRequestException { - MultiCBuilder builder = MultiCBuilder.create(comparator, hasIN()); -MultiCBuilder builder = MultiCBuilder.create(comparator); ++MultiCBuilder builder = MultiCBuilder.create(comparator, hasIN() || hasMultiColumnSlice()); int keyPosition = 0; for (Restriction r : restrictions) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0448e66/src/java/org/apache/cassandra/cql3/restrictions/Restriction.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0448e66/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0448e66/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0448e66/src/java/org/apache/cassandra/db/MultiCBuilder.java -- diff --cc src/java/org/apache/cassandra/db/MultiCBuilder.java index 7a4eef0,7c77ab0..f03e674 --- a/src/java/org/apache/cassandra/db/MultiCBuilder.java +++ b/src/java/org/apache/cassandra/db/MultiCBuilder.java @@@ -18,8 -18,11 +18,13 @@@ package org.apache.cassa
[6/6] 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/71ccb16b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71ccb16b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71ccb16b Branch: refs/heads/trunk Commit: 71ccb16bf9149a01cc353d39f088917b74ee353a Parents: 696cd91 23f6296 Author: Aleksey Yeschenko Authored: Mon Feb 8 12:28:32 2016 + Committer: Aleksey Yeschenko Committed: Mon Feb 8 12:28:32 2016 + -- CHANGES.txt | 1 + bin/cqlsh.py | 41 - 2 files changed, 37 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71ccb16b/CHANGES.txt -- diff --cc CHANGES.txt index 179da46,6302ce6..2d50c10 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,7 +1,23 @@@ -3.0.4 +3.4 + * Add LIKE support to CQL3 (CASSANDRA-11067) + * Generic Java UDF types (CASSANDRA-10819) + * cqlsh: Include sub-second precision in timestamps by default (CASSANDRA-10428) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Integrate SASI index into Cassandra (CASSANDRA-10661) + * Add --skip-flush option to nodetool snapshot + * Skip values for non-queried columns (CASSANDRA-10657) + * Add support for secondary indexes on static columns (CASSANDRA-8103) + * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051) + * Add metric for number of dropped mutations (CASSANDRA-10866) + * Simplify row cache invalidation code (CASSANDRA-10396) + * Support user-defined compaction through nodetool (CASSANDRA-10660) + * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981) + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953) + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838) +Merged from 3.0: * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) Merged from 2.2.6 + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) * Gossiper#isEnabled is not thread safe (CASSANDRA-6) Merged from 2.1: * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-3) http://git-wip-us.apache.org/repos/asf/cassandra/blob/71ccb16b/bin/cqlsh.py -- diff --cc bin/cqlsh.py index dcb90b6,a7292e6..02952c3 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -52,10 -52,9 +52,13 @@@ from uuid import UUI if sys.version_info[0] != 2 or sys.version_info[1] != 7: sys.exit("\nCQL Shell supports only Python 2.7\n") +# see CASSANDRA-10428 +if platform.python_implementation().startswith('Jython'): +sys.exit("\nCQL Shell does not run on Jython\n") + + UTF8 = 'utf-8' + CP65001 = 'cp65001' # Win utf-8 variant + description = "CQL Shell for Apache Cassandra" version = "5.0.1" @@@ -727,8 -732,14 +736,10 @@@ class Shell(cmd.Cmd) self.current_keyspace = keyspace -self.display_timestamp_format = display_timestamp_format -self.display_nanotime_format = display_nanotime_format -self.display_date_format = display_date_format - self.max_trace_wait = max_trace_wait self.session.max_trace_wait = max_trace_wait + + self.tty = tty if encoding is None: encoding = locale.getpreferredencoding() if encoding is None:
[6/6] 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/565799c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/565799c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/565799c2 Branch: refs/heads/trunk Commit: 565799c28d67bfd7f6b705abc01b6f895f3f90c1 Parents: e672462 67fd42f Author: Sam Tunnicliffe Authored: Mon Dec 21 11:57:53 2015 + Committer: Sam Tunnicliffe Committed: Mon Dec 21 11:57:53 2015 + -- NEWS.txt | 23 +++ 1 file changed, 23 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/565799c2/NEWS.txt --
[6/6] 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/ef37df4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef37df4e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef37df4e Branch: refs/heads/trunk Commit: ef37df4e42362457bffb15c305388e055f8f1f87 Parents: 0f5e780 2e09583 Author: Aleksey Yeschenko Authored: Fri Dec 18 22:48:36 2015 + Committer: Aleksey Yeschenko Committed: Fri Dec 18 22:48:36 2015 + -- bin/cqlsh.py | 4 +- pylib/cqlshlib/test/run_cqlsh.py | 108 +++--- pylib/cqlshlib/test/test_cqlsh_completion.py | 3 + pylib/cqlshlib/test/test_cqlsh_output.py | 22 +++-- pylib/cqlshlib/test/winpty.py| 50 ++ 5 files changed, 144 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef37df4e/bin/cqlsh.py --
[6/6] 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/bab66dd1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bab66dd1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bab66dd1 Branch: refs/heads/trunk Commit: bab66dd1af377bec8aa3a144f19e925d4ecfa9cb Parents: a018bcb 1deb044 Author: Aleksey Yeschenko Authored: Tue Dec 15 21:40:32 2015 + Committer: Aleksey Yeschenko Committed: Tue Dec 15 21:40:32 2015 + -- CHANGES.txt| 1 + bin/cqlsh.py | 329 ++- pylib/cqlshlib/copyutil.py | 912 ++-- pylib/cqlshlib/util.py | 19 + 4 files changed, 840 insertions(+), 421 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bab66dd1/CHANGES.txt -- diff --cc CHANGES.txt index fb6f7e9,e167126..b3dc35b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -24,7 -3,12 +24,8 @@@ Merged from 3.0 (CASSANDRA-10822) Merged from 2.2 * 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) further optimise COPY FROM (CASSANDRA-9302) * Allow CREATE TABLE WITH ID (CASSANDRA-9179) * Make Stress compiles within eclipse (CASSANDRA-10807) * Cassandra Daemon should print JVM arguments (CASSANDRA-10764) http://git-wip-us.apache.org/repos/asf/cassandra/blob/bab66dd1/bin/cqlsh.py --
[6/6] 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/a2c14f85 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2c14f85 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2c14f85 Branch: refs/heads/trunk Commit: a2c14f85244ac12e232b459137853a37a19dcfdd Parents: 33f5dc5 97dc8d5 Author: Joshua McKenzie Authored: Fri Nov 6 13:42:59 2015 -0500 Committer: Joshua McKenzie Committed: Fri Nov 6 13:42:59 2015 -0500 -- bin/cassandra.ps1 | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) --
[6/6] 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/33f5dc57 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33f5dc57 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33f5dc57 Branch: refs/heads/trunk Commit: 33f5dc578064158f11fd38fd764b108b023f204c Parents: fb9e75e 39bc5de Author: Aleksey Yeschenko Authored: Fri Nov 6 18:40:03 2015 + Committer: Aleksey Yeschenko Committed: Fri Nov 6 18:40:03 2015 + -- CHANGES.txt | 1 + bin/cqlsh.py | 6 +++--- ...driver-internal-only-3.0.0a3.post0-3f15725.zip | Bin 0 -> 234113 bytes ...driver-internal-only-3.0.0a3.post0-a983923.zip | Bin 229492 -> 0 bytes pylib/cqlshlib/tracing.py | 8 5 files changed, 8 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/33f5dc57/CHANGES.txt --
[6/6] 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/21b04cf3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21b04cf3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21b04cf3 Branch: refs/heads/trunk Commit: 21b04cf31a3802ebcfdd5fcaee0819b50a461944 Parents: 5dd2247 cf0c61b Author: Robert Stupp Authored: Mon Oct 19 14:57:09 2015 +0200 Committer: Robert Stupp Committed: Mon Oct 19 14:57:09 2015 +0200 -- .../apache/cassandra/net/MessagingService.java | 24 +++- 1 file changed, 18 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21b04cf3/src/java/org/apache/cassandra/net/MessagingService.java --
[6/6] 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/6f2b855c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f2b855c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f2b855c Branch: refs/heads/trunk Commit: 6f2b855c6efd6386d469475af397ba87d6569427 Parents: c20f6b3 56cfc6e Author: Aleksey Yeschenko Authored: Fri Oct 16 13:29:30 2015 +0100 Committer: Aleksey Yeschenko Committed: Fri Oct 16 13:29:30 2015 +0100 -- .rat-excludes |1 - CHANGES.txt |1 + NEWS.txt|7 +- build.xml | 67 +- examples/pig/README.txt | 118 -- examples/pig/bin/pig_cassandra | 46 - examples/pig/example-populate-cql.txt | 24 - examples/pig/example-script-cql.pig | 11 - examples/pig/example-script.pig |9 - examples/pig/libdata.csv| 200 examples/pig/test/populate-cli.txt | 134 --- examples/pig/test/populate-cql.txt | 33 - examples/pig/test/test_cql_storage.pig | 14 - examples/pig/test/test_storage.pig | 85 -- .../cassandra/hadoop/pig/CqlNativeStorage.java | 1082 -- .../cassandra/hadoop/pig/StorageHelper.java | 121 -- test/conf/cassandra_pig.yaml| 42 - .../cassandra/pig/CqlRecordReaderTest.java | 150 --- .../cassandra/pig/CqlTableDataTypeTest.java | 479 .../org/apache/cassandra/pig/CqlTableTest.java | 303 - .../org/apache/cassandra/pig/PigTestBase.java | 117 -- .../pig/ThriftColumnFamilyDataTypeTest.java | 150 --- .../cassandra/pig/ThriftColumnFamilyTest.java | 617 -- test/pig/org/apache/pig/test/MiniCluster.java | 86 -- .../org/apache/pig/test/MiniGenericCluster.java | 122 -- .../apache/pig/test/WindowsLocalFileSystem.java | 62 - 26 files changed, 16 insertions(+), 4065 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f2b855c/CHANGES.txt -- diff --cc CHANGES.txt index 5265215,6bdaa04..b1feeab --- 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 + * 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 conf/jvm.options (CASSANDRA-10403)
[6/6] 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/d87aab98 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d87aab98 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d87aab98 Branch: refs/heads/trunk Commit: d87aab9872ca7d47f21562146e73f4f702bd5961 Parents: d4a2976 5f5e960 Author: Joshua McKenzie Authored: Wed Oct 14 14:44:52 2015 -0400 Committer: Joshua McKenzie Committed: Wed Oct 14 14:44:52 2015 -0400 -- bin/cassandra.ps1 | 8 1 file changed, 8 insertions(+) --
[6/6] 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/08d5e14a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08d5e14a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08d5e14a Branch: refs/heads/trunk Commit: 08d5e14a9acf9cf856a8ab34276ab6c57e986ab7 Parents: 8644338 454268b Author: Yuki Morishita Authored: Tue Oct 13 10:28:10 2015 -0500 Committer: Yuki Morishita Committed: Tue Oct 13 10:28:10 2015 -0500 -- NEWS.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --
[6/6] 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/87da74eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87da74eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87da74eb Branch: refs/heads/trunk Commit: 87da74eb543ff9ff3e6294a003a72d028ad720dd Parents: 16f29aa b324759 Author: Sam Tunnicliffe Authored: Mon Oct 12 12:00:56 2015 +0100 Committer: Sam Tunnicliffe Committed: Mon Oct 12 12:00:56 2015 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87da74eb/CHANGES.txt --
[6/6] 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/2d2f55f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d2f55f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d2f55f2 Branch: refs/heads/trunk Commit: 2d2f55f2fb29b1a04a695754fd5753f62a4340a2 Parents: 3701170 a1b04c4 Author: Marcus Eriksson Authored: Thu Oct 1 16:43:31 2015 +0200 Committer: Marcus Eriksson Committed: Thu Oct 1 16:43:31 2015 +0200 -- .../cassandra/db/partitions/PurgingPartitionIterator.java| 8 1 file changed, 8 insertions(+) --
[6/6] 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/04e5ec34 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04e5ec34 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04e5ec34 Branch: refs/heads/trunk Commit: 04e5ec34da4eaa8dc1ca811e667d8b72f3e87a72 Parents: 44f1ee3 90661a3 Author: blerer Authored: Thu Sep 17 22:19:44 2015 +0200 Committer: blerer Committed: Thu Sep 17 22:20:03 2015 +0200 -- NEWS.txt| 8 bin/cqlsh.py| 2 +- doc/cql3/CQL.textile| 10 +++- pylib/cqlshlib/cql3handling.py | 2 +- src/java/org/apache/cassandra/cql3/Cql.g| 2 +- .../apache/cassandra/cql3/QueryProcessor.java | 2 +- .../validation/operations/TruncateTest.java | 48 7 files changed, 68 insertions(+), 6 deletions(-) --
[6/6] 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/5ba0adf5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ba0adf5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ba0adf5 Branch: refs/heads/trunk Commit: 5ba0adf500a58ea957be3fd7aea6121500f857fe Parents: 4878f69 1d94dc2 Author: Jonathan Ellis Authored: Wed Sep 16 10:40:01 2015 -0500 Committer: Jonathan Ellis Committed: Wed Sep 16 10:40:01 2015 -0500 -- .../org/apache/cassandra/io/sstable/format/big/BigTableWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[6/6] 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/61ce1b9a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61ce1b9a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61ce1b9a Branch: refs/heads/trunk Commit: 61ce1b9a71c30b7c394253894a333e94653f13eb Parents: 1ecb7a4 0d4e0cd Author: blerer Authored: Wed Sep 16 10:35:32 2015 +0200 Committer: blerer Committed: Wed Sep 16 10:37:06 2015 +0200 -- build.xml | 1 + doc/cql3/CQL.textile| 20 - .../cassandra/hadoop/cql3/CqlInputFormat.java | 23 +++- 3 files changed, 32 insertions(+), 12 deletions(-) --
[6/6] 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/c18ab385 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c18ab385 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c18ab385 Branch: refs/heads/trunk Commit: c18ab38578e6d1b7e49f3eb9e1894e80bc3c8f55 Parents: 33152d8 8324818 Author: Sam Tunnicliffe Authored: Thu Sep 10 12:50:45 2015 +0100 Committer: Sam Tunnicliffe Committed: Thu Sep 10 12:50:45 2015 +0100 -- CHANGES.txt | 1 + .../cassandra/auth/CassandraRoleManager.java| 91 +--- .../apache/cassandra/net/MessagingService.java | 33 ++- 3 files changed, 95 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c18ab385/CHANGES.txt --
[6/6] 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/002d86b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/002d86b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/002d86b6 Branch: refs/heads/trunk Commit: 002d86b6e17e6d960e92745a63a3d694e6f451a3 Parents: 3f6eb56 34bbb44 Author: Benedict Elliott Smith Authored: Tue Sep 8 13:55:18 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Sep 8 13:55:18 2015 +0100 -- --
[6/6] 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/fba356d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fba356d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fba356d1 Branch: refs/heads/trunk Commit: fba356d1d726d9a4484ddecd5e09e349b0bae894 Parents: 9d8091f 3818d30 Author: Sam Tunnicliffe Authored: Tue Sep 8 10:27:52 2015 +0100 Committer: Sam Tunnicliffe Committed: Tue Sep 8 10:27:52 2015 +0100 -- CHANGES.txt | 2 ++ .../org/apache/cassandra/config/DatabaseDescriptor.java | 6 +- src/java/org/apache/cassandra/service/ClientState.java| 10 +++--- 3 files changed, 14 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fba356d1/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fba356d1/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[6/6] 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/f66730d6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f66730d6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f66730d6 Branch: refs/heads/trunk Commit: f66730d612b3e828c8b26f8016314effb1c39d02 Parents: 79628dd 796b0f2 Author: Jonathan Ellis Authored: Wed Sep 2 09:36:15 2015 -0500 Committer: Jonathan Ellis Committed: Wed Sep 2 09:36:15 2015 -0500 -- .../org/apache/cassandra/config/DatabaseDescriptor.java | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f66730d6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[6/6] 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/1b60ffd8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b60ffd8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b60ffd8 Branch: refs/heads/trunk Commit: 1b60ffd89a8b801ed61a6bc85e99235e670702c7 Parents: cdbc06f 44e1994 Author: Yuki Morishita Authored: Tue Sep 1 09:22:58 2015 -0500 Committer: Yuki Morishita Committed: Tue Sep 1 09:22:58 2015 -0500 -- CHANGES.txt | 1 + .../org/apache/cassandra/repair/RepairMessageVerbHandler.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b60ffd8/CHANGES.txt --
[6/6] 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/5d0c6ef7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d0c6ef7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d0c6ef7 Branch: refs/heads/trunk Commit: 5d0c6ef77461b6b6b488be445c22062e0aa9b936 Parents: ae7afb7 3bc585d Author: Jonathan Ellis Authored: Mon Aug 31 12:04:51 2015 -0500 Committer: Jonathan Ellis Committed: Mon Aug 31 12:04:51 2015 -0500 -- .../org/apache/cassandra/config/DatabaseDescriptor.java | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d0c6ef7/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[6/6] 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/7ba5845f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ba5845f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ba5845f Branch: refs/heads/trunk Commit: 7ba5845f7a640f2b4baf56836340e00b8d834ba8 Parents: 47886df 9cc4890 Author: Yuki Morishita Authored: Thu Aug 27 10:19:47 2015 -0500 Committer: Yuki Morishita Committed: Thu Aug 27 10:19:47 2015 -0500 -- CHANGES.txt | 1 + .../db/compaction/LeveledCompactionStrategyTest.java| 9 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ba5845f/CHANGES.txt --
[6/6] 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/4acd4bbc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4acd4bbc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4acd4bbc Branch: refs/heads/trunk Commit: 4acd4bbcaab3ddb2dc006834b255abb5a330014a Parents: aabad85 f545a70 Author: Tyler Hobbs Authored: Tue Aug 25 12:49:07 2015 -0500 Committer: Tyler Hobbs Committed: Tue Aug 25 12:49:07 2015 -0500 -- --
[6/6] 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/9a7dfb17 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a7dfb17 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a7dfb17 Branch: refs/heads/trunk Commit: 9a7dfb1736f1f8c384862b4876ea97ba85678f17 Parents: f1a37af 98f414f Author: Jonathan Ellis Authored: Mon Aug 24 19:52:05 2015 -0500 Committer: Jonathan Ellis Committed: Mon Aug 24 19:52:05 2015 -0500 -- CHANGES.txt | 1 + bin/cqlsh.py | 18 +- 2 files changed, 18 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a7dfb17/CHANGES.txt --
[6/6] 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/62f20789 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62f20789 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62f20789 Branch: refs/heads/trunk Commit: 62f20789b14b516e29790365a857087644e494d9 Parents: b1fb6b9 29d3d44 Author: Benedict Elliott Smith Authored: Sun Aug 23 11:51:17 2015 +0100 Committer: Benedict Elliott Smith Committed: Sun Aug 23 11:51:17 2015 +0100 -- test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[6/6] 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/234a15aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/234a15aa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/234a15aa Branch: refs/heads/trunk Commit: 234a15aae256a186bfc0f67c4c3e70a87a80dfbc Parents: 91e3d34 2923011 Author: Benedict Elliott Smith Authored: Tue Aug 18 10:11:07 2015 +0100 Committer: Benedict Elliott Smith Committed: Tue Aug 18 10:11:07 2015 +0100 -- --
[6/6] 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/793bf45f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/793bf45f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/793bf45f Branch: refs/heads/trunk Commit: 793bf45fb7bf3c0b4aaff114a501ff77e307 Parents: 8517e13 da8d48a Author: Benedict Elliott Smith Authored: Fri Aug 14 20:29:19 2015 +0100 Committer: Benedict Elliott Smith Committed: Fri Aug 14 20:29:19 2015 +0100 -- .../db/CommitLogFailurePolicyTest.java | 112 ++ .../org/apache/cassandra/db/CommitLogTest.java | 147 --- 2 files changed, 112 insertions(+), 147 deletions(-) --
[6/6] 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/f43663aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f43663aa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f43663aa Branch: refs/heads/trunk Commit: f43663aafbdb3eaf1fb05f6936376ae0df3faf2e Parents: 1db386e 8b7caa1 Author: Sam Tunnicliffe Authored: Fri Aug 14 14:38:41 2015 +0100 Committer: Sam Tunnicliffe Committed: Fri Aug 14 14:38:41 2015 +0100 -- .../cql3/selection/SelectionColumnMappingTest.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --
[6/6] 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/ba56b822 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba56b822 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba56b822 Branch: refs/heads/trunk Commit: ba56b8221b5906633dc41155a6fc0a4a2b6571f7 Parents: b6d5f2c e389dc4 Author: blerer Authored: Sun Aug 9 22:50:32 2015 +0200 Committer: blerer Committed: Sun Aug 9 22:50:46 2015 +0200 -- .../restrictions/MultiColumnRestriction.java| 37 +++ .../restrictions/SingleColumnRestriction.java | 68 ++-- .../SelectMultiColumnRelationTest.java | 45 + .../SelectSingleColumnRelationTest.java | 28 4 files changed, 149 insertions(+), 29 deletions(-) --
[6/6] 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/448e276b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/448e276b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/448e276b Branch: refs/heads/trunk Commit: 448e276b79035808a40202b7cfeee40f72a84a1e Parents: 709510e 0a94c7a Author: Yuki Morishita Authored: Thu Aug 6 22:06:14 2015 -0500 Committer: Yuki Morishita Committed: Thu Aug 6 22:06:14 2015 -0500 -- src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) --
[6/6] 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/becee6ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/becee6ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/becee6ae Branch: refs/heads/trunk Commit: becee6ae4a04f76d5998de1814c9d6e0164d998d Parents: 7d2a96e b31845c Author: Aleksey Yeschenko Authored: Tue Aug 4 12:16:04 2015 +0300 Committer: Aleksey Yeschenko Committed: Tue Aug 4 12:16:04 2015 +0300 -- NEWS.txt| 8 +- .../apache/cassandra/cache/CachingOptions.java | 291 -- .../org/apache/cassandra/config/CFMetaData.java | 540 + src/java/org/apache/cassandra/cql3/Cql.g| 12 +- .../AlterMaterializedViewStatement.java | 16 +- .../cql3/statements/AlterTableStatement.java| 19 +- .../cassandra/cql3/statements/CFPropDefs.java | 222 --- .../cassandra/cql3/statements/CFProperties.java | 4 +- .../cql3/statements/CreateTableStatement.java | 56 +- .../cql3/statements/KeyspaceAttributes.java | 36 +- .../cql3/statements/TableAttributes.java| 153 + .../apache/cassandra/db/ColumnFamilyStore.java | 71 +-- .../cassandra/db/HintedHandOffManager.java | 2 +- .../org/apache/cassandra/db/LivenessInfo.java | 2 +- src/java/org/apache/cassandra/db/Memtable.java | 2 +- .../apache/cassandra/db/RowUpdateBuilder.java | 2 +- .../db/SinglePartitionReadCommand.java | 4 +- .../org/apache/cassandra/db/SystemKeyspace.java | 21 +- .../cassandra/db/commitlog/CommitLog.java | 4 +- .../db/commitlog/CommitLogArchiver.java | 5 +- .../db/commitlog/CommitLogReplayer.java | 4 +- .../db/compaction/CompactionManager.java| 4 +- .../compaction/CompactionStrategyManager.java | 36 +- .../DateTieredCompactionStrategy.java | 12 +- .../cassandra/db/compaction/Scrubber.java | 2 +- .../SizeTieredCompactionStrategy.java | 14 +- .../cassandra/db/compaction/Upgrader.java | 2 +- .../apache/cassandra/db/rows/BufferCell.java| 4 +- .../cassandra/db/view/MaterializedView.java | 5 +- .../dht/OrderPreservingPartitioner.java | 2 +- .../apache/cassandra/hadoop/ConfigHelper.java | 6 +- .../io/compress/CompressedSequentialWriter.java | 4 +- .../io/compress/CompressionMetadata.java| 15 +- .../io/compress/CompressionParameters.java | 564 -- .../cassandra/io/compress/LZ4Compressor.java| 3 +- .../io/sstable/IndexSummaryManager.java | 4 +- .../io/sstable/format/SSTableReader.java| 26 +- .../io/sstable/format/SSTableWriter.java| 6 +- .../io/sstable/format/big/BigTableWriter.java | 6 +- .../cassandra/io/util/SequentialWriter.java | 4 +- .../apache/cassandra/schema/CachingParams.java | 196 +++ .../cassandra/schema/CompactionParams.java | 304 ++ .../cassandra/schema/CompressionParams.java | 579 +++ .../apache/cassandra/schema/KeyspaceParams.java | 95 +-- .../cassandra/schema/LegacySchemaMigrator.java | 122 ++-- .../cassandra/schema/ReplicationParams.java | 106 .../apache/cassandra/schema/SchemaKeyspace.java | 142 ++--- .../cassandra/schema/SpeculativeRetryParam.java | 160 + .../apache/cassandra/schema/TableParams.java| 338 +++ .../cassandra/service/AbstractReadExecutor.java | 9 +- .../apache/cassandra/service/CacheService.java | 2 +- .../cassandra/service/StorageService.java | 2 +- .../streaming/compress/CompressionInfo.java | 12 +- .../cassandra/thrift/CassandraServer.java | 7 +- .../cassandra/thrift/ThriftConversion.java | 181 -- .../org/apache/cassandra/utils/FBUtilities.java | 8 +- .../utils/NativeSSTableLoaderClient.java| 2 +- .../db/compaction/LongCompactionsTest.java | 10 +- .../LongLeveledCompactionStrategyTest.java | 4 +- test/unit/org/apache/cassandra/MockSchema.java | 4 +- .../unit/org/apache/cassandra/SchemaLoader.java | 50 +- .../apache/cassandra/config/CFMetaDataTest.java | 4 +- .../validation/entities/SecondaryIndexTest.java | 2 +- .../miscellaneous/CrcCheckChanceTest.java | 12 +- .../validation/miscellaneous/OverflowTest.java | 8 +- .../cql3/validation/operations/AlterTest.java | 14 +- .../SelectOrderedPartitionerTest.java | 2 +- .../apache/cassandra/db/HintedHandOffTest.java | 2 - .../apache/cassandra/db/RangeTombstoneTest.java | 5 - .../apache/cassandra/db/RowCacheCQLTest.java| 2 +- .../org/apache/cassandra/db/RowCacheTest.java | 7 +- .../unit/org/apache/cassandra/db/ScrubTest.java | 2 +- .../org/apache/cassandra/db/VerifyTest.java | 12 +- .../db/commitlog/CommitLogUpgradeTest.