subject:"\[3\/3\] cassandra git commit\: Merge branch cassandra\-3.0 into trunk"

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-10-08 Thread mck

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/25380132
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25380132
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25380132

Branch: refs/heads/trunk
Commit: 253801323c51ae94b7f00ef80da1528cd79bff8a
Parents: a333a2f e9ea5e0
Author: mck 
Authored: Sat Oct 8 23:49:25 2016 +1100
Committer: mck 
Committed: Sun Oct 9 00:04:28 2016 +1100

--
 .../CompressedRandomAccessReaderTest.java   | 55 +---
 1 file changed, 24 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25380132/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
--
diff --cc 
test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
index 3380e30,0c96327..0d2a9fb
--- 
a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
+++ 
b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
@@@ -21,12 -21,10 +21,13 @@@ package org.apache.cassandra.io.compres
  import java.io.File;
  import java.io.IOException;
  import java.io.RandomAccessFile;
+ import java.util.Arrays;
  import java.util.Random;
  
 +import org.junit.BeforeClass;
  import org.junit.Test;
 +
 +import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.db.ClusteringComparator;
  import org.apache.cassandra.db.marshal.BytesType;
  import org.apache.cassandra.exceptions.ConfigurationException;
@@@ -192,69 -201,60 +196,58 @@@ public class CompressedRandomAccessRead
  writer.finish();
  }
  
 -try(ChannelProxy channel = new ChannelProxy(file))
 -{
 -// open compression metadata and get chunk information
 -CompressionMetadata meta = new 
CompressionMetadata(metadata.getPath(), file.length(), ChecksumType.CRC32);
 -CompressionMetadata.Chunk chunk = meta.chunkFor(0);
 -
 -try(RandomAccessReader reader = new 
CompressedRandomAccessReader.Builder(channel, meta).build())
 -{// read and verify compressed data
 -assertEquals(CONTENT, reader.readLine());
 -}
 +// open compression metadata and get chunk information
 +CompressionMetadata meta = new 
CompressionMetadata(metadata.getPath(), file.length(), ChecksumType.CRC32);
 +CompressionMetadata.Chunk chunk = meta.chunkFor(0);
  
 +try (FileHandle.Builder builder = new 
FileHandle.Builder(file.getPath()).withCompressionMetadata(meta);
 + FileHandle fh = builder.complete();
 + RandomAccessReader reader = fh.createReader())
 +{// read and verify compressed data
 +assertEquals(CONTENT, reader.readLine());
- 
  Random random = new Random();
- RandomAccessFile checksumModifier = null;
- 
- try
+ try(RandomAccessFile checksumModifier = new 
RandomAccessFile(file, "rw"))
  {
- checksumModifier = new RandomAccessFile(file, "rw");
  byte[] checksum = new byte[4];
  
  // seek to the end of the compressed chunk
  checksumModifier.seek(chunk.length);
  // read checksum bytes
  checksumModifier.read(checksum);
- // seek back to the chunk end
- checksumModifier.seek(chunk.length);
  
- // lets modify one byte of the checksum on each iteration
- for (int i = 0; i < checksum.length; i++)
+ byte[] corruptChecksum = new byte[4];
+ do
  {
- checksumModifier.write(random.nextInt());
- SyncUtil.sync(checksumModifier); // making sure that 
change was synced with disk
+ random.nextBytes(corruptChecksum);
+ } while (Arrays.equals(corruptChecksum, checksum));
  
- try (final RandomAccessReader r = fh.createReader())
+ updateChecksum(checksumModifier, chunk.length, 
corruptChecksum);
+ 
 -try (final RandomAccessReader r = new 
CompressedRandomAccessReader.Builder(channel, meta).build())
++try (final RandomAccessReader r = fh.createReader())
+ {
+ Throwable exception = null;
+ try
  {
- Throwable exception = null;
- try
- {
- r.readLine();
- }
- catch

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-09-28 Thread stefania

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/25d4c7ba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25d4c7ba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25d4c7ba

Branch: refs/heads/trunk
Commit: 25d4c7baa5d00d2cc0b6304a544c6099ed24e70f
Parents: 3a79a02 5cebd1f
Author: Stefania Alborghetti 
Authored: Thu Sep 29 09:29:05 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Sep 29 09:29:05 2016 +0800

--
 CHANGES.txt   |  1 +
 .../cassandra/db/lifecycle/LogTransactionTest.java| 14 --
 2 files changed, 13 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25d4c7ba/CHANGES.txt
--
diff --cc CHANGES.txt
index 2c99e9d,f2f8dac..a9e46f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,77 -1,7 +1,78 @@@
 -3.0.10
 +3.10
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries without secondary 
indexes (CASSANDRA-11031)
 + * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
 + * Add JMH benchmarks.jar (CASSANDRA-12586)
 + * Add row offset support to SASI (CASSANDRA-11990)
 + * 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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-09-27 Thread jjirsa

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/d45f323e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d45f323e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d45f323e

Branch: refs/heads/trunk
Commit: d45f323eb972c6fec146e5cfa84fdc47eb8aa5eb
Parents: b80ef9b f2c5ad7
Author: Jeff Jirsa 
Authored: Tue Sep 27 18:16:55 2016 -0700
Committer: Jeff Jirsa 
Committed: Tue Sep 27 18:26:17 2016 -0700

--
 CHANGES.txt |  1 +
 NEWS.txt|  3 +
 .../locator/AbstractReplicationStrategy.java|  2 +-
 .../locator/NetworkTopologyStrategy.java| 41 ++
 .../org/apache/cassandra/cql3/CQLTester.java| 11 
 .../validation/entities/SecondaryIndexTest.java | 10 
 .../cql3/validation/operations/AlterTest.java   | 47 +++-
 .../cql3/validation/operations/CreateTest.java  | 59 
 .../apache/cassandra/dht/BootStrapperTest.java  |  8 +++
 .../org/apache/cassandra/service/MoveTest.java  |  9 ++-
 10 files changed, 176 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d45f323e/CHANGES.txt
--
diff --cc CHANGES.txt
index 75e7d2a,6edc491..7a5d73a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -88,58 -33,12 +88,59 @@@ 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)
++ * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +Merged from 2.2:
 + * Make Collections deserialization more robust (CASSANDRA-12618)
 + * 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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-09-27 Thread tylerhobbs

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/12f5ca36
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12f5ca36
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12f5ca36

Branch: refs/heads/trunk
Commit: 12f5ca36ffab227a1531a554b00cf83d898f9f28
Parents: 5692c59 21d8a7d
Author: Tyler Hobbs 
Authored: Tue Sep 27 12:04:35 2016 -0500
Committer: Tyler Hobbs 
Committed: Tue Sep 27 12:04:35 2016 -0500

--
 CHANGES.txt |  2 ++
 .../cassandra/db/SinglePartitionReadCommand.java| 16 
 2 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/12f5ca36/CHANGES.txt
--
diff --cc CHANGES.txt
index b6a687d,4280abd..75e7d2a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,74 -1,6 +1,76 @@@
 -3.0.10
 +3.10
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries without secondary 
indexes (CASSANDRA-11031)
 + * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
 + * Add JMH benchmarks.jar (CASSANDRA-12586)
 + * Add row offset support to SASI (CASSANDRA-11990)
 + * 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

[3/3] cassandra git commit: Merge branch cassandra-3.0 into trunk

2016-09-27 Thread blerer

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/7bef4185
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bef4185
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bef4185

Branch: refs/heads/trunk
Commit: 7bef41856f7156a32c5b0cc066b43c697a52d69d
Parents: 5777013 b7fc5dc
Author: Benjamin Lerer 
Authored: Tue Sep 27 14:10:37 2016 +0200
Committer: Benjamin Lerer 
Committed: Tue Sep 27 14:13:22 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/marshal/TupleType.java  |  7 +++-
 .../apache/cassandra/db/marshal/UserType.java   |  6 +--
 .../cassandra/serializers/ListSerializer.java   | 10 -
 .../cassandra/serializers/MapSerializer.java| 10 -
 .../cassandra/serializers/SetSerializer.java| 11 -
 .../cassandra/serializers/UTF8Serializer.java   |  3 ++
 .../validation/entities/CollectionsTest.java| 42 
 .../cql3/validation/entities/TupleTypeTest.java | 10 +
 .../cql3/validation/entities/UserTypesTest.java | 11 +
 10 files changed, 104 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bef4185/CHANGES.txt
--
diff --cc CHANGES.txt
index e10b870,576dfb5..b6a687d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -86,57 -30,12 +86,58 @@@ 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:
++ * Make Collections deserialization more robust (CASSANDRA-12618)
 + * 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)
 +

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-09-27 Thread marcuse

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/57770133
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57770133
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57770133

Branch: refs/heads/trunk
Commit: 5777013368fd549bf603d1a108bb2dad714c8b55
Parents: 979af88 b7da003
Author: Marcus Eriksson 
Authored: Tue Sep 27 09:11:37 2016 +0200
Committer: Marcus Eriksson 
Committed: Tue Sep 27 09:13:49 2016 +0200

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionIterator.java   |  2 +-
 .../db/RepairedDataTombstonesTest.java  | 78 
 3 files changed, 50 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/57770133/CHANGES.txt
--
diff --cc CHANGES.txt
index 0a7f9b0,0524e49..e10b870
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,73 -1,4 +1,74 @@@
 -3.0.10
 +3.10
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries without secondary 
indexes (CASSANDRA-11031)
 + * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
 + * Add JMH benchmarks.jar (CASSANDRA-12586)
 + * Add row offset support to SASI (CASSANDRA-11990)
 + * 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)
 + *

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-09-21 Thread aleksey

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/91180ed6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91180ed6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91180ed6

Branch: refs/heads/trunk
Commit: 91180ed64a017d6143d6a5e059010fafa0df02f6
Parents: e7b278a 88d4791
Author: Aleksey Yeschenko 
Authored: Wed Sep 21 16:33:41 2016 -0700
Committer: Aleksey Yeschenko 
Committed: Wed Sep 21 16:33:41 2016 -0700

--
 CHANGES.txt| 3 ++-
 src/java/org/apache/cassandra/db/Keyspace.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/91180ed6/CHANGES.txt
--
diff --cc CHANGES.txt
index d72ea79,1a97087..98e4f78
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,73 -1,19 +1,74 @@@
 -3.0.10
 +3.10
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries without secondary 
indexes (CASSANDRA-11031)
 + * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
 + * Add JMH benchmarks.jar (CASSANDRA-12586)
 + * Add row offset support to SASI (CASSANDRA-11990)
 + * 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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-09-19 Thread stefania

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/10505447
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10505447
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10505447

Branch: refs/heads/trunk
Commit: 10505447182a9df6c475e4ce0327f3eec217e7a5
Parents: d43b9ce 4bc3aa9
Author: Stefania Alborghetti 
Authored: Tue Sep 20 09:27:21 2016 +0800
Committer: Stefania Alborghetti 
Committed: Tue Sep 20 09:28:26 2016 +0800

--
 CHANGES.txt |  1 +
 .../cassandra/config/ColumnDefinition.java  |  2 +-
 .../apache/cassandra/cql3/ColumnIdentifier.java | 45 +---
 .../apache/cassandra/schema/SchemaKeyspace.java |  6 ++-
 .../utils/NativeSSTableLoaderClient.java|  6 ++-
 .../cassandra/cql3/ColumnIdentifierTest.java| 24 +++
 6 files changed, 73 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/10505447/CHANGES.txt
--
diff --cc CHANGES.txt
index e9e8ccf,b61c76c..979618d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,69 -1,11 +1,70 @@@
 -3.0.10
 +3.10
 + * Support optional backpressure strategies at the coordinator 
(CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries without secondary 
indexes (CASSANDRA-11031)
 + * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
 + * Add JMH benchmarks.jar (CASSANDRA-12586)
 + * Add row offset support to SASI (CASSANDRA-11990)
 + * 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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-09-19 Thread aleksey

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/560faba2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/560faba2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/560faba2

Branch: refs/heads/trunk
Commit: 560faba2ffcfc636df58264b40aabb12cf8fe582
Parents: c1a9a47 85ed48a
Author: Aleksey Yeschenko 
Authored: Mon Sep 19 16:42:17 2016 -0700
Committer: Aleksey Yeschenko 
Committed: Mon Sep 19 16:42:17 2016 -0700

--

--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-09-12 Thread stefania

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/64f12ab2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64f12ab2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64f12ab2

Branch: refs/heads/trunk
Commit: 64f12ab2c82aea80bb8afdc0bf6b72fa706c0ff5
Parents: 4354db2 d600f51
Author: Stefania Alborghetti 
Authored: Mon Sep 12 16:57:03 2016 +0800
Committer: Stefania Alborghetti 
Committed: Mon Sep 12 16:58:08 2016 +0800

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/LegacyLayout.java   | 66 +++-
 .../cassandra/db/marshal/CompositeType.java | 26 
 3 files changed, 38 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/64f12ab2/CHANGES.txt
--
diff --cc CHANGES.txt
index 520a338,f0ec3e3..3ab144e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,64 -1,6 +1,65 @@@
 -3.0.9
 +3.10
 + * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
 + * Add JMH benchmarks.jar (CASSANDRA-12586)
 + * Add row offset support to SASI (CASSANDRA-11990)
 + * 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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-09-01 Thread slebresne

Merge branch 'cassandra-3.0' into trunk

* cassandra-3.0:
  Fix backward compatibility issues on SELECT DISTINCT queries


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

Branch: refs/heads/trunk
Commit: 2f044b0f77c0492919154f309ad5cb013349db5f
Parents: 5f99740 5847222
Author: Sylvain Lebresne 
Authored: Thu Sep 1 15:50:09 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Sep 1 15:50:09 2016 +0200

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/ReadCommand.java| 2 +-
 src/java/org/apache/cassandra/service/pager/PagingState.java | 7 +--
 3 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f044b0f/CHANGES.txt
--
diff --cc CHANGES.txt
index 4850510,e5e2b9c..f567892
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,5 +1,62 @@@
 -3.0.9
 +3.10
 + * 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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-09-01 Thread slebresne

Merge branch 'cassandra-3.0' into trunk

* cassandra-3.0:
  Stack Overflow returned to queries while upgrading


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

Branch: refs/heads/trunk
Commit: 5f99740c7e3973f5ee724bf08fdb9986a1544926
Parents: 5f3ad28 1392893
Author: Sylvain Lebresne 
Authored: Thu Sep 1 11:15:08 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Sep 1 11:15:08 2016 +0200

--
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f99740c/CHANGES.txt
--
diff --cc CHANGES.txt
index 228cb92,d111d11..4850510
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,5 +1,62 @@@
 -3.0.9
 +3.10
 + * 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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-08-31 Thread stefania

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/ce842263
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce842263
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce842263

Branch: refs/heads/trunk
Commit: ce84226318d159b8e2f173aa80f998632446ecc4
Parents: 03a3f95 a1d9a02
Author: Stefania Alborghetti 
Authored: Thu Sep 1 10:06:57 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Sep 1 10:06:57 2016 +0800

--
 CHANGES.txt   |   1 +
 .../org/apache/cassandra/io/sstable/Descriptor.java   |   2 +-
 .../tmp-lb-3-big-Data.db  | Bin 0 -> 93 bytes
 .../tmp-lb-3-big-Index.db | Bin 0 -> 54 bytes
 .../org/apache/cassandra/db/SystemKeyspaceTest.java   |   8 
 5 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce842263/CHANGES.txt
--
diff --cc CHANGES.txt
index 4919d19,8fde74e..66b6d1d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,60 -1,5 +1,61 @@@
 -3.0.9
 +3.10
 + * 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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-08-31 Thread marcuse

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/8a3f0e11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a3f0e11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a3f0e11

Branch: refs/heads/trunk
Commit: 8a3f0e11fecde964730cd67d6376660ae562b208
Parents: 0628099 ab98b11
Author: Marcus Eriksson 
Authored: Wed Aug 31 09:45:35 2016 +0200
Committer: Marcus Eriksson 
Committed: Wed Aug 31 09:45:35 2016 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/tools/SSTableMetadataViewer.java  | 40 +---
 2 files changed, 36 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a3f0e11/CHANGES.txt
--
diff --cc CHANGES.txt
index 6b1acb5,4b77e4d..a0f6055
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,59 -1,5 +1,60 @@@
 -3.0.9
 +3.10
 + * 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:
+  * Add option to

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-08-30 Thread dbrosius

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/c5f12802
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5f12802
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5f12802

Branch: refs/heads/trunk
Commit: c5f128021617d67bcb1279e95df6c4be2dde90c2
Parents: 71640f1 4133c74
Author: Dave Brosius 
Authored: Tue Aug 30 22:42:17 2016 -0400
Committer: Dave Brosius 
Committed: Tue Aug 30 22:42:17 2016 -0400

--

--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-08-29 Thread stefania

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/5db69633
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5db69633
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5db69633

Branch: refs/heads/trunk
Commit: 5db69633937d05bdeb8c00f59dd220bcd86a2b42
Parents: f0c94a4 5cda140
Author: Stefania Alborghetti 
Authored: Tue Aug 30 08:52:22 2016 +0800
Committer: Stefania Alborghetti 
Committed: Tue Aug 30 08:52:22 2016 +0800

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/db/lifecycle/LogFile.java   | 2 +-
 src/java/org/apache/cassandra/db/lifecycle/LogRecord.java | 9 +++--
 3 files changed, 9 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5db69633/CHANGES.txt
--
diff --cc CHANGES.txt
index 3dd46de,7a1fbc5..5d665b4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,57 -1,5 +1,58 @@@
 -3.0.9
 +3.10
 + * 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:
+  * Fix file system race condition that may cause LogAwareFileLister to fail 
to

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-08-26 Thread tylerhobbs

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/dc1712a8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc1712a8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc1712a8

Branch: refs/heads/trunk
Commit: dc1712a81b3ec03a674d8ba5df8ca7f2fade5cdd
Parents: 708b053 da07130
Author: Tyler Hobbs 
Authored: Fri Aug 26 12:06:46 2016 -0500
Committer: Tyler Hobbs 
Committed: Fri Aug 26 12:06:46 2016 -0500

--
 CHANGES.txt   |  3 +++
 .../apache/cassandra/db/lifecycle/LogAwareFileLister.java | 10 ++
 src/java/org/apache/cassandra/db/lifecycle/LogFile.java   |  4 ++--
 .../org/apache/cassandra/db/lifecycle/LogReplica.java |  4 ++--
 .../org/apache/cassandra/db/lifecycle/LogReplicaSet.java  |  5 +++--
 .../org/apache/cassandra/db/lifecycle/LogTransaction.java |  7 +--
 6 files changed, 17 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc1712a8/CHANGES.txt
--
diff --cc CHANGES.txt
index 0635398,cf14f67..b3975da
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,57 -1,7 +1,60 @@@
 -3.0.9
 +3.10
 + * 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)
 + * 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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-08-26 Thread yukim

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/708b0534
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/708b0534
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/708b0534

Branch: refs/heads/trunk
Commit: 708b0534fa4f3dff5db71a474e1231ce573c5f85
Parents: 05660a5 f092f7b
Author: Yuki Morishita 
Authored: Fri Aug 26 08:27:05 2016 -0500
Committer: Yuki Morishita 
Committed: Fri Aug 26 08:27:05 2016 -0500

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/tools/RepairRunner.java | 4 
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/708b0534/CHANGES.txt
--
diff --cc CHANGES.txt
index dad1077,59c8a4b..0635398
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,57 -1,5 +1,58 @@@
 -3.0.9
 +3.10
 + * 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)
 + * 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:
+  * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
   * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
   * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-08-25 Thread stefania

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/d34c15b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d34c15b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d34c15b7

Branch: refs/heads/trunk
Commit: d34c15b7868fea8018b5bfd4ddfa557d17fd83dc
Parents: 768e717 b89ffe7
Author: Stefania Alborghetti 
Authored: Fri Aug 26 09:37:41 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Aug 26 09:37:41 2016 +0800

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d34c15b7/CHANGES.txt
--
diff --cc CHANGES.txt
index 9d69dfe,d6f2a9d..dad1077
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,57 -1,5 +1,58 @@@
 -3.0.9
 +3.10
 + * 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)
 + * 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:
+  * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
   * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
   *

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-08-23 Thread marcuse

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/a7926b33
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7926b33
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7926b33

Branch: refs/heads/trunk
Commit: a7926b33968b9b1497fe281547e0cd0c656c7364
Parents: bdeef40 fe3f3da
Author: Marcus Eriksson 
Authored: Tue Aug 23 19:51:17 2016 +0200
Committer: Marcus Eriksson 
Committed: Tue Aug 23 19:51:17 2016 +0200

--
 .../org/apache/cassandra/db/compaction/LeveledManifest.java| 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7926b33/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-27 Thread samt

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/48e4d5da
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48e4d5da
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48e4d5da

Branch: refs/heads/trunk
Commit: 48e4d5daeb16cf5cb9751b6ec9a9034cc5e6f8df
Parents: fbbedce 2e47636
Author: Sam Tunnicliffe 
Authored: Mon Jun 27 16:02:18 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Mon Jun 27 16:02:18 2016 +0100

--
 src/java/org/apache/cassandra/config/Schema.java | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-23 Thread slebresne

Merge branch 'cassandra-3.0' into trunk

* cassandra-3.0:
  Add a metrics timer to MemtablePool and use it to track time spent blocked on 
memory in MemtableAllocator.


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

Branch: refs/heads/trunk
Commit: 5c84fe4f9deb0a8c889543dfb36ac1b55fecfc10
Parents: 4657023 458b36b
Author: Sylvain Lebresne 
Authored: Thu Jun 23 11:18:19 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jun 23 11:18:19 2016 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/utils/memory/MemtableAllocator.java   |  2 +-
 .../org/apache/cassandra/utils/memory/MemtablePool.java | 12 
 3 files changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c84fe4f/CHANGES.txt
--
diff --cc CHANGES.txt
index 59ae769,ee2f6d3..5c03f93
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
 -3.0.8
 +3.8
 + * 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:
+  * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)
   * Fix upgrading schema with super columns with non-text subcomparators 
(CASSANDRA-12023)
   * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
  Merged from 2.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c84fe4f/src/java/org/apache/cassandra/utils/memory/MemtableAllocator.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c84fe4f/src/java/org/apache/cassandra/utils/memory/MemtablePool.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-21 Thread tylerhobbs

Merge branch 'cassandra-3.0' into trunk

Conflicts:
src/java/org/apache/cassandra/schema/TableParams.java


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

Branch: refs/heads/trunk
Commit: 6a7985d87a794e95c5e17a3aa9d73c5ed42177ff
Parents: 063e917 621d08a
Author: Tyler Hobbs 
Authored: Tue Jun 21 11:14:09 2016 -0500
Committer: Tyler Hobbs 
Committed: Tue Jun 21 11:14:09 2016 -0500

--
 CHANGES.txt |  2 +
 .../apache/cassandra/schema/TableParams.java|  7 ++-
 .../cassandra/utils/BloomCalculations.java  | 15 +-
 .../schema/CreateTableValidationTest.java   | 51 
 4 files changed, 71 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a7985d8/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a7985d8/src/java/org/apache/cassandra/schema/TableParams.java
--
diff --cc src/java/org/apache/cassandra/schema/TableParams.java
index 16b4427,29d3e29..02112af
--- a/src/java/org/apache/cassandra/schema/TableParams.java
+++ b/src/java/org/apache/cassandra/schema/TableParams.java
@@@ -25,7 -25,7 +25,8 @@@ import com.google.common.base.Objects
  import com.google.common.collect.ImmutableMap;
  
  import org.apache.cassandra.exceptions.ConfigurationException;
+ import org.apache.cassandra.utils.BloomCalculations;
 +
  import static java.lang.String.format;
  
  public final class TableParams

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-20 Thread aleksey

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/fb781c99
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb781c99
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb781c99

Branch: refs/heads/trunk
Commit: fb781c99bb82395a0bca3aca41f621e00c3e3074
Parents: 88229a4 b671522
Author: Aleksey Yeschenko 
Authored: Mon Jun 20 18:08:32 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jun 20 18:08:32 2016 +0100

--
 CHANGES.txt  |  2 ++
 src/java/org/apache/cassandra/db/CompactTables.java  | 11 +++
 .../apache/cassandra/schema/LegacySchemaMigrator.java|  6 --
 3 files changed, 13 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb781c99/CHANGES.txt
--
diff --cc CHANGES.txt
index d09cd5a,cc682c4..519856a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 -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:
+  * Fix upgrading schema with super columns with non-text subcomparators 
(CASSANDRA-12023)
   * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
  Merged from 2.2:
   * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038)
@@@ -26,10 -10,8 +27,11 @@@ Merged from 2.1
   * Create interval tree over canonical sstables to avoid missing sstables 
during streaming (CASSANDRA-11886)
   * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid 
corrupting SSL connections (CASSANDRA-11749)
  
+ 
 -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/fb781c99/src/java/org/apache/cassandra/db/CompactTables.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb781c99/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-17 Thread jmckenzie

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/c35e55de
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c35e55de
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c35e55de

Branch: refs/heads/trunk
Commit: c35e55de455dc790264f0a9e72be19967cbadc8a
Parents: 6c9c091 863dbc7
Author: Josh McKenzie 
Authored: Fri Jun 17 13:43:56 2016 -0400
Committer: Josh McKenzie 
Committed: Fri Jun 17 13:43:56 2016 -0400

--
 .../org/apache/cassandra/cql3/Constants.java|  1 +
 .../cassandra/db/marshal/TimeTypeTest.java  | 27 ++--
 2 files changed, 26 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c35e55de/src/java/org/apache/cassandra/cql3/Constants.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-14 Thread jmckenzie

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/60e5e0ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60e5e0ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60e5e0ef

Branch: refs/heads/trunk
Commit: 60e5e0ef4c6c9dbbb6c81fce07fec26433b57a69
Parents: 5514110 3c531cb
Author: Josh McKenzie 
Authored: Tue Jun 14 11:13:42 2016 -0400
Committer: Josh McKenzie 
Committed: Tue Jun 14 11:13:42 2016 -0400

--
 conf/metrics-reporter-config-sample.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-14 Thread jake

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/5514110e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5514110e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5514110e

Branch: refs/heads/trunk
Commit: 5514110e07bbef5f71110afdc195f1456545755d
Parents: bdd8e8a 972157d
Author: T Jake Luciani 
Authored: Tue Jun 14 10:49:09 2016 -0400
Committer: T Jake Luciani 
Committed: Tue Jun 14 10:49:09 2016 -0400

--

--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-14 Thread jmckenzie

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/b2352189
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2352189
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2352189

Branch: refs/heads/trunk
Commit: b2352189fecd2ac78600a09eab6323736c05506d
Parents: 719e7d6 0d5984b
Author: Josh McKenzie 
Authored: Tue Jun 14 10:18:37 2016 -0400
Committer: Josh McKenzie 
Committed: Tue Jun 14 10:18:37 2016 -0400

--
 .../cql3/validation/entities/UserTypesTest.java | 28 
 1 file changed, 28 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2352189/test/unit/org/apache/cassandra/cql3/validation/entities/UserTypesTest.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-06 Thread marcuse

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/8ef1e2ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ef1e2ce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ef1e2ce

Branch: refs/heads/trunk
Commit: 8ef1e2ce252217a8a945b32087b5ae612568f908
Parents: 5e913ab 6c867f0
Author: Marcus Eriksson 
Authored: Tue Jun 7 07:45:10 2016 +0200
Committer: Marcus Eriksson 
Committed: Tue Jun 7 07:45:10 2016 +0200

--
 CHANGES.txt |   2 +
 NEWS.txt|  10 +
 doc/cql3/CQL.textile|   5 +-
 pylib/cqlshlib/cql3handling.py  |   7 +
 pylib/cqlshlib/cqlhandling.py   |   3 +-
 pylib/cqlshlib/test/test_cqlsh_completion.py|  11 +-
 .../DateTieredCompactionStrategy.java   |   4 +
 .../TimeWindowCompactionStrategy.java   | 380 +++
 .../TimeWindowCompactionStrategyOptions.java| 148 
 .../db/compaction/CompactionsCQLTest.java   |  13 +
 .../TimeWindowCompactionStrategyTest.java   | 274 +
 11 files changed, 854 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ef1e2ce/CHANGES.txt
--
diff --cc CHANGES.txt
index 40ffdf3,cdbaebb..d18fc9d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,8 +1,22 @@@
 -3.0.8
 +3.8
 + * 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)
  
  
 -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/8ef1e2ce/NEWS.txt
--
diff --cc NEWS.txt
index f8b589f,dbaece1..076d024
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,33 -13,31 +13,43 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 -3.0.7
 -=
  
 -Upgrading
 --
 -   - A maximum size for SSTables values has been introduced, to prevent out 
of memory
 - exceptions when reading corrupt SSTables. This maximum size can be set 
via
 - max_value_size_in_mb in cassandra.yaml. The default is 256MB, which 
matches the default
 - value of native_transport_max_frame_size_in_mb. SSTables will be 
considered corrupt if
 - they contain values whose size exceeds this limit. See CASSANDRA-9530 
for more details.
 +3.8
 +===
 +
 +New features
 +
 +   - A new option has been added to cassandra-stress "-rate fixed={number}/s"
 + that forces a scheduled rate of operations/sec over time. Using this, 
stress can
 + accurately account for coordinated ommission from the stress process.
 +   - The cassandra-stress "-rate limit=" option has been renamed to "-rate 
throttle="
 +   - hdr histograms have been added to stress runs, it's output can be saved 
to disk using:
 + "-log hdrfile=" option. This histogram includes response/service/wait 
times when used with the
 + fixed or throttle rate options.  The histogram file can be plotted on
 + http://hdrhistogram.github.io/HdrHistogram/plotFiles.html
++   - TimeWindowCompactionStrategy has been added. This has proven to be a 
better approach
++ to time series compaction and new tables should use this instead of 
DTCS. See
++ CASSANDRA-9666 for details.
+ 
+ Deprecation
+ ---
+- DateTieredCompactionStrategy has been deprecated - new tables should use
+

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-05-02 Thread carl

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/7a7249ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a7249ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a7249ac

Branch: refs/heads/trunk
Commit: 7a7249ac4437689dc5091a121aa143ff7bfb97e0
Parents: e16d8a7 6d725af
Author: Carl Yeksigian 
Authored: Mon May 2 16:13:19 2016 -0400
Committer: Carl Yeksigian 
Committed: Mon May 2 16:13:19 2016 -0400

--
 CHANGES.txt |  1 +
 .../cql3/statements/CreateViewStatement.java| 15 ++---
 .../org/apache/cassandra/cql3/ViewTest.java | 22 ++--
 3 files changed, 29 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a7249ac/CHANGES.txt
--
diff --cc CHANGES.txt
index 1a3069c,f947568..4ff5b1a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,70 -1,5 +1,71 @@@
 -3.0.6
 +3.6
 + * Enhanced Compaction Logging (CASSANDRA-10805)
 + * Make prepared statement cache size configurable (CASSANDRA-11555)
 + * Integrated JMX authentication and authorization (CASSANDRA-10091)
 + * Add units to stress ouput (CASSANDRA-11352)
 + * Fix PER PARTITION LIMIT for single and multi partitions queries 
(CASSANDRA-11603)
 + * Add uncompressed chunk cache for RandomAccessReader (CASSANDRA-5863)
 + * Clarify ClusteringPrefix hierarchy (CASSANDRA-11213)
 + * Always perform collision check before joining ring (CASSANDRA-10134)
 + * SSTableWriter output discrepancy (CASSANDRA-11646)
 + * Fix potential timeout in NativeTransportService.testConcurrentDestroys 
(CASSANDRA-10756)
 + * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
 + * Add support to rebuild from specific range (CASSANDRA-10406)
 + * Optimize the overlapping lookup by calculating all the
 +   bounds in advance (CASSANDRA-11571)
 + * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
 + * (stress) Add datacenter option to -node options (CASSANDRA-11591)
 + * 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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-05-02 Thread snazy

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/b57e6bd8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b57e6bd8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b57e6bd8

Branch: refs/heads/trunk
Commit: b57e6bd846d202c466ca21ec68efc65bf838106a
Parents: 9581209 a1cc804
Author: Robert Stupp 
Authored: Mon May 2 17:09:37 2016 +0200
Committer: Robert Stupp 
Committed: Mon May 2 17:09:37 2016 +0200

--
 lib/licenses/ohc-0.4.2.txt | 201 
 lib/licenses/ohc-0.4.3.txt | 201 
 2 files changed, 201 insertions(+), 201 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-05-02 Thread slebresne

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/3513fbcf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3513fbcf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3513fbcf

Branch: refs/heads/trunk
Commit: 3513fbcfb9c721b4569c9e4e3d8427d0351fa4b4
Parents: 4edd9ed b178d89
Author: Sylvain Lebresne 
Authored: Mon May 2 16:08:39 2016 +0200
Committer: Sylvain Lebresne 
Committed: Mon May 2 16:08:39 2016 +0200

--
 guide_8099.md | 376 -
 1 file changed, 376 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-05-02 Thread slebresne

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/b6cc43e8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6cc43e8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6cc43e8

Branch: refs/heads/trunk
Commit: b6cc43e879d73d593957416e04dfc4af0f14cf19
Parents: a62f70d de228c7
Author: Sylvain Lebresne 
Authored: Mon May 2 12:18:14 2016 +0200
Committer: Sylvain Lebresne 
Committed: Mon May 2 12:18:14 2016 +0200

--

--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-05-02 Thread samt

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/1800a5b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1800a5b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1800a5b6

Branch: refs/heads/trunk
Commit: 1800a5b627ce8fa4186d4b52902d029920bd8e5a
Parents: a529e6a c08eeaf
Author: Sam Tunnicliffe 
Authored: Mon May 2 11:12:01 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Mon May 2 11:14:21 2016 +0100

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/filter/RowFilter.java   | 22 ++
 .../cql3/validation/entities/CountersTest.java  | 76 +++-
 .../cql3/validation/operations/SelectTest.java  | 38 +-
 4 files changed, 135 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1800a5b6/CHANGES.txt
--
diff --cc CHANGES.txt
index b1ca6dd,95f450b..d30b7a4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,67 -1,5 +1,68 @@@
 -3.0.6
 +3.6
 + * Add units to stress ouput (CASSANDRA-11352)
 + * Fix PER PARTITION LIMIT for single and multi partitions queries 
(CASSANDRA-11603)
 + * Add uncompressed chunk cache for RandomAccessReader (CASSANDRA-5863)
 + * Clarify ClusteringPrefix hierarchy (CASSANDRA-11213)
 + * Always perform collision check before joining ring (CASSANDRA-10134)
 + * SSTableWriter output discrepancy (CASSANDRA-11646)
 + * Fix potential timeout in NativeTransportService.testConcurrentDestroys 
(CASSANDRA-10756)
 + * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
 + * Add support to rebuild from specific range (CASSANDRA-10406)
 + * Optimize the overlapping lookup by calculating all the
 +   bounds in advance (CASSANDRA-11571)
 + * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
 + * (stress) Add datacenter option to -node options (CASSANDRA-11591)
 + * 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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-29 Thread yukim

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/c6778c5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6778c5a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6778c5a

Branch: refs/heads/trunk
Commit: c6778c5afb2456b0f625bc05de9a8caffc2898d8
Parents: ff4d0f9 620efdc
Author: Yuki Morishita 
Authored: Fri Apr 29 14:33:41 2016 -0500
Committer: Yuki Morishita 
Committed: Fri Apr 29 14:33:41 2016 -0500

--
 CHANGES.txt |   1 +
 .../apache/cassandra/tools/JsonTransformer.java | 112 +--
 .../apache/cassandra/tools/SSTableExport.java   |  11 +-
 3 files changed, 85 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6778c5a/CHANGES.txt
--
diff --cc CHANGES.txt
index 8ee39dc,64bcbd8..b1ca6dd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,67 -1,5 +1,68 @@@
 -3.0.6
 +3.6
 + * Add units to stress ouput (CASSANDRA-11352)
 + * Fix PER PARTITION LIMIT for single and multi partitions queries 
(CASSANDRA-11603)
 + * Add uncompressed chunk cache for RandomAccessReader (CASSANDRA-5863)
 + * Clarify ClusteringPrefix hierarchy (CASSANDRA-11213)
 + * Always perform collision check before joining ring (CASSANDRA-10134)
 + * SSTableWriter output discrepancy (CASSANDRA-11646)
 + * Fix potential timeout in NativeTransportService.testConcurrentDestroys 
(CASSANDRA-10756)
 + * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
 + * Add support to rebuild from specific range (CASSANDRA-10406)
 + * Optimize the overlapping lookup by calculating all the
 +   bounds in advance (CASSANDRA-11571)
 + * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
 + * (stress) Add datacenter option to -node options (CASSANDRA-11591)
 + * 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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-29 Thread samt

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/99f0ff93
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99f0ff93
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99f0ff93

Branch: refs/heads/trunk
Commit: 99f0ff9384257c7aab37df027a8b2f3f53963b6e
Parents: b2d8e88 b15983e
Author: Sam Tunnicliffe 
Authored: Fri Apr 29 15:03:14 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Fri Apr 29 15:03:14 2016 +0100

--

--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-27 Thread aleksey

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/4254de17
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4254de17
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4254de17

Branch: refs/heads/trunk
Commit: 4254de17f4416fbd032068f2223ba32c5e8d097b
Parents: 5c5cc54 7a2be8f
Author: Aleksey Yeschenko 
Authored: Wed Apr 27 18:26:22 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Wed Apr 27 18:26:22 2016 +0100

--
 CHANGES.txt|  1 +
 conf/cassandra-env.ps1 | 14 +--
 conf/cassandra-env.sh  | 58 ++---
 3 files changed, 37 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4254de17/CHANGES.txt
--
diff --cc CHANGES.txt
index 50ec72b,8877fa9..6466310
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,64 -1,5 +1,65 @@@
 -3.0.6
 +3.6
 + * Always perform collision check before joining ring (CASSANDRA-10134)
 + * SSTableWriter output discrepancy (CASSANDRA-11646)
 + * Fix potential timeout in NativeTransportService.testConcurrentDestroys 
(CASSANDRA-10756)
 + * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
 + * JSON datetime formatting needs timezone (CASSANDRA-11137)
 + * Add support to rebuild from specific range (CASSANDRA-10406)
 + * Optimize the overlapping lookup by calculating all the
 +   bounds in advance (CASSANDRA-11571)
 + * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
 + * (stress) Add datacenter option to -node options (CASSANDRA-11591)
 + * 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)
 +

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-26 Thread yukim

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/30073079
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30073079
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30073079

Branch: refs/heads/trunk
Commit: 300730790b3723caca1142a02ac50cae864a781d
Parents: 16ea55b 049d70c
Author: Yuki Morishita 
Authored: Tue Apr 26 08:07:39 2016 -0500
Committer: Yuki Morishita 
Committed: Tue Apr 26 08:07:39 2016 -0500

--
 CHANGES.txt  |  1 +
 src/java/org/apache/cassandra/tools/JsonTransformer.java | 11 ---
 2 files changed, 5 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/30073079/CHANGES.txt
--
diff --cc CHANGES.txt
index cd9220b,11bbbed..e80e1d5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,5 +1,63 @@@
 -3.0.6
 +3.6
 + * Fix potential timeout in NativeTransportService.testConcurrentDestroys 
(CASSANDRA-10756)
 + * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
 + * JSON datetime formatting needs timezone (CASSANDRA-11137)
 + * Add support to rebuild from specific range (CASSANDRA-10409)
 + * Optimize the overlapping lookup by calculating all the
 +   bounds in advance (CASSANDRA-11571)
 + * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
 + * (stress) Add datacenter option to -node options (CASSANDRA-11591)
 + * 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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-21 Thread tylerhobbs

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/848352fa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/848352fa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/848352fa

Branch: refs/heads/trunk
Commit: 848352fae35df84d1d5bdf6c01f9fb925847a044
Parents: bc8a56d d8d920d
Author: Tyler Hobbs 
Authored: Thu Apr 21 15:33:33 2016 -0500
Committer: Tyler Hobbs 
Committed: Thu Apr 21 15:33:33 2016 -0500

--
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/848352fa/src/java/org/apache/cassandra/gms/FailureDetector.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-20 Thread samt

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/a5e501f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5e501f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5e501f0

Branch: refs/heads/trunk
Commit: a5e501f094e882e1531abf9bf205e8a59730ed70
Parents: 7cd14d0 14f08e6
Author: Sam Tunnicliffe 
Authored: Wed Apr 20 16:04:18 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Wed Apr 20 16:06:51 2016 +0100

--
 CHANGES.txt |  1 +
 .../index/internal/keys/KeysSearcher.java   | 33 ++--
 2 files changed, 31 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5e501f0/CHANGES.txt
--
diff --cc CHANGES.txt
index 08efbfb,ae73437..ca679b2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,58 -1,5 +1,59 @@@
 -3.0.6
 +3.6
 + * Optimize the overlapping lookup by calculating all the
 +   bounds in advance (CASSANDRA-11571)
 + * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
 + * (stress) Add datacenter option to -node options (CASSANDRA-11591)
 + * 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:
+  * Ensure columnfilter covers indexed columns for thrift 2i queries 
(CASSANDRA-11523)
   * Only open one sstable scanner per

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-20 Thread yukim

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/7cd14d08
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7cd14d08
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7cd14d08

Branch: refs/heads/trunk
Commit: 7cd14d0894c4fc9d549af848249d2cfe1fcb82f0
Parents: 0541597 5a77bd1
Author: Yuki Morishita 
Authored: Wed Apr 20 09:52:51 2016 -0500
Committer: Yuki Morishita 
Committed: Wed Apr 20 09:52:51 2016 -0500

--
 src/java/org/apache/cassandra/tools/SSTableExport.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-19 Thread marcuse

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/0541597e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0541597e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0541597e

Branch: refs/heads/trunk
Commit: 0541597e792cb43ef019db7257e66da8671beea4
Parents: c83729f 9b48a0b
Author: Marcus Eriksson 
Authored: Wed Apr 20 06:33:51 2016 +0200
Committer: Marcus Eriksson 
Committed: Wed Apr 20 06:58:40 2016 +0200

--
 CHANGES.txt |  1 +
 .../compaction/AbstractCompactionStrategy.java  | 11 --
 .../compaction/CompactionStrategyManager.java   | 30 +-
 .../compaction/LeveledCompactionStrategy.java   | 41 
 .../io/sstable/format/big/BigTableReader.java   |  5 ++-
 5 files changed, 47 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0541597e/CHANGES.txt
--
diff --cc CHANGES.txt
index 1e6bcd6,cc50a23..08efbfb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,58 -1,5 +1,59 @@@
 -3.0.6
 +3.6
 + * Optimize the overlapping lookup by calculating all the
 +   bounds in advance (CASSANDRA-11571)
 + * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
 + * (stress) Add datacenter option to -node options (CASSANDRA-11591)
 + * 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

[3/3] cassandra git commit: Merge branch cassandra-3.0 into trunk

2016-04-19 Thread blerer

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/30bfa07a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30bfa07a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30bfa07a

Branch: refs/heads/trunk
Commit: 30bfa07a48d9a0a2fb206e1b56e9dd9396bc1984
Parents: 391cae6 0e96d3e
Author: Benjamin Lerer 
Authored: Tue Apr 19 17:53:25 2016 +0200
Committer: Benjamin Lerer 
Committed: Tue Apr 19 17:54:12 2016 +0200

--
 .../apache/cassandra/cql3/functions/AggregateFcts.java| 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bfa07a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-18 Thread jake

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/fb13df43
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb13df43
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb13df43

Branch: refs/heads/trunk
Commit: fb13df431b283a386706961540bdbccc2b375beb
Parents: 28cd76c 99ea2ee
Author: T Jake Luciani 
Authored: Mon Apr 18 10:01:29 2016 -0400
Committer: T Jake Luciani 
Committed: Mon Apr 18 10:01:29 2016 -0400

--
 CHANGES.txt   |  1 +
 .../apache/cassandra/stress/settings/SettingsMode.java| 10 +-
 .../apache/cassandra/stress/util/JavaDriverClient.java|  4 +++-
 3 files changed, 13 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb13df43/CHANGES.txt
--
diff --cc CHANGES.txt
index 5cd20e3,c9538a8..05ebc7c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,54 -1,5 +1,55 @@@
 -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

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-15 Thread snazy

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/dc569c9e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc569c9e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc569c9e

Branch: refs/heads/trunk
Commit: dc569c9e05eb5145801b438c08c9f681044d1c50
Parents: 4e09d76 ce44599
Author: Robert Stupp 
Authored: Fri Apr 15 20:33:55 2016 +0200
Committer: Robert Stupp 
Committed: Fri Apr 15 20:33:55 2016 +0200

--
 CHANGES.txt  |  1 +
 .../cassandra/cql3/functions/AggregateFcts.java  |  8 +---
 .../validation/operations/AggregationTest.java   | 19 +++
 3 files changed, 25 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc569c9e/CHANGES.txt
--
diff --cc CHANGES.txt
index 7db486d,85660d9..c91a4cd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,5 +1,51 @@@
 -3.0.6
 +3.6
 + * 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:
+  * 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 of expired rows during compaction (CASSANDRA-11329)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc569c9e/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-11 Thread marcuse

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/2ae587f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ae587f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ae587f5

Branch: refs/heads/trunk
Commit: 2ae587f5c97c2728d02a3a1f254331efefd1b61b
Parents: f5b2660 063b376
Author: Marcus Eriksson 
Authored: Mon Apr 11 13:30:26 2016 +0200
Committer: Marcus Eriksson 
Committed: Mon Apr 11 13:30:26 2016 +0200

--
 CHANGES.txt |  1 +
 .../db/lifecycle/LogAwareFileLister.java| 42 -
 .../apache/cassandra/db/lifecycle/LogFile.java  | 13 +++-
 .../cassandra/db/lifecycle/LogRecord.java   |  7 +++
 .../db/lifecycle/LogTransactionTest.java| 66 
 5 files changed, 112 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ae587f5/CHANGES.txt
--
diff --cc CHANGES.txt
index 59ab55b,47e6105..3adde47
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,5 +1,46 @@@
 -3.0.6
 +3.6
 + * 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:
+  * LogAwareFileLister should only use OLD sstable files in current folder to 
determine disk consistency (CASSANDRA-11470)
   * Notify indexers of expired rows during compaction (CASSANDRA-11329)
   * Properly respond with ProtocolError when a v1/v2 native protocol
 header is received (CASSANDRA-11464)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ae587f5/src/java/org/apache/cassandra/db/lifecycle/LogAwareFileLister.java
--
diff --cc src/java/org/apache/cassandra/db/lifecycle/LogAwareFileLister.java
index 3393b5c,4d3d46d..5f9ca93
--- a/src/java/org/apache/cassandra/db/lifecycle/LogAwareFileLister.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/LogAwareFileLister.java
@@@ -143,8 -147,18 +147,17

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-06 Thread samt

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/b680ddd6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b680ddd6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b680ddd6

Branch: refs/heads/trunk
Commit: b680ddd61038d41344bcb6e1c63948bcfe922413
Parents: ee4bada 4245932
Author: Sam Tunnicliffe 
Authored: Wed Apr 6 15:50:22 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Wed Apr 6 15:50:22 2016 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/index/SecondaryIndexManager.java  | 19 +-
 .../index/internal/CassandraIndex.java  |  2 +-
 .../apache/cassandra/index/CustomIndexTest.java | 27 
 4 files changed, 41 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b680ddd6/CHANGES.txt
--
diff --cc CHANGES.txt
index 5aa56fe,26ab66d..95ff24c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,40 -1,5 +1,41 @@@
 -3.0.6
 +3.6
 + * 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:
+  * Notify indexers of expired rows during compaction (CASSANDRA-11329)
   * Properly respond with ProtocolError when a v1/v2 native protocol
 header is received (CASSANDRA-11464)
   * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b680ddd6/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b680ddd6/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b680ddd6/test/unit/org/apache/cassandra/index/CustomIndexTest.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-05 Thread slebresne

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/d5e400df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5e400df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5e400df

Branch: refs/heads/trunk
Commit: d5e400dfe39b91b839734cb38d6f7b9df1b2b1c3
Parents: e9ef792 ac6ca9c
Author: Sylvain Lebresne 
Authored: Tue Apr 5 16:32:08 2016 +0200
Committer: Sylvain Lebresne 
Committed: Tue Apr 5 16:32:08 2016 +0200

--
 CHANGES.txt|  2 ++
 .../cassandra/config/DatabaseDescriptor.java   | 17 -
 2 files changed, 14 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5e400df/CHANGES.txt
--
diff --cc CHANGES.txt
index d576b8e,4baaa30..5c6bdb5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,5 +1,38 @@@
 -3.0.6
 +3.6
 + * 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:
+  * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
  Merged from 2.2:
   * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5e400df/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-05 Thread slebresne

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/e9ef792c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9ef792c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9ef792c

Branch: refs/heads/trunk
Commit: e9ef792c274cd7ebd9c30d6a21b1ef0d2b6bf5eb
Parents: b7d1d44 45f1db0
Author: Sylvain Lebresne 
Authored: Tue Apr 5 16:17:02 2016 +0200
Committer: Sylvain Lebresne 
Committed: Tue Apr 5 16:17:02 2016 +0200

--
 src/java/org/apache/cassandra/db/LivenessInfo.java | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9ef792c/src/java/org/apache/cassandra/db/LivenessInfo.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-29 Thread aleksey

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/001bdd30
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/001bdd30
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/001bdd30

Branch: refs/heads/trunk
Commit: 001bdd306043f951f27369f9887bda6935026900
Parents: 5ea02a2 a20a0f7
Author: Aleksey Yeschenko 
Authored: Mon Feb 29 15:47:42 2016 +
Committer: Aleksey Yeschenko 
Committed: Mon Feb 29 15:47:42 2016 +

--
 src/java/org/apache/cassandra/service/StorageService.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/001bdd30/src/java/org/apache/cassandra/service/StorageService.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-29 Thread slebresne

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/1fce6484
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fce6484
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fce6484

Branch: refs/heads/trunk
Commit: 1fce64843daeb4208dc066c5ac1e41e58c655be0
Parents: 6a4d106 8fc1b28
Author: Sylvain Lebresne 
Authored: Mon Feb 29 15:39:36 2016 +0100
Committer: Sylvain Lebresne 
Committed: Mon Feb 29 15:39:36 2016 +0100

--
 src/java/org/apache/cassandra/utils/memory/MemoryUtil.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fce6484/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-26 Thread carl

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/e1a14f50
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1a14f50
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1a14f50

Branch: refs/heads/trunk
Commit: e1a14f502aaf25627a09eca9679cfafb068066fa
Parents: 6237022 9961b69
Author: Carl Yeksigian 
Authored: Fri Feb 26 15:59:35 2016 -0500
Committer: Carl Yeksigian 
Committed: Fri Feb 26 15:59:35 2016 -0500

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/db/view/View.java |  2 +-
 .../org/apache/cassandra/cql3/ViewTest.java | 47 +---
 3 files changed, 34 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1a14f50/CHANGES.txt
--
diff --cc CHANGES.txt
index fbf9085,fbc1c8a..00e3afe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,35 @@@
 -3.0.4
 +3.4
 + * Allow custom tracing implementations (CASSANDRA-10392)
 + * Extract LoaderOptions to be able to be used from outside (CASSANDRA-10637)
 + * fix OnDiskIndexTest to properly treat empty ranges (CASSANDRA-11205)
 + * 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:
+  * MV should only query complex columns included in the view (CASSANDRA-11069)
   * Failed aggregate creation breaks server permanently (CASSANDRA-11064)
   * Add sstabledump tool (CASSANDRA-7464)
   * Introduce backpressure for hints (CASSANDRA-10972)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1a14f50/src/java/org/apache/cassandra/db/view/View.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-25 Thread snazy

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/6237022e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6237022e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6237022e

Branch: refs/heads/trunk
Commit: 6237022e0234a71f5ca3d01aaefcecfd28bcdf71
Parents: bf25e66 c6ed2e0
Author: Robert Stupp 
Authored: Thu Feb 25 07:49:39 2016 -0800
Committer: Robert Stupp 
Committed: Thu Feb 25 07:49:39 2016 -0800

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/cql3/CQL3Type.java | 238 ---
 .../org/apache/cassandra/cql3/Constants.java|   9 +-
 .../cassandra/cql3/functions/CastFcts.java  |   4 +-
 .../statements/CreateAggregateStatement.java|  21 ++
 .../apache/cassandra/schema/SchemaKeyspace.java |   2 +-
 .../serializers/AbstractTextSerializer.java |  30 +--
 .../cassandra/serializers/BytesSerializer.java  |  14 +-
 .../serializers/TimestampSerializer.java|   9 +-
 .../cassandra/serializers/TypeSerializer.java   |   9 +-
 .../cassandra/cql3/CQL3TypeLiteralTest.java |  88 +++
 .../validation/operations/AggregationTest.java  |  72 ++
 12 files changed, 251 insertions(+), 246 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6237022e/CHANGES.txt
--
diff --cc CHANGES.txt
index bc21818,bdcf328..fbf9085
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,35 @@@
 -3.0.4
 +3.4
 + * Allow custom tracing implementations (CASSANDRA-10392)
 + * Extract LoaderOptions to be able to be used from outside (CASSANDRA-10637)
 + * fix OnDiskIndexTest to properly treat empty ranges (CASSANDRA-11205)
 + * 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:
+  * Failed aggregate creation breaks server permanently (CASSANDRA-11064)
   * Add sstabledump tool (CASSANDRA-7464)
   * Introduce backpressure for hints (CASSANDRA-10972)
   * Fix ClusteringPrefix not being able to read tombstone range boundaries 
(CASSANDRA-11158)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6237022e/src/java/org/apache/cassandra/cql3/CQL3Type.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6237022e/src/java/org/apache/cassandra/cql3/functions/CastFcts.java
--
diff --cc src/java/org/apache/cassandra/cql3/functions/CastFcts.java
index 8669225,000..b5d3698
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/cql3/functions/CastFcts.java
+++ b/src/java/org/apache/cassandra/cql3/functions/CastFcts.java
@@@ -1,344 -1,0 +1,342 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-24 Thread yukim

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/c94a9f23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c94a9f23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c94a9f23

Branch: refs/heads/trunk
Commit: c94a9f2362a8f87e9b1ec048a54ec570c61b29fe
Parents: 6d15a6d 71b1c4a
Author: Yuki Morishita 
Authored: Wed Feb 24 11:55:18 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Feb 24 11:55:18 2016 -0600

--
 CHANGES.txt |   1 +
 NEWS.txt|   2 +
 .../org/apache/cassandra/config/CFMetaData.java |   8 +-
 .../db/rows/AbstractRangeTombstoneMarker.java   |   4 +
 .../apache/cassandra/db/rows/AbstractRow.java   |  12 +-
 .../apache/cassandra/db/rows/Unfiltered.java|   1 +
 .../io/sstable/format/SSTableReader.java|   8 +
 .../io/sstable/format/big/BigTableReader.java   |  13 +-
 .../io/sstable/format/big/BigTableScanner.java  |   5 +
 .../apache/cassandra/tools/JsonTransformer.java | 501 +++
 .../apache/cassandra/tools/SSTableExport.java   | 242 +
 .../io/sstable/SSTableScannerTest.java  |   8 +-
 tools/bin/sstabledump   |  52 ++
 tools/bin/sstabledump.bat   |  48 ++
 14 files changed, 896 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c94a9f23/CHANGES.txt
--
diff --cc CHANGES.txt
index 3aa62ae,aefc02e..50a298e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,5 +1,34 @@@
 -3.0.4
 +3.4
 + * Extract LoaderOptions to be able to be used from outside (CASSANDRA-10637)
 + * fix OnDiskIndexTest to properly treat empty ranges (CASSANDRA-11205)
 + * 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:
+  * Add sstabledump tool (CASSANDRA-7464)
   * Introduce backpressure for hints (CASSANDRA-10972)
   * Fix ClusteringPrefix not being able to read tombstone range boundaries 
(CASSANDRA-11158)
   * Prevent logging in sandboxed state (CASSANDRA-11033)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c94a9f23/NEWS.txt
--
diff --cc NEWS.txt
index 68ccefb,5fca578..d554ac2
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -18,10 -18,8 +18,12 @@@ using the provided 'sstableupgrade' too
  
  New features
  
 -   - sstabledump tool is added to be 3.0 version of former sstable2json. The 
tool only
 - supports v3.0+ SSTables. See tool's help for more detail.
 +- Internal authentication now supports caching of encrypted credentials.
 +  Reference cassandra.yaml:credentials_validity_in_ms
 +- Remote configuration of auth caches via JMX can be disabled using the
 +  the system property cassandra.disable_auth_caches_remote_configuration
++- sstabledump tool is added to be 3.0 version of former sstable2json. The 
tool only
++  supports v3.0+ SSTables. See tool's help for more detail.
  
  Upgrading
  -

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-23 Thread tylerhobbs

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/babf30dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/babf30dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/babf30dd

Branch: refs/heads/trunk
Commit: babf30dd13dfdd49398d4067edff874f64051ad2
Parents: fc9c6fa e9abaab
Author: Tyler Hobbs 
Authored: Tue Feb 23 11:29:13 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Feb 23 11:29:13 2016 -0600

--
 CHANGES.txt   |  1 +
 .../transport/messages/ErrorMessage.java  |  6 --
 .../cassandra/transport/ProtocolErrorTest.java| 18 ++
 3 files changed, 23 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/babf30dd/CHANGES.txt
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-23 Thread aleksey

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/fc9c6faa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc9c6faa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc9c6faa

Branch: refs/heads/trunk
Commit: fc9c6faa23f5662ce8d7caedb5d7f1ac3d1fcea6
Parents: 4b27287 037d24e
Author: Aleksey Yeschenko 
Authored: Tue Feb 23 15:30:35 2016 +
Committer: Aleksey Yeschenko 
Committed: Tue Feb 23 15:30:35 2016 +

--
 CHANGES.txt |  1 +
 build.xml   | 14 +++-
 .../apache/cassandra/hints/HintsBufferPool.java | 34 ++---
 .../cassandra/hints/HintsWriteExecutor.java |  3 +-
 .../cassandra/hints/HintsBufferPoolTest.java| 75 
 .../apache/cassandra/hints/HintsBufferTest.java |  2 +-
 6 files changed, 114 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc9c6faa/CHANGES.txt
--
diff --cc CHANGES.txt
index 01f0e84,a675016..dd67598
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,5 +1,33 @@@
 -3.0.4
 +3.4
 + * fix OnDiskIndexTest to properly treat empty ranges (CASSANDRA-11205)
 + * 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:
+  * Introduce backpressure for hints (CASSANDRA-10972)
   * Fix ClusteringPrefix not being able to read tombstone range boundaries 
(CASSANDRA-11158)
   * Prevent logging in sandboxed state (CASSANDRA-11033)
   * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc9c6faa/build.xml
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-23 Thread slebresne

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/030c775e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/030c775e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/030c775e

Branch: refs/heads/trunk
Commit: 030c775ee42089c3e940958caa5c31e86aff3812
Parents: 3e5c63d fe37e06
Author: Sylvain Lebresne 
Authored: Tue Feb 23 11:48:34 2016 +0100
Committer: Sylvain Lebresne 
Committed: Tue Feb 23 11:48:34 2016 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/db/ClusteringPrefix.java   |   6 +-
 .../org/apache/cassandra/db/RangeTombstone.java |   6 +
 .../cql3/QueryWithIndexedSSTableTest.java   |   4 +-
 .../cql3/TombstonesWithIndexedSSTableTest.java  | 116 +++
 5 files changed, 128 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/030c775e/CHANGES.txt
--
diff --cc CHANGES.txt
index 51b2241,da91594..01f0e84
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,5 +1,33 @@@
 -3.0.4
 +3.4
 + * fix OnDiskIndexTest to properly treat empty ranges (CASSANDRA-11205)
 + * 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:
+  * Fix ClusteringPrefix not being able to read tombstone range boundaries 
(CASSANDRA-11158)
   * Prevent logging in sandboxed state (CASSANDRA-11033)
   * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
   * Add query time validation method on Index (CASSANDRA-11043)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/030c775e/src/java/org/apache/cassandra/db/ClusteringPrefix.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-19 Thread jmckenzie

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/29066afe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29066afe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29066afe

Branch: refs/heads/trunk
Commit: 29066afea36c4a6cb85522155402be2373ac52d2
Parents: 07df8a2 70c8a53
Author: Joshua McKenzie 
Authored: Fri Feb 19 14:56:55 2016 -0500
Committer: Joshua McKenzie 
Committed: Fri Feb 19 14:56:55 2016 -0500

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 23 ---
 2 files changed, 21 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/29066afe/CHANGES.txt
--
diff --cc CHANGES.txt
index c12cc50,f0aa996..c17f85f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -66,13 -38,11 +66,14 @@@ Merged from 2.1
   * Gossiper#isEnabled is not thread safe (CASSANDRA-6)
   * Avoid major compaction mixing repaired and unrepaired sstables in DTCS 
(CASSANDRA-3)
   * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
 - * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397)
+  * (cqlsh) Display milliseconds when datetime overflows (CASSANDRA-10625)
  
  
 -3.0.3
 +3.3
 + * Avoid infinite loop if owned range is smaller than number of
 +   data dirs (CASSANDRA-11034)
 + * Avoid bootstrap hanging when existing nodes have no data to stream 
(CASSANDRA-11010)
 +Merged from 3.0:
   * Remove double initialization of newly added tables (CASSANDRA-11027)
   * Filter keys searcher results by target range (CASSANDRA-11104)
   * Fix deserialization of legacy read commands (CASSANDRA-11087)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/29066afe/bin/cqlsh.py
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-19 Thread snazy

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/fdee887b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdee887b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fdee887b

Branch: refs/heads/trunk
Commit: fdee887b425777eead75ac8f00a2128a6d2c03f8
Parents: aca2a1d a76a8ef
Author: Robert Stupp 
Authored: Fri Feb 19 10:30:50 2016 +0100
Committer: Robert Stupp 
Committed: Fri Feb 19 10:30:50 2016 +0100

--
 CHANGES.txt |  1 +
 .../cql3/functions/JavaBasedUDFunction.java | 10 +--
 .../cassandra/cql3/functions/JavaUDF.java   | 30 +++
 .../cql3/functions/ScriptBasedUDFunction.java   |  2 +-
 .../cql3/functions/UDFByteCodeVerifier.java |  4 +-
 .../cassandra/cql3/functions/UDFunction.java| 31 +++
 .../cassandra/cql3/functions/UDHelper.java  | 29 ---
 .../cassandra/cql3/functions/JavaSourceUDF.txt  |  6 +-
 test/conf/logback-test.xml  |  2 +-
 .../entities/udfverify/CallClone.java   |  4 +-
 .../entities/udfverify/CallComDatastax.java |  4 +-
 .../entities/udfverify/CallFinalize.java|  4 +-
 .../entities/udfverify/CallOrgApache.java   |  4 +-
 .../entities/udfverify/ClassWithField.java  |  4 +-
 .../udfverify/ClassWithInitializer.java |  4 +-
 .../udfverify/ClassWithInitializer2.java|  4 +-
 .../udfverify/ClassWithInitializer3.java|  4 +-
 .../udfverify/ClassWithStaticInitializer.java   |  4 +-
 .../entities/udfverify/GoodClass.java   |  4 +-
 .../entities/udfverify/UseOfSynchronized.java   |  4 +-
 .../udfverify/UseOfSynchronizedWithNotify.java  |  4 +-
 .../UseOfSynchronizedWithNotifyAll.java |  4 +-
 .../udfverify/UseOfSynchronizedWithWait.java|  4 +-
 .../udfverify/UseOfSynchronizedWithWaitL.java   |  4 +-
 .../udfverify/UseOfSynchronizedWithWaitLI.java  |  4 +-
 .../validation/operations/AggregationTest.java  | 89 
 26 files changed, 183 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdee887b/CHANGES.txt
--
diff --cc CHANGES.txt
index 830bef1,ae9d545..c12cc50
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,5 +1,32 @@@
 -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:
+  * Prevent logging in sandboxed state (CASSANDRA-11033)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdee887b/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
--
diff --cc src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
index b1dd9f9,660d494..ae30adc
--- a/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
+++ b/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
@@@

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-18 Thread tylerhobbs

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/698c8088
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/698c8088
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/698c8088

Branch: refs/heads/trunk
Commit: 698c80883dc6a0f6e80bdaa5e8f4f11871e4a461
Parents: 36950f2 c64d3a5
Author: Tyler Hobbs 
Authored: Thu Feb 18 11:10:06 2016 -0600
Committer: Tyler Hobbs 
Committed: Thu Feb 18 11:10:06 2016 -0600

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/db/marshal/UserType.java|  2 +-
 .../cql3/validation/entities/JsonTest.java   | 19 +++
 3 files changed, 21 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/698c8088/CHANGES.txt
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-15 Thread samt

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/f7d6ac7e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7d6ac7e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7d6ac7e

Branch: refs/heads/trunk
Commit: f7d6ac7e40c66b0ee00d796f2667a4810deb665e
Parents: 72cb851 9cfbc31
Author: Sam Tunnicliffe 
Authored: Mon Feb 15 13:12:43 2016 +
Committer: Sam Tunnicliffe 
Committed: Mon Feb 15 13:12:43 2016 +

--
 CHANGES.txt |  1 +
 .../cql3/statements/SelectStatement.java| 22 +-
 .../org/apache/cassandra/db/ReadCommand.java| 13 
 src/java/org/apache/cassandra/index/Index.java  | 24 --
 .../service/pager/RangeSliceQueryPager.java |  8 +-
 .../cassandra/thrift/CassandraServer.java   |  8 ++
 .../org/apache/cassandra/cql3/CQLTester.java| 32 +---
 .../apache/cassandra/index/CustomIndexTest.java | 82 +---
 8 files changed, 144 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7d6ac7e/CHANGES.txt
--
diff --cc CHANGES.txt
index 2e0c6aa,52fc3ab..c337825
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 -3.0.4
 +3.4
 + * 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:
+  * Add query time validation method on Index (CASSANDRA-11043)
   * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
   * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
   * AssertionError when listing sstable files on inconsistent disk state 
(CASSANDRA-11156)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7d6ac7e/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7d6ac7e/src/java/org/apache/cassandra/db/ReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/ReadCommand.java
index 3adee9f,c792a5a..3d044f2
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@@ -324,9 -321,22 +324,22 @@@ public abstract class ReadCommand exten
  }
  
  /**
+  * If the index manager for the CFS determines that there's an applicable
+  * 2i that can be used to execute this command, call its (optional)
+  * validation method to check that nothing in this command's parameters
+  * violates the implementation specific validation rules.
+  */
+ public void maybeValidateIndex()
+ {
+ Index index = getIndex(Keyspace.openAndGetStore(metadata));
+ if (null != index)
+ index.validate(this);
+ }
+ 
+ /**
   * Executes this command on the local host.
   *
 - * @param orderGroup the operation group spanning this command
 + * @param executionController the execution controller spanning this 
command
   *
   * @return an iterator over the result of executing this command locally.
   */

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7d6ac7e/src/java/org/apache/cassandra/index/Index.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7d6ac7e/src/java/org/apache/cassandra/thrift/CassandraServer.java

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-12 Thread slebresne

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/a800ca89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a800ca89
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a800ca89

Branch: refs/heads/trunk
Commit: a800ca898d6295420e0f43b12686466e838ca9ad
Parents: db49d3b f3b7599
Author: Sylvain Lebresne 
Authored: Fri Feb 12 12:04:42 2016 +0100
Committer: Sylvain Lebresne 
Committed: Fri Feb 12 12:04:42 2016 +0100

--
 CHANGES.txt |  1 +
 .../apache/cassandra/net/MessagingService.java  |  3 +++
 .../cassandra/net/OutboundTcpConnection.java| 11 +-
 .../cassandra/service/StorageService.java   | 21 
 4 files changed, 35 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a800ca89/CHANGES.txt
--
diff --cc CHANGES.txt
index 7c2794a,15012b1..9481544
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 -3.0.4
 +3.4
 + * 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:
+  * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
   * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
   * AssertionError when listing sstable files on inconsistent disk state 
(CASSANDRA-11156)
   * Fix wrong rack counting and invalid conditions check for TokenAllocation

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a800ca89/src/java/org/apache/cassandra/net/MessagingService.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a800ca89/src/java/org/apache/cassandra/service/StorageService.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-11 Thread marcuse

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/ebd6c23d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ebd6c23d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ebd6c23d

Branch: refs/heads/trunk
Commit: ebd6c23dffddbef5daf9068abf51c82e4a245d80
Parents: 559280b 62f94b7
Author: Marcus Eriksson 
Authored: Thu Feb 11 09:19:33 2016 +0100
Committer: Marcus Eriksson 
Committed: Thu Feb 11 09:19:33 2016 +0100

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/db/lifecycle/LogFile.java   | 2 +-
 .../org/apache/cassandra/db/lifecycle/LogTransactionTest.java | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ebd6c23d/CHANGES.txt
--
diff --cc CHANGES.txt
index 63616c0,188cdd6..df02858
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -3.0.4
 +3.4
 + * 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:
+  * AssertionError when listing sstable files on inconsistent disk state 
(CASSANDRA-11156)
   * Fix wrong rack counting and invalid conditions check for TokenAllocation
 (CASSANDRA-11139)
   * Avoid creating empty hint files (CASSANDRA-11090)

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-11 Thread slebresne

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/c7987835
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7987835
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7987835

Branch: refs/heads/trunk
Commit: c79878355d215521ec97250f7291ceff4dea79c0
Parents: b0448e6 2a824c0
Author: Sylvain Lebresne 
Authored: Thu Feb 11 13:59:32 2016 +0100
Committer: Sylvain Lebresne 
Committed: Thu Feb 11 13:59:32 2016 +0100

--
 CHANGES.txt  | 2 ++
 src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 7 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7987835/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7987835/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--
diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index d0b1256,62c78fd..2108e8a
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@@ -297,9 -297,14 +297,14 @@@ public final class SchemaKeyspac
  
  for (String table : ALL)
  {
+ // Due to CASSANDRA-11050 we want to exclude DROPPED_COLUMNS for 
schema digest computation. We can and
+ // should remove that in the next major release (so C* 4.0).
+ if (table.equals(DROPPED_COLUMNS))
+ continue;
+ 
  ReadCommand cmd = getReadCommandForTableSchema(table);
 -try (ReadOrderGroup orderGroup = cmd.startOrderGroup();
 - PartitionIterator schema = cmd.executeInternal(orderGroup))
 +try (ReadExecutionController executionController = 
cmd.executionController();
 + PartitionIterator schema = 
cmd.executeInternal(executionController))
  {
  while (schema.hasNext())
  {

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-11 Thread aleksey

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/b63e6eef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b63e6eef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b63e6eef

Branch: refs/heads/trunk
Commit: b63e6eef53053099cf238179b71553916877923d
Parents: c798783 b2f38ef
Author: Aleksey Yeschenko 
Authored: Thu Feb 11 13:08:42 2016 +
Committer: Aleksey Yeschenko 
Committed: Thu Feb 11 13:08:42 2016 +

--
 CHANGES.txt |   1 +
 .../cassandra/batchlog/BatchlogManager.java |   3 +-
 .../apache/cassandra/hints/HintVerbHandler.java |  22 +++-
 .../cassandra/hints/HintsDispatchExecutor.java  |  28 -
 .../apache/cassandra/hints/HintsDispatcher.java |   7 +-
 .../apache/cassandra/hints/HintsService.java|  20 +++-
 .../apache/cassandra/service/StorageProxy.java  |  20 +++-
 .../cassandra/service/StorageService.java   |   8 ++
 .../org/apache/cassandra/hints/HintTest.java| 109 +++
 9 files changed, 199 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b63e6eef/CHANGES.txt
--
diff --cc CHANGES.txt
index da99e3f,e723aba..ee759d4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -3.0.4
 +3.4
 + * 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:
+  * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
   * AssertionError when listing sstable files on inconsistent disk state 
(CASSANDRA-11156)
   * Fix wrong rack counting and invalid conditions check for TokenAllocation
 (CASSANDRA-11139)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b63e6eef/src/java/org/apache/cassandra/hints/HintVerbHandler.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b63e6eef/src/java/org/apache/cassandra/service/StorageProxy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b63e6eef/src/java/org/apache/cassandra/service/StorageService.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b63e6eef/test/unit/org/apache/cassandra/hints/HintTest.java
--
diff --cc test/unit/org/apache/cassandra/hints/HintTest.java
index 4d6ed15,1d486e1..658a41c
--- a/test/unit/org/apache/cassandra/hints/HintTest.java
+++ b/test/unit/org/apache/cassandra/hints/HintTest.java
@@@ -185,6 -203,97 +203,97 @@@ public class HintTes
  assertNoPartitions(key, TABLE2);
  }
  
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testChangedTopology() throws Exception
+ {
+ // create a hint
+ long now = FBUtilities.timestampMicros();
+ String key = "testChangedTopology";
+ Mutation mutation = createMutation(key, now);
+ Hint hint = Hint.create(mutation, now / 1000);
+ 
+ // Prepare metadata with injected stale endpoint serving the mutation 
key.
+ TokenMetadata tokenMeta = StorageService.instance.getTokenMetadata();
+ InetAddress local = FBUtilities.getBroadcastAddress();
+ InetAddress endpoint = InetAddress.getByName("1.1.1.1");
+ UUID localId = StorageService.instance.getLocalHostUUID();
+ UUID targetId = UUID.randomUUID();
+

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-11 Thread tylerhobbs

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/db49d3b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db49d3b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db49d3b8

Branch: refs/heads/trunk
Commit: db49d3b89db3ab8a37b643d7e20938ffce1fbc9c
Parents: bc8e878 d4e6f08
Author: Tyler Hobbs 
Authored: Thu Feb 11 17:54:30 2016 -0600
Committer: Tyler Hobbs 
Committed: Thu Feb 11 17:54:30 2016 -0600

--
 CHANGES.txt |   1 +
 .../io/sstable/format/SSTableReader.java|  13 ++-
 .../cassandra/io/sstable/SSTableReaderTest.java | 113 ++-
 3 files changed, 93 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/db49d3b8/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/db49d3b8/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/db49d3b8/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-11 Thread tylerhobbs

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/bc8e878e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc8e878e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc8e878e

Branch: refs/heads/trunk
Commit: bc8e878ec6d8c80a2082e59f7e822cb8bef10bb5
Parents: 479e8af 604c9df
Author: Tyler Hobbs 
Authored: Thu Feb 11 15:31:11 2016 -0600
Committer: Tyler Hobbs 
Committed: Thu Feb 11 15:31:11 2016 -0600

--
 CHANGES.txt  |   1 +
 pylib/cqlshlib/cql3handling.py   |   3 +-
 pylib/cqlshlib/cqlhandling.py|   2 +-
 pylib/cqlshlib/test/test_cqlsh_completion.py | 145 +++---
 pylib/cqlshlib/test/test_keyspace_init.cql   |  35 ++
 5 files changed, 165 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc8e878e/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc8e878e/pylib/cqlshlib/cql3handling.py
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-11 Thread tylerhobbs

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/6dc1004c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6dc1004c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6dc1004c

Branch: refs/heads/trunk
Commit: 6dc1004ce7eded5b0c89a92e4c495c32d2de2819
Parents: b63e6ee 9b5af91
Author: Tyler Hobbs 
Authored: Thu Feb 11 10:29:55 2016 -0600
Committer: Tyler Hobbs 
Committed: Thu Feb 11 10:29:55 2016 -0600

--
 CHANGES.txt |  3 +-
 src/java/org/apache/cassandra/cql3/Json.java| 10 ++-
 .../cassandra/cql3/selection/Selection.java |  2 +-
 .../apache/cassandra/db/marshal/AsciiType.java  |  2 +-
 .../apache/cassandra/db/marshal/MapType.java|  2 +-
 .../apache/cassandra/db/marshal/UTF8Type.java   |  2 +-
 .../apache/cassandra/db/marshal/UserType.java   |  2 +-
 .../cql3/validation/entities/JsonTest.java  | 70 +---
 8 files changed, 77 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6dc1004c/CHANGES.txt
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-10 Thread yukim

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/7863bd3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7863bd3b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7863bd3b

Branch: refs/heads/trunk
Commit: 7863bd3bfd70b5ff3f38059ab72d921a65593618
Parents: 9b0adf2 89c558a
Author: Yuki Morishita 
Authored: Wed Feb 10 18:02:12 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Feb 10 18:02:12 2016 -0600

--

--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-09 Thread aleksey

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/2fe34bad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fe34bad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fe34bad

Branch: refs/heads/trunk
Commit: 2fe34badb1e05a1ae956dfd7ce809dc253e2720e
Parents: 9adc6d8 1f62608
Author: Aleksey Yeschenko 
Authored: Tue Feb 9 13:43:04 2016 +
Committer: Aleksey Yeschenko 
Committed: Tue Feb 9 13:43:04 2016 +

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/hints/HintsWriteExecutor.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fe34bad/CHANGES.txt
--
diff --cc CHANGES.txt
index f2e37a5,6cc6368..6cd4cf5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 -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:
+  * Avoid creating empty hint files (CASSANDRA-11090)
   * Fix leak detection strong reference loop using weak reference 
(CASSANDRA-11120)
   * Configurie BatchlogManager to stop delayed tasks on shutdown 
(CASSANDRA-11062)
   * Hadoop integration is incompatible with Cassandra Driver 3.0.0 
(CASSANDRA-11001)

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-08 Thread aleksey

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/1d7f3129
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d7f3129
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d7f3129

Branch: refs/heads/trunk
Commit: 1d7f3129ad95f5303c0fc71d00e5764b5e53424e
Parents: 1e6e3d4 15092e6
Author: Aleksey Yeschenko 
Authored: Mon Feb 8 15:42:08 2016 +
Committer: Aleksey Yeschenko 
Committed: Mon Feb 8 15:42:08 2016 +

--
 CHANGES.txt |  1 +
 .../io/sstable/format/SSTableReader.java| 17 +
 .../apache/cassandra/utils/concurrent/Ref.java  | 15 ++--
 .../utils/concurrent/RefCountedTest.java| 36 
 4 files changed, 60 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d7f3129/CHANGES.txt
--
diff --cc CHANGES.txt
index 8351032,03a8bc8..0f1b4d3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 -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:
+  * Fix leak detection strong reference loop using weak reference 
(CASSANDRA-11120)
   * Configurie BatchlogManager to stop delayed tasks on shutdown 
(CASSANDRA-11062)
   * Hadoop integration is incompatible with Cassandra Driver 3.0.0 
(CASSANDRA-11001)
  Merged from 2.2.6

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d7f3129/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-08 Thread slebresne

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/696cd911
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/696cd911
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/696cd911

Branch: refs/heads/trunk
Commit: 696cd9117bc95e5fe75106473dca9b631648e256
Parents: d3f0c32 58821ce
Author: Sylvain Lebresne 
Authored: Mon Feb 8 12:39:57 2016 +0100
Committer: Sylvain Lebresne 
Committed: Mon Feb 8 12:39:57 2016 +0100

--
 .../cql3/validation/operations/DeleteTest.java  | 21 
 1 file changed, 21 insertions(+)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-08 Thread aleksey

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/1e6e3d4d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e6e3d4d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e6e3d4d

Branch: refs/heads/trunk
Commit: 1e6e3d4d2737c81cade4afe33effa7125934cf8b
Parents: 71ccb16 0a1cfaa
Author: Aleksey Yeschenko 
Authored: Mon Feb 8 13:09:58 2016 +
Committer: Aleksey Yeschenko 
Committed: Mon Feb 8 13:09:58 2016 +

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/batchlog/BatchlogManager.java | 9 -
 2 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e6e3d4d/CHANGES.txt
--
diff --cc CHANGES.txt
index 2d50c10,1fbe301..8351032
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 -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:
+  * Configurie BatchlogManager to stop delayed tasks on shutdown 
(CASSANDRA-11062)
   * 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)

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-05 Thread jasobrown

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/cbb2be19
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cbb2be19
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cbb2be19

Branch: refs/heads/trunk
Commit: cbb2be198943b53ef9f831e55974f9ed3a4f444a
Parents: 3928665 0663ebb
Author: Jason Brown 
Authored: Fri Feb 5 14:04:08 2016 -0800
Committer: Jason Brown 
Committed: Fri Feb 5 14:04:08 2016 -0800

--
 CHANGES.txt | 3 ++-
 src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbb2be19/CHANGES.txt
--
diff --cc CHANGES.txt
index e7cde67,48321f1..a4f0421
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,9 +1,29 @@@
 -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
+  * Gossiper#isEnabled is not thread safe (CASSANDRA-6)
  
 -3.0.3
 +3.3
 + * Avoid infinite loop if owned range is smaller than number of
 +   data dirs (CASSANDRA-11034)
 + * Avoid bootstrap hanging when existing nodes have no data to stream 
(CASSANDRA-11010)
 +Merged from 3.0:
   * Remove double initialization of newly added tables (CASSANDRA-11027)
   * Filter keys searcher results by target range (CASSANDRA-11104)
   * Fix deserialization of legacy read commands (CASSANDRA-11087)

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-04 Thread tylerhobbs

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/1925a014
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1925a014
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1925a014

Branch: refs/heads/trunk
Commit: 1925a014bf724ff307f328ff9f3eb44294c213b1
Parents: b51f949 7a435c3
Author: Tyler Hobbs 
Authored: Thu Feb 4 12:35:57 2016 -0600
Committer: Tyler Hobbs 
Committed: Thu Feb 4 12:35:57 2016 -0600

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1925a014/CHANGES.txt
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-31 Thread yukim

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/e8d3c9ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8d3c9ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8d3c9ea

Branch: refs/heads/trunk
Commit: e8d3c9eaee706d4b181147f30c2d640f77ef9868
Parents: bcbb53b 7f6d039
Author: Yuki Morishita 
Authored: Thu Dec 31 11:14:04 2015 -0600
Committer: Yuki Morishita 
Committed: Thu Dec 31 11:14:04 2015 -0600

--
 test/unit/org/apache/cassandra/hints/HintsCatalogTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-29 Thread snazy

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/52430b93
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52430b93
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52430b93

Branch: refs/heads/trunk
Commit: 52430b93e502dd44f6f0e1bf097ccaaa45e74fd5
Parents: b3a8486 36608ce
Author: Robert Stupp 
Authored: Tue Dec 29 15:34:17 2015 +0100
Committer: Robert Stupp 
Committed: Tue Dec 29 15:34:17 2015 +0100

--
 CHANGES.txt   | 1 +
 bin/cassandra | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/52430b93/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/52430b93/bin/cassandra
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-24 Thread jmckenzie

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/bb25f5bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb25f5bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb25f5bd

Branch: refs/heads/trunk
Commit: bb25f5bdd4ee4cc003058c06319c3c87dd10960f
Parents: 02c92df c20566f
Author: Joshua McKenzie 
Authored: Thu Dec 24 07:20:35 2015 -0500
Committer: Joshua McKenzie 
Committed: Thu Dec 24 07:20:35 2015 -0500

--
 CHANGES.txt |   3 +-
 NEWS.txt|   3 +
 conf/cassandra.yaml |   8 +
 .../org/apache/cassandra/config/Config.java |   1 +
 .../cassandra/config/DatabaseDescriptor.java|  10 ++
 .../cassandra/config/ParameterizedClass.java|   9 +-
 .../cassandra/hints/ChecksummedDataInput.java   |  15 +-
 .../hints/CompressedChecksummedDataInput.java   | 158 +++
 .../cassandra/hints/CompressedHintsWriter.java  |  67 
 .../apache/cassandra/hints/HintsCatalog.java|  19 ++-
 .../apache/cassandra/hints/HintsDescriptor.java |  37 +
 .../org/apache/cassandra/hints/HintsReader.java |  22 ++-
 .../apache/cassandra/hints/HintsService.java|  32 +++-
 .../org/apache/cassandra/hints/HintsStore.java  |  11 +-
 .../cassandra/hints/HintsWriteExecutor.java |   2 +-
 .../org/apache/cassandra/hints/HintsWriter.java |  60 +--
 .../cassandra/hints/HintsCatalogTest.java   |   2 +-
 .../cassandra/hints/HintsCompressionTest.java   | 157 ++
 .../hints/LegacyHintsMigratorTest.java  |   4 +-
 19 files changed, 576 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb25f5bd/CHANGES.txt
--
diff --cc CHANGES.txt
index ab6cb92,db286b9..77d9410
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,6 +1,30 @@@
 -3.0.3
 +3.2
 + * Add forceUserDefinedCleanup to allow more flexible cleanup 
(CASSANDRA-10708)
 + * (cqlsh) allow setting TTL with COPY (CASSANDRA-9494)
+  * Implement hints compression (CASSANDRA-9428)
+  * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 + * Fix EstimatedHistogram creation in nodetool tablehistograms 
(CASSANDRA-10859)
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +Merged from 3.0:
-  * Fix potential assertion error when reading static columns (CASSANDRA-0903)
   * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
   * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
   * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb25f5bd/NEWS.txt
--
diff --cc NEWS.txt
index 07e7481,8a03e14..9464637
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -18,17 -18,11 +18,20 @@@ using the provided 'sstableupgrade' too
  
  New features
  
 +   - bound maximum in-flight commit log replay mutation bytes to 64 megabytes
 + tunable via cassandra.commitlog_max_outstanding_replay_bytes
 +   - Support for type casting has been added to the selection clause.
+- Hinted handoff now supports compression. Reference 
cassandra.yaml:hints_compression.
+  Note: hints compression is currently disabled by default.
+ 
  
 -3.0.1
 +Upgrading
 +-
 +   - The compression ratio metrics computation has been

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-24 Thread snazy

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/53e370f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53e370f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53e370f6

Branch: refs/heads/trunk
Commit: 53e370f62b53daeb74f3778cd80b63170d23b8c4
Parents: c9ef25f 0858bfb
Author: Robert Stupp 
Authored: Thu Dec 24 14:06:40 2015 +0100
Committer: Robert Stupp 
Committed: Thu Dec 24 14:06:40 2015 +0100

--

--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-23 Thread slebresne

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/04a99ab8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04a99ab8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04a99ab8

Branch: refs/heads/trunk
Commit: 04a99ab84cd24c10b2220667667651afb3dd29bf
Parents: e5b6a9c 8bc567b
Author: Sylvain Lebresne 
Authored: Wed Dec 23 15:16:05 2015 +0100
Committer: Sylvain Lebresne 
Committed: Wed Dec 23 15:16:05 2015 +0100

--
 CHANGES.txt |  1 +
 .../columniterator/AbstractSSTableIterator.java | 37 -
 .../db/columniterator/SSTableIterator.java  | 38 +++--
 .../columniterator/SSTableReversedIterator.java | 28 ++-
 .../cql3/QueryWithIndexedSSTableTest.java   | 84 
 5 files changed, 121 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/04a99ab8/CHANGES.txt
--
diff --cc CHANGES.txt
index e36e4c2,a669b17..ab6cb92
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,5 +1,29 @@@
 -3.0.3
 +3.2
 + * Add forceUserDefinedCleanup to allow more flexible cleanup 
(CASSANDRA-10708)
 + * (cqlsh) allow setting TTL with COPY (CASSANDRA-9494)
 + * Fix EstimatedHistogram creation in nodetool tablehistograms 
(CASSANDRA-10859)
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +Merged from 3.0:
+  * Fix potential assertion error when reading static columns (CASSANDRA-0903)
   * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
   * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
   * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-23 Thread dbrosius

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/02c92dfc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02c92dfc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02c92dfc

Branch: refs/heads/trunk
Commit: 02c92dfce322086532462d9a13454f3ba52b1954
Parents: ce6ad5b 8bafc18
Author: Dave Brosius 
Authored: Wed Dec 23 19:11:53 2015 -0500
Committer: Dave Brosius 
Committed: Wed Dec 23 19:11:53 2015 -0500

--
 .../cassandra/db/commitlog/CommitLogSegmentManager.java   | 7 ---
 src/java/org/apache/cassandra/repair/Validator.java   | 6 --
 2 files changed, 4 insertions(+), 9 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-22 Thread slebresne

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/72094a41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72094a41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72094a41

Branch: refs/heads/trunk
Commit: 72094a41c2732810a83b2f4139b50397337a1871
Parents: 7950d80 4e5867a
Author: Sylvain Lebresne 
Authored: Tue Dec 22 12:28:24 2015 +0100
Committer: Sylvain Lebresne 
Committed: Tue Dec 22 12:28:24 2015 +0100

--
 doc/cql3/CQL.textile   | 8 ++--
 src/java/org/apache/cassandra/cql3/QueryProcessor.java | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/72094a41/doc/cql3/CQL.textile
--
diff --cc doc/cql3/CQL.textile
index 33e5dc0,e323768..32cf330
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -1,6 -1,6 +1,6 @@@
  
  
- h1. Cassandra Query Language (CQL) v3.3.2
 -h1. Cassandra Query Language (CQL) v3.4.0
++h1. Cassandra Query Language (CQL) v3.4.1
  
  
  
@@@ -2299,10 -2267,10 +2299,14 @@@ h2(#changes). Change
  
  The following describes the changes in each version of CQL.
  
- h3. 3.3.2
++h3. 3.4.1
 +
 +* Adds @CAST@ functions. See "@Cast@":#castFun.
 +
+ h3. 3.4.0
+ 
+ * Support for "materialized views":#createMVStmt
+ 
  h3. 3.3.1
  
  * The syntax @TRUNCATE TABLE X@ is now accepted as an alias for @TRUNCATE X@

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-21 Thread dbrosius

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/53538cb4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53538cb4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53538cb4

Branch: refs/heads/trunk
Commit: 53538cb4d64509f662967febb7af153d188232df
Parents: 43f8f8b 8e35f84
Author: Dave Brosius 
Authored: Mon Dec 21 19:26:52 2015 -0500
Committer: Dave Brosius 
Committed: Mon Dec 21 19:26:52 2015 -0500

--
 .../org/apache/cassandra/db/marshal/DateType.java|  2 +-
 .../apache/cassandra/db/marshal/TimestampType.java   |  2 +-
 .../cassandra/serializers/TimestampSerializer.java   | 15 ++-
 3 files changed, 16 insertions(+), 3 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-21 Thread slebresne

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/e6724625
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6724625
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6724625

Branch: refs/heads/trunk
Commit: e67246255ceb29d20136eb2790fa653a683bce11
Parents: c0fd119 11165f4
Author: Sylvain Lebresne 
Authored: Mon Dec 21 09:29:48 2015 +0100
Committer: Sylvain Lebresne 
Committed: Mon Dec 21 09:29:48 2015 +0100

--
 NEWS.txt | 70 +--
 1 file changed, 35 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6724625/NEWS.txt
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-21 Thread slebresne

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/43f8f8bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43f8f8bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43f8f8bb

Branch: refs/heads/trunk
Commit: 43f8f8bb3b151eaa3f2f11cc4b124780b9dc4d0f
Parents: 565799c adc9a24
Author: Sylvain Lebresne 
Authored: Mon Dec 21 16:33:06 2015 +0100
Committer: Sylvain Lebresne 
Committed: Mon Dec 21 16:33:06 2015 +0100

--
 doc/native_protocol_v4.spec | 311 +++
 1 file changed, 155 insertions(+), 156 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-19 Thread yukim

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/c0fd119c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0fd119c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0fd119c

Branch: refs/heads/trunk
Commit: c0fd119cea3240db3435575b1345d0bcefec0dc4
Parents: 7e47377 0e63000
Author: Yuki Morishita 
Authored: Sat Dec 19 09:56:28 2015 -0600
Committer: Yuki Morishita 
Committed: Sat Dec 19 09:56:28 2015 -0600

--
 CHANGES.txt |   1 +
 .../cassandra/streaming/StreamReceiveTask.java  |  19 +-
 .../io/sstable/SSTableRewriterTest.java | 165 +--
 .../cassandra/io/sstable/SSTableWriterTest.java | 200 +++
 .../io/sstable/SSTableWriterTestBase.java   | 166 +++
 5 files changed, 374 insertions(+), 177 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0fd119c/CHANGES.txt
--
diff --cc CHANGES.txt
index bf2ca61,ff139c4..7bbfec6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
 -3.0.3
 +3.2
 + * (cqlsh) allow setting TTL with COPY (CASSANDRA-9494)
 + * Fix EstimatedHistogram creation in nodetool tablehistograms 
(CASSANDRA-10859)
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +Merged from 3.0:
+  * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
   * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
   * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
   * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-1837)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0fd119c/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java
--
diff --cc test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java
index 000,0af743d..70f154d
mode 00,100644..100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java
@@@ -1,0 -1,166 +1,166 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ 
+ package org.apache.cassandra.io.sstable;
+ 
+ import java.io.File;
+ import java.nio.ByteBuffer;
+ import java.util.HashSet;
+ import java.util.Set;
+ import java.util.concurrent.ThreadLocalRandom;
+ import java.util.concurrent.TimeUnit;
+ 
+ import com.google.common.util.concurrent.Uninterruptibles;
+ import org.junit.After;
+ import org.junit.AfterClass;
+ import org.junit.BeforeClass;
+ 
+ import org.apache.cassandra.SchemaLoader;
+ import

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-18 Thread yukim

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/622d1f7c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/622d1f7c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/622d1f7c

Branch: refs/heads/trunk
Commit: 622d1f7c0a37c679da2d703fc0bc9ac8bf5ce68d
Parents: ff5b709 fa18880
Author: Yuki Morishita 
Authored: Fri Dec 18 17:12:25 2015 -0600
Committer: Yuki Morishita 
Committed: Fri Dec 18 17:12:25 2015 -0600

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/tools/BulkLoader.java  | 79 ++--
 .../utils/NativeSSTableLoaderClient.java| 16 ++--
 3 files changed, 84 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/622d1f7c/CHANGES.txt
--
diff --cc CHANGES.txt
index e8fbc0d,199e374..5cbbb62
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 -3.0.3
 +3.2
 + * Fix EstimatedHistogram creation in nodetool tablehistograms 
(CASSANDRA-10859)
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +Merged from 3.0:
+  * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
   * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
   * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-1837)
   * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-18 Thread aleksey

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/01b3508e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01b3508e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01b3508e

Branch: refs/heads/trunk
Commit: 01b3508e0f0025bb859d96fb163ff457d3d94662
Parents: 99880d2 2800bf1
Author: Aleksey Yeschenko 
Authored: Fri Dec 18 23:30:39 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Dec 18 23:30:39 2015 +

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 21 +++--
 2 files changed, 8 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/01b3508e/CHANGES.txt
--
diff --cc CHANGES.txt
index 47863e9,b4419fa..0df24d5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -27,8 -4,13 +27,9 @@@ Merged from 3.0
   * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-1837)
   * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
  Merged from 2.2:
+  * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
   * Add new types to Stress (CASSANDRA-9556)
   * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 - * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
  Merged from 2.1:
   * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
   * Allow CREATE TABLE WITH ID (CASSANDRA-9179)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/01b3508e/bin/cqlsh.py
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-16 Thread yukim

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/37986e82
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37986e82
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37986e82

Branch: refs/heads/trunk
Commit: 37986e825e6706f3ed1c837e0b9523495a0b4e45
Parents: abf7df3 ed96322
Author: Yuki Morishita 
Authored: Wed Dec 16 14:38:19 2015 -0600
Committer: Yuki Morishita 
Committed: Wed Dec 16 14:38:19 2015 -0600

--
 CHANGES.txt| 2 ++
 src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/37986e82/CHANGES.txt
--
diff --cc CHANGES.txt
index 24b2662,7677e38..4b4a596
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,26 @@@
 -3.0.3
 +3.2
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
++Merged from 3.0:
+  * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
  Merged from 2.2:
   * Add new types to Stress (CASSANDRA-9556)
   * Add property to allow listening on broadcast interface (CASSANDRA-9748)

[3/3] cassandra git commit: Merge branch cassandra-3.0 into trunk

2015-12-16 Thread blerer

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/abf7df3b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/abf7df3b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/abf7df3b

Branch: refs/heads/trunk
Commit: abf7df3bd609f999fdcc2dcfb91688be50c46664
Parents: 80250aa 363e7bd
Author: Benjamin Lerer 
Authored: Wed Dec 16 15:20:53 2015 +0100
Committer: Benjamin Lerer 
Committed: Wed Dec 16 15:21:07 2015 +0100

--
 CHANGES.txt |  1 +
 .../apache/cassandra/stress/StressProfile.java  |  8 
 .../stress/generate/values/LocalDates.java  | 43 +++
 .../stress/generate/values/SmallInts.java   | 38 +
 .../cassandra/stress/generate/values/Times.java | 37 
 .../stress/generate/values/TinyInts.java| 45 
 .../operations/userdefined/SchemaStatement.java | 16 +--
 .../cassandra/stress/util/JavaDriverClient.java |  1 +
 8 files changed, 185 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/abf7df3b/CHANGES.txt
--
diff --cc CHANGES.txt
index 062ab10,10504c7..24b2662
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,11 +1,27 @@@
 -3.0.3
 +3.2
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
  Merged from 2.2:
+  * Add new types to Stress (CASSANDRA-9556)
   * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 - * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
  Merged from 2.1:
   * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
   * Allow CREATE TABLE WITH ID (CASSANDRA-9179)

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-11 Thread snazy

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/4139d8f3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4139d8f3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4139d8f3

Branch: refs/heads/trunk
Commit: 4139d8f3fe88a1307458b59df3cf84f00ad97b2d
Parents: 3f79c5b d55a51e
Author: Robert Stupp 
Authored: Fri Dec 11 16:44:28 2015 -0600
Committer: Robert Stupp 
Committed: Fri Dec 11 16:44:28 2015 -0600

--
 CHANGES.txt |  2 ++
 conf/cassandra.yaml |  8 
 .../org/apache/cassandra/config/Config.java |  1 +
 .../cassandra/config/DatabaseDescriptor.java|  5 +
 .../locator/ReconnectableSnitchHelper.java  |  2 +-
 .../apache/cassandra/net/MessagingService.java  | 20 
 .../cassandra/service/StorageService.java   |  8 
 .../org/apache/cassandra/utils/FBUtilities.java | 16 
 .../apache/cassandra/service/RemoveTest.java|  2 +-
 9 files changed, 54 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4139d8f3/CHANGES.txt
--
diff --cc CHANGES.txt
index fad4bb2,a71ecbd..f06648e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,10 +1,21 @@@
 -3.0.2
 -Merged from 2.2
 +3.2
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
++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:
   * Allow cancellation of index summary redistribution (CASSANDRA-8805)
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4139d8f3/src/java/org/apache/cassandra/config/Config.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4139d8f3/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4139d8f3/src/java/org/apache/cassandra/net/MessagingService.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4139d8f3/src/java/org/apache/cassandra/utils/FBUtilities.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-09 Thread snazy

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/6ed32a39
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ed32a39
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ed32a39

Branch: refs/heads/trunk
Commit: 6ed32a394519152b65bc72d15d7eaac5a582d37f
Parents: 12b8c69 f2af290
Author: Robert Stupp 
Authored: Mon Nov 9 12:46:14 2015 +0100
Committer: Robert Stupp 
Committed: Mon Nov 9 12:46:14 2015 +0100

--
 .../cassandra/cql3/functions/JavaBasedUDFunction.java  | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-06 Thread slebresne

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/a177502b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a177502b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a177502b

Branch: refs/heads/trunk
Commit: a177502b8f9e5ebbf19b8bbfcbe12f4497f0e9bb
Parents: 5c97de9 57d56bd
Author: Sylvain Lebresne 
Authored: Fri Nov 6 14:52:40 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 14:52:40 2015 +0100

--
 CHANGES.txt |  2 +
 .../cassandra/service/MigrationManager.java | 22 +++-
 .../cassandra/service/StorageService.java   | 56 
 3 files changed, 56 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a177502b/CHANGES.txt
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-06 Thread snazy

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/fb9e75eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb9e75eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb9e75eb

Branch: refs/heads/trunk
Commit: fb9e75eb32c60a7bea55ce60dade5e94de295174
Parents: d91fb58 e94032a
Author: Robert Stupp 
Authored: Fri Nov 6 18:28:51 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 6 18:28:51 2015 +0100

--
 CHANGES.txt |   1 +
 ...core-3.0.0-beta1-92c4c80-SNAPSHOT-shaded.jar | Bin 2284484 -> 0 bytes
 ...core-3.0.0-beta1-bb1bce4-SNAPSHOT-shaded.jar | Bin 0 -> 2288891 bytes
 lib/licenses/cassandra-driver-2.1.3.txt | 177 -
 lib/licenses/cassandra-driver-3.0.0.txt | 177 +
 .../apache/cassandra/config/ViewDefinition.java |  15 +-
 .../org/apache/cassandra/cql3/CQL3Type.java | 223 +-
 .../cassandra/cql3/CQLFragmentParser.java   |  84 ++
 .../apache/cassandra/cql3/ColumnIdentifier.java |  10 +-
 .../apache/cassandra/cql3/QueryProcessor.java   |  19 +-
 src/java/org/apache/cassandra/cql3/Terms.java   |   9 +
 .../statements/CreateAggregateStatement.java|   3 +-
 .../cassandra/db/marshal/AbstractType.java  |   2 +-
 .../apache/cassandra/schema/CQLTypeParser.java  |  35 +-
 .../apache/cassandra/schema/SchemaKeyspace.java |  10 +-
 .../serializers/AbstractTextSerializer.java |  28 +
 .../cassandra/serializers/BytesSerializer.java  |  14 +
 .../serializers/TimestampSerializer.java|  32 +-
 .../cassandra/serializers/TypeSerializer.java   |   8 +
 .../cassandra/cql3/CQL3TypeLiteralTest.java | 786 +++
 .../validation/operations/AggregationTest.java  |  15 +
 .../schema/LegacySchemaMigratorTest.java|   6 +-
 22 files changed, 1390 insertions(+), 264 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb9e75eb/CHANGES.txt
--
diff --cc CHANGES.txt
index 98f169b,9966bfd..c92e0a4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Store UDA initcond as CQL literal in the schema table, instead of a blob 
(CASSANDRA-10650)
   * Don't use -1 for the position of partition key in schema (CASSANDRA-10491)
   * Fix distinct queries in mixed version cluster (CASSANDRA-10573)
   * Skip sstable on clustering in names query (CASSANDRA-10571)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb9e75eb/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb9e75eb/src/java/org/apache/cassandra/serializers/TypeSerializer.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-04 Thread snazy

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/be2cf1af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be2cf1af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be2cf1af

Branch: refs/heads/trunk
Commit: be2cf1afa75acfe9c2ce385a69f471d4770c56bb
Parents: 1b876bc 242b973
Author: Robert Stupp 
Authored: Wed Nov 4 23:30:01 2015 +0100
Committer: Robert Stupp 
Committed: Wed Nov 4 23:30:01 2015 +0100

--
 CHANGES.txt |  2 +-
 bin/cassandra   | 49 
 conf/cassandra-env.sh   | 49 
 .../apache/cassandra/service/StartupChecks.java | 19 +++-
 4 files changed, 68 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/be2cf1af/CHANGES.txt
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-04 Thread aleksey

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/fda0754c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fda0754c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fda0754c

Branch: refs/heads/trunk
Commit: fda0754c1e47a492820d63048296b2299c17ccdc
Parents: 85c52bb b761b86
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:39:55 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:39:55 2015 +

--
 pylib/cqlshlib/formatting.py | 1 +
 1 file changed, 1 insertion(+)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-03 Thread samt

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/724ba07a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/724ba07a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/724ba07a

Branch: refs/heads/trunk
Commit: 724ba07a7f0aab1b372cc722d78cbe1b683db32d
Parents: f505e8b 8a8427d
Author: Sam Tunnicliffe 
Authored: Tue Nov 3 17:31:02 2015 +
Committer: Sam Tunnicliffe 
Committed: Tue Nov 3 17:31:02 2015 +

--
 CHANGES.txt | 1 +
 NEWS.txt| 3 +++
 src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java   | 3 ++-
 src/java/org/apache/cassandra/auth/IAuthenticator.java  | 5 -
 src/java/org/apache/cassandra/auth/PasswordAuthenticator.java   | 3 ++-
 src/java/org/apache/cassandra/transport/ServerConnection.java   | 4 ++--
 .../org/apache/cassandra/transport/messages/AuthResponse.java   | 2 +-
 7 files changed, 15 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/724ba07a/CHANGES.txt
--
diff --cc CHANGES.txt
index 7788aa8,9266386..b0aad8c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
   * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
   * Don't use 'names query' read path for counters (CASSANDRA-10572)
   * Fix backward compatibility for counters (CASSANDRA-10470)

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-02 Thread slebresne

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/b1f2d14f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1f2d14f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1f2d14f

Branch: refs/heads/trunk
Commit: b1f2d14f4484ba9d6f4a84d7e0daef600fdcb7db
Parents: cad3a2d 4beb54d
Author: Sylvain Lebresne 
Authored: Mon Nov 2 15:16:57 2015 +0100
Committer: Sylvain Lebresne 
Committed: Mon Nov 2 15:16:57 2015 +0100

--
 CHANGES.txt |   1 +
 .../cql3/statements/CQL3CasRequest.java |   2 +-
 .../cql3/statements/ModificationStatement.java  |   4 +-
 .../cql3/statements/SelectStatement.java|   2 +-
 .../db/AbstractReadCommandBuilder.java  |   2 +-
 .../org/apache/cassandra/db/ReadCommand.java|  36 +-
 .../db/SinglePartitionNamesCommand.java | 276 --
 .../db/SinglePartitionReadCommand.java  | 504 +--
 .../db/SinglePartitionSliceCommand.java | 262 --
 .../db/partitions/PartitionIterators.java   |   2 +-
 .../UnfilteredPartitionIterators.java   |   2 +-
 .../internal/composites/CompositesSearcher.java |  14 +-
 .../cassandra/schema/LegacySchemaMigrator.java  |   2 +-
 .../apache/cassandra/schema/SchemaKeyspace.java |   4 +-
 .../apache/cassandra/service/DataResolver.java  |  16 +-
 .../apache/cassandra/service/StorageProxy.java  |   6 +-
 .../service/pager/SinglePartitionPager.java |   4 +-
 .../cassandra/thrift/CassandraServer.java   |  14 +-
 .../org/apache/cassandra/db/KeyspaceTest.java   |  30 +-
 .../apache/cassandra/db/RangeTombstoneTest.java |   2 +-
 .../db/SinglePartitionSliceCommandTest.java |  16 +-
 .../cassandra/service/QueryPagerTest.java   |  12 +-
 22 files changed, 541 insertions(+), 672 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1f2d14f/CHANGES.txt
--
diff --cc CHANGES.txt
index 71330e1,6d5d49b..3b33f5d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Don't use 'names query' read path for counters (CASSANDRA-10572)
   * Fix backward compatibility for counters (CASSANDRA-10470)
   * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581)
   * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1f2d14f/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
diff --cc 
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 89d5165,71597f4..08b8527
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@@ -574,10 -573,9 +574,10 @@@ public abstract class ModificationState
  {
  UUID ballot = UUIDGen.getTimeUUIDFromMicros(state.getTimestamp());
  
- SinglePartitionReadCommand readCommand = 
request.readCommand(FBUtilities.nowInSeconds());
+ SinglePartitionReadCommand readCommand = 
request.readCommand(FBUtilities.nowInSeconds());
  FilteredPartition current;
 -try (ReadOrderGroup orderGroup = readCommand.startOrderGroup(); 
PartitionIterator iter = readCommand.executeInternal(orderGroup))
 +try (ReadExecutionController executionController = 
readCommand.executionController();
 + PartitionIterator iter = 
readCommand.executeInternal(executionController))
  {
  current = 
FilteredPartition.create(PartitionIterators.getOnlyElement(iter, readCommand));
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1f2d14f/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1f2d14f/src/java/org/apache/cassandra/db/ReadCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1f2d14f/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
index 448eaa6,4d7d93c..e7c763e
--- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
+++

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-02 Thread benedict

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/663cd43a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/663cd43a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/663cd43a

Branch: refs/heads/trunk
Commit: 663cd43ab17454fe7d926b38de48e9b7bf908ca9
Parents: fbdeef8 fd59549
Author: Benedict Elliott Smith 
Authored: Mon Nov 2 19:46:27 2015 +
Committer: Benedict Elliott Smith 
Committed: Mon Nov 2 19:46:27 2015 +

--
 .../org/apache/cassandra/db/NativeCellTest.java | 551 +--
 1 file changed, 271 insertions(+), 280 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-30 Thread slebresne

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/b19ece1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b19ece1b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b19ece1b

Branch: refs/heads/trunk
Commit: b19ece1bd076108f45ccb88699c0a60631b844ee
Parents: fb33f38 10ef01d
Author: Sylvain Lebresne 
Authored: Fri Oct 30 10:02:29 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Oct 30 10:02:29 2015 +0100

--
 bin/cqlsh.py|  69 +--
 ...iver-internal-only-3.0.0a2.post0-95c6008.zip | Bin 0 -> 233564 bytes
 2 files changed, 31 insertions(+), 38 deletions(-)
--

1 2 3 >

1 - 100 of 221 matches

Mail list logo