subject:"\\\\\\\[2\\\\\\\/2\\\\\\\] cassandra git commit\\\\\\\: Merge branch 'cassandra\\\\\\\-2.1' into trunk"

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-14 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: c5bc811486e90f2b244801fd1f5e4ecc2de36108
Parents: 68722e7 f5f5912
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu May 14 17:50:56 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu May 14 17:50:56 2015 +0300

--
 .../apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-12 Thread marcuse

Merge branch 'cassandra-2.1' into trunk

Conflicts:

test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java


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

Branch: refs/heads/trunk
Commit: cf6f7c16361f6ef87345054b6706477c920deb0c
Parents: 894b7b9 ed0026f
Author: Marcus Eriksson marc...@apache.org
Authored: Tue May 12 08:22:44 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue May 12 08:22:44 2015 +0200

--
 .../LongLeveledCompactionStrategyTest.java  | 30 +++-
 1 file changed, 16 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf6f7c16/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
--
diff --cc 
test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 0e3f1e9,0eb769f..e38eb3c
--- 
a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ 
b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@@ -27,31 -27,14 +27,33 @@@ import org.junit.Test
  
  import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.Util;
 +import org.apache.cassandra.config.KSMetaData;
  import org.apache.cassandra.db.*;
 -import org.apache.cassandra.io.sstable.SSTableReader;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.utils.FBUtilities;
  
+ import static org.junit.Assert.assertTrue;
+ 
 -public class LongLeveledCompactionStrategyTest extends SchemaLoader
 +public class LongLeveledCompactionStrategyTest
  {
 +public static final String KEYSPACE1 = 
LongLeveledCompactionStrategyTest;
 +public static final String CF_STANDARDLVL = StandardLeveled;
 +
 +@BeforeClass
 +public static void defineSchema() throws ConfigurationException
 +{
 +MapString, String leveledOptions = new HashMap();
 +leveledOptions.put(sstable_size_in_mb, 1);
 +SchemaLoader.prepareServer();
 +SchemaLoader.createKeyspace(KEYSPACE1,
 +SimpleStrategy.class,
 +KSMetaData.optsWithRF(1),
 +SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARDLVL)
 +
.compactionStrategyClass(LeveledCompactionStrategy.class)
 +
.compactionStrategyOptions(leveledOptions));
 +}
 +
  @Test
  public void testParallelLeveledCompaction() throws Exception
  {
@@@ -91,9 -77,10 +94,9 @@@
  {
  while (true)
  {
- final AbstractCompactionTask t = 
lcs.getMaximalTask(Integer.MIN_VALUE, false).iterator().next();
- if (t == null)
+ final AbstractCompactionTask nextTask = 
lcs.getNextBackgroundTask(Integer.MIN_VALUE);
+ if (nextTask == null)
  break;
 -
  tasks.add(new Runnable()
  {
  public void run()
@@@ -119,21 -108,21 +122,20 @@@
  for (int level = 0; level  levels; level++)
  {
  ListSSTableReader sstables = manifest.getLevel(level);
 -
  // score check
 -assert (double) SSTableReader.getTotalBytes(sstables) / 
manifest.maxBytesForLevel(level)  1.00;
 -
 +assert (double) SSTableReader.getTotalBytes(sstables) / 
LeveledManifest.maxBytesForLevel(level, 1 * 1024 * 1024)  1.00;
 +// overlap check for levels greater than 0
- if (level  0)
+ for (SSTableReader sstable : sstables)
  {
-for (SSTableReader sstable : sstables)
-{
-SetSSTableReader overlaps = 
LeveledManifest.overlapping(sstable, sstables);
-assert overlaps.size() == 1  overlaps.contains(sstable);
-}
+ // level check
+ assert level == sstable.getSSTableLevel();
+ 
+ if (level  0)
+ {// overlap check for levels greater than 0
+ SetSSTableReader overlaps = 
LeveledManifest.overlapping(sstable, sstables);
+ assert overlaps.size() == 1  overlaps.contains(sstable);
+ }
  }
  }
- for (SSTableReader sstable : store.getSSTables())
- {
- assert sstable.getSSTableLevel() ==

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-12 Thread jake

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 9a2cae69cd98693db7c938a76c5d6e9a2da692e0
Parents: 5893472 19540f0
Author: T Jake Luciani j...@apache.org
Authored: Tue May 12 15:05:28 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Tue May 12 15:05:28 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a2cae69/CHANGES.txt
--
diff --cc CHANGES.txt
index 8b7abe4,1643f9c..ed62eed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,109 -1,5 +1,110 @@@
 +3.0
 + * Upgrade Snappy (CASSANDRA-9063)
 + * Don't start Thrift rpc by default (CASSANDRA-9319)
 + * Only stream from unrepaired sstables with incremental repair 
(CASSANDRA-8267)
 + * Aggregate UDFs allow SFUNC return type to differ from STYPE if FFUNC 
specified (CASSANDRA-9321)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Remove Thrift dependencies in bundled tools (CASSANDRA-8358)
 + * Disable memory mapping of hsperfdata file for JVM statistics 
(CASSANDRA-9242)
 + * Add pre-startup checks to detect potential incompatibilities 
(CASSANDRA-8049)
 + * Distinguish between null and unset in protocol v4 (CASSANDRA-7304)
 + * Add user/role permissions for user-defined functions (CASSANDRA-7557)
 + * Allow cassandra config to be updated to restart daemon without unloading 
classes (CASSANDRA-9046)
 + * Don't initialize compaction writer before checking if iter is empty 
(CASSANDRA-9117)
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553, 9212)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714, 9197)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-12 Thread jake

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 5893472e7e6ef3d0a572f0cdd75c83c234ed3408
Parents: a2c05e2 8b5434f
Author: T Jake Luciani j...@apache.org
Authored: Tue May 12 14:55:07 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Tue May 12 14:55:07 2015 -0400

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/stress/settings/SettingsCommand.java| 2 +-
 .../src/org/apache/cassandra/stress/util/JavaDriverClient.java   | 4 
 3 files changed, 2 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5893472e/CHANGES.txt
--
diff --cc CHANGES.txt
index 56ed1be,934218b..8b7abe4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,109 -1,5 +1,110 @@@
 +3.0
 + * Upgrade Snappy (CASSANDRA-9063)
 + * Don't start Thrift rpc by default (CASSANDRA-9319)
 + * Only stream from unrepaired sstables with incremental repair 
(CASSANDRA-8267)
 + * Aggregate UDFs allow SFUNC return type to differ from STYPE if FFUNC 
specified (CASSANDRA-9321)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Remove Thrift dependencies in bundled tools (CASSANDRA-8358)
 + * Disable memory mapping of hsperfdata file for JVM statistics 
(CASSANDRA-9242)
 + * Add pre-startup checks to detect potential incompatibilities 
(CASSANDRA-8049)
 + * Distinguish between null and unset in protocol v4 (CASSANDRA-7304)
 + * Add user/role permissions for user-defined functions (CASSANDRA-7557)
 + * Allow cassandra config to be updated to restart daemon without unloading 
classes (CASSANDRA-9046)
 + * Don't initialize compaction writer before checking if iter is empty 
(CASSANDRA-9117)
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553, 9212)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714, 9197)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-08 Thread jmckenzie

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e9d1e799434cc08f7d4e62da3aff6af89cb6e8d5
Parents: 86f481e a431d84
Author: Josh McKenzie josh.mcken...@datastax.com
Authored: Fri May 8 12:33:25 2015 -0500
Committer: Josh McKenzie josh.mcken...@datastax.com
Committed: Fri May 8 12:33:25 2015 -0500

--
 conf/cassandra-env.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9d1e799/conf/cassandra-env.ps1
--
diff --cc conf/cassandra-env.ps1
index e0287c5,35da856..dbf83a3
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -452,9 -411,7 +452,9 @@@ Function SetCassandraEnvironmen
  #$env:JVM_OPTS=$env:JVM_OPTS 
-Dcom.sun.management.jmxremote.password.file=C:/jmxremote.password
  $env:JVM_OPTS=$env:JVM_OPTS -Dcassandra.jmx.local.port=$JMX_PORT 
-XX:+DisableExplicitGC
  
- $env:JVM_OPTS=$env:JVM_OPTS $JVM_EXTRA_OPTS
+ $env:JVM_OPTS=$env:JVM_OPTS $env:JVM_EXTRA_OPTS
  
  $env:JVM_OPTS = $env:JVM_OPTS 
-Dlog4j.configuration=log4j-server.properties
 +
 +#$env:JVM_OPTS=$env:JVM_OPTS -XX:+UnlockCommercialFeatures 
-XX:+FlightRecorder
  }

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-08 Thread jake

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e25157901bec34d26f251dbc15fa024a82f2bbb1
Parents: 1f23bb4 9e9846e
Author: T Jake Luciani j...@apache.org
Authored: Fri May 8 15:05:02 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Fri May 8 15:05:02 2015 -0400

--
 CHANGES.txt |  1 +
 .../DebuggableScheduledThreadPoolExecutor.java  | 27 
 .../cassandra/service/StorageService.java   |  7 +
 3 files changed, 35 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2515790/CHANGES.txt
--
diff --cc CHANGES.txt
index dd3e503,4a9b34a..0dbc281
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,105 -1,5 +1,106 @@@
 +3.0
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Remove Thrift dependencies in bundled tools (CASSANDRA-8358)
 + * Disable memory mapping of hsperfdata file for JVM statistics 
(CASSANDRA-9242)
 + * Add pre-startup checks to detect potential incompatibilities 
(CASSANDRA-8049)
 + * Distinguish between null and unset in protocol v4 (CASSANDRA-7304)
 + * Add user/role permissions for user-defined functions (CASSANDRA-7557)
 + * Allow cassandra config to be updated to restart daemon without unloading 
classes (CASSANDRA-9046)
 + * Don't initialize compaction writer before checking if iter is empty 
(CASSANDRA-9117)
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553, 9212)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-08 Thread dbrosius

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 81c93084ba482508cb66c45bf7f19c07a35605a0
Parents: e251579 b66475c
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri May 8 15:59:37 2015 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri May 8 15:59:37 2015 -0400

--
 tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-08 Thread dbrosius

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 2da468d9bbcf66a0635fb39d26da83d7349829a8
Parents: 81c9308 def6b5f
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri May 8 16:09:04 2015 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri May 8 16:09:04 2015 -0400

--
 .../stress/src/org/apache/cassandra/stress/util/DynamicList.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-07 Thread jake

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 3cb00db3f9f49e452963be784b5f764878291b2f
Parents: 0ede9ec 09ccf60
Author: T Jake Luciani j...@apache.org
Authored: Thu May 7 14:21:17 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Thu May 7 14:21:17 2015 -0400

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/tools/StandaloneSplitter.java  |  8 
 .../org/apache/cassandra/tools/StandaloneUpgrader.java  | 12 
 3 files changed, 17 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3cb00db3/CHANGES.txt
--
diff --cc CHANGES.txt
index de09e39,098cfe0..5a8ee93
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,104 -1,5 +1,105 @@@
 +3.0
 + * Remove Thrift dependencies in bundled tools (CASSANDRA-8358)
 + * Disable memory mapping of hsperfdata file for JVM statistics 
(CASSANDRA-9242)
 + * Add pre-startup checks to detect potential incompatibilities 
(CASSANDRA-8049)
 + * Distinguish between null and unset in protocol v4 (CASSANDRA-7304)
 + * Add user/role permissions for user-defined functions (CASSANDRA-7557)
 + * Allow cassandra config to be updated to restart daemon without unloading 
classes (CASSANDRA-9046)
 + * Don't initialize compaction writer before checking if iter is empty 
(CASSANDRA-9117)
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553, 9212)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-06 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 6b12767912c6b2e54a1abf1773aa68ccd638de81
Parents: 20c5ea0 04a2c24
Author: Marcus Eriksson marc...@apache.org
Authored: Wed May 6 12:51:14 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed May 6 12:54:44 2015 +0200

--
 CHANGES.txt |   1 +
 .../cql3/statements/UpdateStatement.java|  21 +-
 .../AbstractSimplePerColumnSecondaryIndex.java  |   8 +-
 .../db/index/PerColumnSecondaryIndex.java   |   5 +
 .../db/index/PerRowSecondaryIndex.java  |   7 +
 .../cassandra/db/index/SecondaryIndex.java  |   2 +-
 .../db/index/SecondaryIndexManager.java |   8 +-
 .../cassandra/thrift/CassandraServer.java   |   6 +-
 .../cassandra/thrift/ThriftValidation.java  |  18 +-
 .../cql3/IndexedValuesValidationTest.java   | 103 +++--
 .../db/SecondaryIndexCellSizeTest.java  | 223 ---
 .../cassandra/thrift/ThriftValidationTest.java  |  20 +-
 12 files changed, 145 insertions(+), 277 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b127679/CHANGES.txt
--
diff --cc CHANGES.txt
index ab92aa0,09bdfb1..dae32db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,104 -1,5 +1,105 @@@
 +3.0
 + * Remove Thrift dependencies in bundled tools (CASSANDRA-8358)
 + * Disable memory mapping of hsperfdata file for JVM statistics 
(CASSANDRA-9242)
 + * Add pre-startup checks to detect potential incompatibilities 
(CASSANDRA-8049)
 + * Distinguish between null and unset in protocol v4 (CASSANDRA-7304)
 + * Add user/role permissions for user-defined functions (CASSANDRA-7557)
 + * Allow cassandra config to be updated to restart daemon without unloading 
classes (CASSANDRA-9046)
 + * Don't initialize compaction writer before checking if iter is empty 
(CASSANDRA-9117)
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553, 9212)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-06 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 435827d1587e05b82bf18bbaf4175a6bd98793cc
Parents: c31aef6 ce3ce44
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Wed May 6 17:23:27 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Wed May 6 17:23:27 2015 -0500

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

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-05 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: afb52aa9a684dd9cfa86d131e86c83013833deee
Parents: 95638b6 4c7c5be
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue May 5 20:51:33 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue May 5 20:51:33 2015 +0300

--
 CHANGES.txt |  1 +
 .../cassandra/db/AbstractRangeCommand.java  | 23 
 .../db/index/SecondaryIndexManager.java | 48 +--
 .../db/index/SecondaryIndexSearcher.java| 44 +++---
 .../db/index/composites/CompositesSearcher.java |  2 +-
 .../cassandra/db/index/keys/KeysSearcher.java   |  2 +-
 .../apache/cassandra/service/StorageProxy.java  | 62 
 7 files changed, 130 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/afb52aa9/CHANGES.txt
--
diff --cc CHANGES.txt
index c0c209d,da14ca3..ea03ba0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,103 -1,5 +1,104 @@@
 +3.0
 + * Disable memory mapping of hsperfdata file for JVM statistics 
(CASSANDRA-9242)
 + * Add pre-startup checks to detect potential incompatibilities 
(CASSANDRA-8049)
 + * Distinguish between null and unset in protocol v4 (CASSANDRA-7304)
 + * Add user/role permissions for user-defined functions (CASSANDRA-7557)
 + * Allow cassandra config to be updated to restart daemon without unloading 
classes (CASSANDRA-9046)
 + * Don't initialize compaction writer before checking if iter is empty 
(CASSANDRA-9117)
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553, 9212)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-03 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e28860b40135409f755b08b5e2ac70e9b27323dc
Parents: 6af82ed 739f3e3
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sun May 3 23:19:15 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sun May 3 23:19:15 2015 +0300

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/RowIteratorFactory.java |  2 +-
 .../cassandra/db/filter/ExtendedFilter.java |  2 +-
 .../cassandra/db/filter/IDiskAtomFilter.java|  2 +-
 .../cassandra/db/filter/NamesQueryFilter.java   |  2 +-
 .../apache/cassandra/db/filter/QueryFilter.java | 12 ++-
 .../cassandra/db/filter/SliceQueryFilter.java   | 22 +++-
 7 files changed, 24 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e28860b4/CHANGES.txt
--
diff --cc CHANGES.txt
index e98b299,0593e2b..49645b2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,103 -1,5 +1,104 @@@
 +3.0
 + * Disable memory mapping of hsperfdata file for JVM statistics 
(CASSANDRA-9242)
 + * Add pre-startup checks to detect potential incompatibilities 
(CASSANDRA-8049)
 + * Distinguish between null and unset in protocol v4 (CASSANDRA-7304)
 + * Add user/role permissions for user-defined functions (CASSANDRA-7557)
 + * Allow cassandra config to be updated to restart daemon without unloading 
classes (CASSANDRA-9046)
 + * Don't initialize compaction writer before checking if iter is empty 
(CASSANDRA-9117)
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553, 9212)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-05-01 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 6404e015ffe916fe24bacb3772b388e633af1261
Parents: c799a98 f43efaa
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri May 1 19:50:06 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri May 1 19:50:06 2015 +0300

--
 .../db/commitlog/CommitLogArchiver.java |   2 +-
 .../db/commitlog/CommitLogReplayer.java |  11 +-
 .../db/commitlog/CommitLogStressTest.java   |   3 +-
 .../db/RecoveryManagerTruncateTest.java | 181 +++
 4 files changed, 149 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6404e015/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6404e015/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
--
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index f6d1cc4,57f4b90..23ee9e3
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@@ -271,17 -264,22 +271,17 @@@ public class CommitLogReplaye
  
  public void recover(File file) throws IOException
  {
 -logger.info(Replaying {}, file.getPath());
  CommitLogDescriptor desc = 
CommitLogDescriptor.fromFileName(file.getName());
 -final long segmentId = desc.id;
 -logger.info(Replaying {} (CL version {}, messaging version {}),
 -file.getPath(),
 -desc.version,
 -desc.getMessagingVersion());
  RandomAccessReader reader = RandomAccessReader.open(new 
File(file.getAbsolutePath()));
 -
  try
  {
 -assert reader.length() = Integer.MAX_VALUE;
 -int offset = getStartOffset(segmentId, desc.version);
 -if (offset  0)
 +if (desc.version  CommitLogDescriptor.VERSION_21)
  {
 -logger.debug(skipping replay of fully-flushed {}, file);
 +if (logAndCheckIfShouldSkip(file, desc))
 +return;
 +if (globalPosition.segment == desc.id)
 +reader.seek(globalPosition.position);
- replaySyncSection(reader, -1, desc, replayFilter);
++replaySyncSection(reader, -1, desc);
  return;
  }
  
@@@ -365,208 -411,71 +365,207 @@@
  continue;
  }
  
- if (!replaySyncSection(sectionReader, replayEnd, desc, 
replayFilter))
 -if (logger.isDebugEnabled())
 -logger.debug(replaying mutation for {}.{}: {}, 
mutation.getKeyspaceName(), ByteBufferUtil.bytesToHex(mutation.key()), { + 
StringUtils.join(mutation.getColumnFamilies().iterator(), , ) + });
++if (!replaySyncSection(sectionReader, replayEnd, desc))
 +break;
 +}
 +}
 +finally
 +{
 +FileUtils.closeQuietly(reader);
 +logger.info(Finished reading {}, file);
 +}
 +}
  
 -final long entryLocation = reader.getFilePointer();
 -Runnable runnable = new WrappedRunnable()
 -{
 -public void runMayThrow() throws IOException
 -{
 -if 
(Schema.instance.getKSMetaData(mutation.getKeyspaceName()) == null)
 -return;
 -if (pointInTimeExceeded(mutation))
 -return;
 -
 -final Keyspace keyspace = 
Keyspace.open(mutation.getKeyspaceName());
 -
 -// Rebuild the mutation, omitting column families 
that
 -//a) the user has requested that we ignore,
 -//b) have already been flushed,
 -// or c) are part of a cf that was dropped.
 -// Keep in mind that the cf.name() is suspect. do 
every thing based on the cfid instead.
 -Mutation newMutation = null;
 -for (ColumnFamily columnFamily : 
replayFilter.filter(mutation))
 -{
 -

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-30 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 90476352a56568fc47418905dd31a16eb00a7981
Parents: 0656924 1f6bf36
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Apr 30 19:04:35 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Apr 30 19:04:35 2015 +0300

--
 CHANGES.txt |  2 +
 .../db/commitlog/CommitLogReplayer.java | 49 +---
 .../db/commitlog/CommitLogStressTest.java   |  6 +--
 3 files changed, 48 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90476352/CHANGES.txt
--
diff --cc CHANGES.txt
index 4af4f67,a01e8ed..0a69930
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,104 -1,5 +1,105 @@@
 +3.0
 + * Disable memory mapping of hsperfdata file for JVM statistics 
(CASSANDRA-9242)
 + * Add pre-startup checks to detect potential incompatibilities 
(CASSANDRA-8049)
 + * Distinguish between null and unset in protocol v4 (CASSANDRA-7304)
 + * Add user/role permissions for user-defined functions (CASSANDRA-7557)
 + * Allow cassandra config to be updated to restart daemon without unloading 
classes (CASSANDRA-9046)
 + * Don't initialize compaction writer before checking if iter is empty 
(CASSANDRA-9117)
 + * Remove line number generation from default logback.xml
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553, 9212)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-22 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e6bc6385ae83bbc432f5dc4d2fffac868c528159
Parents: 6ad452e 93b36d4
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Wed Apr 22 10:50:55 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Wed Apr 22 10:50:55 2015 -0500

--
 bin/cqlsh| 57 ++-
 pylib/cqlshlib/test/test_cqlsh_completion.py |  3 +-
 2 files changed, 36 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6bc6385/bin/cqlsh
--
diff --cc bin/cqlsh
index 9dffa7f,903cb72..efd1069
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -1758,9 -1708,10 +1743,10 @@@ class Shell(cmd.Cmd)
  except IOError, e:
  self.printerr(Can't open %r for writing: %s % (fname, e))
  return 0
- wmeter = meter.Meter()
+ 
+ meter = RateMeter(1)
  try:
 -
 +dtformats = DateTimeFormat(self.display_timestamp_format, 
self.display_date_format, self.display_nanotime_format)
  dump = self.prep_export_dump(ks, cf, columns)
  writer = csv.writer(csvdest, **dialect_options)
  if header:
@@@ -1768,11 -1719,10 +1754,10 @@@
  for row in dump:
  fmt = lambda v: \
  format_value(v, output_encoding=encoding, nullval=nullval,
 - time_format=self.display_time_format,
 + date_time_format=dtformats,
   
float_precision=self.display_float_precision).strval
  writer.writerow(map(fmt, row.values()))
- wmeter.mark_written()
- wmeter.done()
+ meter.increment()
  finally:
  if do_close:
  csvdest.close()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6bc6385/pylib/cqlshlib/test/test_cqlsh_completion.py
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-22 Thread slebresne

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/cql3/Lists.java


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

Branch: refs/heads/trunk
Commit: 6ad452e476ba80e4d6068cf069ae268617aca398
Parents: 5e68fce f56244d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Apr 22 10:45:23 2015 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Apr 22 10:45:23 2015 +0200

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/cql3/Lists.java   |  4 +--
 .../apache/cassandra/cql3/UpdateParameters.java |  6 +++-
 .../apache/cassandra/cql3/CollectionsTest.java  | 34 ++--
 4 files changed, 39 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ad452e4/CHANGES.txt
--
diff --cc CHANGES.txt
index e14e6cf,e36c67e..22fec31
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,102 -1,5 +1,103 @@@
 +3.0
 + * Distinguish between null and unset in protocol v4 (CASSANDRA-7304)
 + * Add user/role permissions for user-defined functions (CASSANDRA-7557)
 + * Allow cassandra config to be updated to restart daemon without unloading 
classes (CASSANDRA-9046)
 + * Don't initialize compaction writer before checking if iter is empty 
(CASSANDRA-9117)
 + * Remove line number generation from default logback.xml
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-21 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk

Conflicts:
bin/cqlsh


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

Branch: refs/heads/trunk
Commit: 840d9a663295fa0bfb78fb9706aa844e0b30
Parents: b379e32 49c1dbd
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Tue Apr 21 12:24:47 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Tue Apr 21 12:24:47 2015 -0500

--
 bin/cqlsh | 88 +++---
 1 file changed, 60 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/840d9a66/bin/cqlsh
--
diff --cc bin/cqlsh
index 2078107,05f3368..9dffa7f
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -111,8 -112,7 +112,7 @@@ from cassandra.cluster import Cluster, 
  from cassandra.query import SimpleStatement, ordered_dict_factory
  from cassandra.policies import WhiteListRoundRobinPolicy
  from cassandra.protocol import QueryMessage, ResultMessage
- from cassandra.marshal import int16_pack, int32_pack, uint64_pack
 -from cassandra.metadata import protect_name, protect_names, protect_value
 +from cassandra.metadata import protect_name, protect_names, protect_value, 
KeyspaceMetadata, TableMetadata, ColumnMetadata
  from cassandra.auth import PlainTextAuthProvider
  
  # cqlsh should run correctly when run out of a Cassandra source tree,
@@@ -436,7 -456,8 +457,8 @@@ def full_cql_version(ver)
  vertuple = tuple(map(int, ver_parts[0].split('.')) + [ver_parts[1]])
  return ver, vertuple
  
+ 
 -def format_value(val, output_encoding, addcolor=False, time_format=None,
 +def format_value(val, output_encoding, addcolor=False, date_time_format=None,
   float_precision=None, colormap=None, nullval=None):
  if isinstance(val, DecodeError):
  if addcolor:
@@@ -444,9 -465,10 +466,10 @@@
  else:
  return FormattedValue(repr(val.thebytes))
  return format_by_type(type(val), val, output_encoding, colormap=colormap,
 -  addcolor=addcolor, nullval=nullval, 
time_format=time_format,
 +  addcolor=addcolor, nullval=nullval, 
date_time_format=date_time_format,
float_precision=float_precision)
  
+ 
  def show_warning_without_quoting_line(message, category, filename, lineno, 
file=None, line=None):
  if file is None:
  file = sys.stderr
@@@ -769,32 -782,10 +795,32 @@@ class Shell(cmd.Cmd)
  ksmeta = self.get_keyspace_meta(ksname)
  
  if tablename not in ksmeta.tables:
- if ksname == 'system_auth' and tablename in 
['roles','role_permissions']:
++if ksname == 'system_auth' and tablename in ['roles', 
'role_permissions']:
 +self.get_fake_auth_table_meta(ksname, tablename)
 +else:
 +raise ColumnFamilyNotFound(Column family %r not found % 
tablename)
 +else:
 +return ksmeta.tables[tablename]
 +
 +def get_fake_auth_table_meta(self, ksname, tablename):
 +# may be using external auth implementation so internal tables
 +# aren't actually defined in schema. In this case, we'll fake
 +# them up
 +if tablename == 'roles':
 +ks_meta = KeyspaceMetadata(ksname, True, None, None)
 +table_meta = TableMetadata(ks_meta, 'roles')
 +table_meta.columns['role'] = ColumnMetadata(table_meta, 'role', 
cassandra.cqltypes.UTF8Type)
 +table_meta.columns['is_superuser'] = ColumnMetadata(table_meta, 
'is_superuser', cassandra.cqltypes.BooleanType)
 +table_meta.columns['can_login'] = ColumnMetadata(table_meta, 
'can_login', cassandra.cqltypes.BooleanType)
 +elif tablename == 'role_permissions':
 +ks_meta = KeyspaceMetadata(ksname, True, None, None)
 +table_meta = TableMetadata(ks_meta, 'role_permissions')
 +table_meta.columns['role'] = ColumnMetadata(table_meta, 'role', 
cassandra.cqltypes.UTF8Type)
 +table_meta.columns['resource'] = ColumnMetadata(table_meta, 
'resource', cassandra.cqltypes.UTF8Type)
 +table_meta.columns['permission'] = ColumnMetadata(table_meta, 
'permission', cassandra.cqltypes.UTF8Type)
 +else:
- raise ColumnFamilyNotFoundException(Column family %r not found 
% tablename)
+ raise ColumnFamilyNotFound(Column family %r not found % 
tablename)
  
 -return ksmeta.tables[tablename]
 -
  def get_usertypes_meta(self):
  data = self.session.execute(select * from

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-21 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: b379e32606717dfd1afe1b4e37398f4dfeb0fb24
Parents: a43e43f aeadda5
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Tue Apr 21 11:46:50 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Tue Apr 21 11:46:50 2015 -0500

--
 CHANGES.txt |  4 +-
 .../cql3/statements/AlterTypeStatement.java |  6 ++
 .../apache/cassandra/cql3/UserTypesTest.java| 94 
 3 files changed, 102 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b379e326/CHANGES.txt
--
diff --cc CHANGES.txt
index 41ed08f,9211270..e14e6cf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,104 -1,6 +1,104 @@@
 +3.0
 + * Distinguish between null and unset in protocol v4 (CASSANDRA-7304)
 + * Add user/role permissions for user-defined functions (CASSANDRA-7557)
 + * Allow cassandra config to be updated to restart daemon without unloading 
classes (CASSANDRA-9046)
 + * Don't initialize compaction writer before checking if iter is empty 
(CASSANDRA-9117)
 + * Remove line number generation from default logback.xml
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-21 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk

Conflicts:
CHANGES.txt
test/unit/org/apache/cassandra/cql3/UserTypesTest.java


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

Branch: refs/heads/trunk
Commit: 5f663f540c7428087c903e5fd3974aaddd3d
Parents: 727c5c8 bdef072
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Tue Apr 21 11:08:38 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Tue Apr 21 11:08:38 2015 -0500

--
 CHANGES.txt |   3 +
 .../cql3/statements/AlterTypeStatement.java |   9 +-
 .../cassandra/db/composites/CellNames.java  |   1 +
 .../org/apache/cassandra/cql3/CQLTester.java|   5 +
 .../apache/cassandra/cql3/UserTypesTest.java| 111 +++
 5 files changed, 128 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f663f54/CHANGES.txt
--
diff --cc CHANGES.txt
index a69789a,ff25db6..41ed08f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,102 -1,7 +1,105 @@@
 +3.0
 + * Distinguish between null and unset in protocol v4 (CASSANDRA-7304)
 + * Add user/role permissions for user-defined functions (CASSANDRA-7557)
 + * Allow cassandra config to be updated to restart daemon without unloading 
classes (CASSANDRA-9046)
 + * Don't initialize compaction writer before checking if iter is empty 
(CASSANDRA-9117)
 + * Remove line number generation from default logback.xml
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-21 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: a43e43f0ee7817222f6e3726c404560cb7dd9e83
Parents: 5f663f5 5ed41ea
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Tue Apr 21 11:20:04 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Tue Apr 21 11:20:04 2015 -0500

--
 .../org/apache/cassandra/cql3/statements/AlterTypeStatement.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-17 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 0f72f79d5f9ed54cb9b9e33d371f4f13eae21dca
Parents: 4adf29d 5d88ff4
Author: Marcus Eriksson marc...@apache.org
Authored: Fri Apr 17 16:49:07 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Fri Apr 17 16:49:07 2015 +0200

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-15 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: a053d9e069ffda2c3962cac6a2f48e747cbdb517
Parents: 46c3f7d dac5497
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Wed Apr 15 12:47:48 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Wed Apr 15 12:47:48 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a053d9e0/CHANGES.txt
--
diff --cc CHANGES.txt
index c654709,0f6329a..7f0170f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,103 -1,8 +1,105 @@@
 +3.0
 + * Add user/role permissions for user-defined functions (CASSANDRA-7557)
 + * Allow cassandra config to be updated to restart daemon without unloading 
classes (CASSANDRA-9046)
 + * Don't initialize compaction writer before checking if iter is empty 
(CASSANDRA-9117)
 + * Remove line number generation from default logback.xml
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-14 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 2e4c7a5a7ebccd288c803477e5d35f78e5f511b9
Parents: d383f5c ca07614
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Tue Apr 14 17:43:45 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Tue Apr 14 17:43:45 2015 -0500

--
 CHANGES.txt |  2 +
 .../cql3/statements/AlterTypeStatement.java | 43 +---
 .../apache/cassandra/cql3/UserTypesTest.java| 40 --
 3 files changed, 59 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e4c7a5a/CHANGES.txt
--
diff --cc CHANGES.txt
index a8c1eb0,7ebaa89..7f87a88
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,101 -1,6 +1,103 @@@
 +3.0
 + * Add user/role permissions for user-defined functions (CASSANDRA-7557)
 + * Allow cassandra config to be updated to restart daemon without unloading 
classes (CASSANDRA-9046)
 + * Don't initialize compaction writer before checking if iter is empty 
(CASSANDRA-9117)
 + * Remove line number generation from default logback.xml
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection,

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-08 Thread dbrosius

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: cbb982cc17f565f9853f000371a511f5ff0960cf
Parents: 93f40cc 7b83334
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Wed Apr 8 23:38:38 2015 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Wed Apr 8 23:38:38 2015 -0400

--
 build.xml |  12 +++-
 lib/ST4-4.0.8.jar | Bin 0 - 239543 bytes
 lib/licenses/ST4-4.0.8.txt|  27 +++
 lib/licenses/stringtemplate-4.0.2.txt |  27 ---
 lib/stringtemplate-4.0.2.jar  | Bin 226406 - 0 bytes
 5 files changed, 34 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbb982cc/build.xml
--
diff --cc build.xml
index 4dc883e,6eb45d4..047f9a8
--- a/build.xml
+++ b/build.xml
@@@ -327,12 -357,13 +327,15 @@@
dependency groupId=org.apache.commons artifactId=commons-lang3 
version=3.1/
dependency groupId=org.apache.commons artifactId=commons-math3 
version=3.2/
dependency groupId=com.googlecode.concurrentlinkedhashmap 
artifactId=concurrentlinkedhashmap-lru version=1.3/
-   dependency groupId=org.antlr artifactId=antlr version=3.5.2/
-   dependency groupId=org.antlr artifactId=antlr-runtime 
version=3.5.2/
-   dependency groupId=org.antlr artifactId=stringtemplate 
version=4.0.2/
+   dependency groupId=org.antlr artifactId=antlr version=3.5.2
+ exclusion groupId=org.antlr artifactId=stringtemplate/
+   /dependency
+   dependency groupId=org.antlr artifactId=antlr-runtime 
version=3.5.2
+ exclusion groupId=org.antlr artifactId=stringtemplate/
+   /dependency
dependency groupId=org.slf4j artifactId=slf4j-api 
version=1.7.2/
 +  dependency groupId=org.slf4j artifactId=log4j-over-slf4j 
version=1.7.2/
 +  dependency groupId=org.slf4j artifactId=jcl-over-slf4j 
version=1.7.2 /
dependency groupId=ch.qos.logback artifactId=logback-core 
version=1.1.2/
dependency groupId=ch.qos.logback artifactId=logback-classic 
version=1.1.2/
dependency groupId=org.codehaus.jackson 
artifactId=jackson-core-asl version=1.9.2/
@@@ -478,12 -493,10 +481,11 @@@
  dependency groupId=com.googlecode.concurrentlinkedhashmap 
artifactId=concurrentlinkedhashmap-lru/
  dependency groupId=org.antlr artifactId=antlr/
  dependency groupId=org.antlr artifactId=antlr-runtime/
- dependency groupId=org.antlr artifactId=stringtemplate 
version=4.0.2/
  dependency groupId=org.slf4j artifactId=slf4j-api/
 +dependency groupId=org.slf4j artifactId=log4j-over-slf4j/
 +dependency groupId=org.slf4j artifactId=jcl-over-slf4j/
  dependency groupId=org.codehaus.jackson 
artifactId=jackson-core-asl/
  dependency groupId=org.codehaus.jackson 
artifactId=jackson-mapper-asl/
 -dependency groupId=jline artifactId=jline/
  dependency groupId=com.googlecode.json-simple 
artifactId=json-simple/
  dependency groupId=com.boundary artifactId=high-scale-lib/
  dependency groupId=org.yaml artifactId=snakeyaml/

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-07 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: f9693d542e733b8386793b51aa8dd9434416dc3a
Parents: 30812dd cb8cb5f
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Apr 7 16:27:52 2015 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Apr 7 16:27:52 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9693d54/CHANGES.txt
--
diff --cc CHANGES.txt
index 9449386,69f96ba..f59372f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,96 -1,6 +1,99 @@@
 +3.0
 + * Remove line number generation from default logback.xml
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-07 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 47a4cbedfe004b83a4b9486f5059163888fa9a77
Parents: f9693d5 879691d
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Apr 7 17:24:17 2015 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Apr 7 17:24:17 2015 -0500

--
 CHANGES.txt  |   2 +-
 pylib/cqlshlib/test/test_cqlsh_completion.py | 299 --
 pylib/cqlshlib/test/test_keyspace_init.cql   |  36 ++-
 3 files changed, 290 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/47a4cbed/CHANGES.txt
--
diff --cc CHANGES.txt
index f59372f,5cf621d..3298bae
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,99 -1,7 +1,99 @@@
 +3.0
 + * Remove line number generation from default logback.xml
 + * Don't execute any functions at prepare-time (CASSANDRA-9037)
 + * Share file handles between all instances of a SegmentedFile 
(CASSANDRA-8893)
 + * Make it possible to major compact LCS (CASSANDRA-7272)
 + * Make FunctionExecutionException extend RequestExecutionException
 +   (CASSANDRA-9055)
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-03 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: adcb8a439a4826db6d5db1672c882525b60c66cc
Parents: 2341e94 f716229
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Apr 3 15:18:17 2015 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Apr 3 15:18:17 2015 -0500

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

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-03 Thread benedict

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java


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

Branch: refs/heads/trunk
Commit: 57e1a26547abc2bf68d6fad1287eae6a262e64d7
Parents: 7f16166 2057a34
Author: Benedict Elliott Smith bened...@apache.org
Authored: Fri Apr 3 23:02:29 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Fri Apr 3 23:02:29 2015 +0100

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-01 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 1b0a59e2ac5c29176280649e65ff4fe82bb76281
Parents: b09e392 0ba5f27
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Apr 1 13:14:45 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Apr 1 13:14:45 2015 +0200

--
 .../cassandra/db/compaction/DateTieredCompactionStrategy.java  | 2 +-
 .../cassandra/db/compaction/DateTieredCompactionStrategyTest.java  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0a59e2/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b0a59e2/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-01 Thread jake

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: a7b5df6b4c0942d41bd8df6e1b9c372535f210f4
Parents: b8717dc 28af4fa
Author: T Jake Luciani j...@apache.org
Authored: Wed Apr 1 11:14:47 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Wed Apr 1 11:14:47 2015 -0400

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-01 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: addba6b56f30ab26dde56fec1e116d046a3a288c
Parents: c7b02d1 2fa18d3
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Apr 1 13:04:17 2015 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Apr 1 13:04:17 2015 -0500

--
 CHANGES.txt   |   2 ++
 lib/cassandra-driver-internal-only-2.1.4.post.zip | Bin 140181 - 0 bytes
 lib/cassandra-driver-internal-only-2.5.0.zip  | Bin 0 - 189224 bytes
 3 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/addba6b5/CHANGES.txt
--
diff --cc CHANGES.txt
index 3f7dc9e,06d2112..357e479
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,90 -1,6 +1,92 @@@
 +3.0
 + * Add support for SELECT JSON, INSERT JSON syntax and new toJson(), 
fromJson()
 +   functions (CASSANDRA-7970)
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-01 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 61e063b041834cac9e3d4e9e017a24cba990c3f4
Parents: a7b5df6 cc672f3
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Apr 1 12:14:38 2015 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Apr 1 12:14:38 2015 -0500

--
 CHANGES.txt |  2 +
 src/java/org/apache/cassandra/cql3/Lists.java   |  6 +++
 .../apache/cassandra/cql3/CollectionsTest.java  | 44 +---
 3 files changed, 28 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/61e063b0/CHANGES.txt
--
diff --cc CHANGES.txt
index 61d9c9c,6137e00..9178fb3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,88 -1,6 +1,90 @@@
 +3.0
 + * Optimise max purgeable timestamp calculation in compaction (CASSANDRA-8920)
 + * Constrain internode message buffer sizes, and improve IO class hierarchy 
(CASSANDRA-8670) 
 + * New tool added to validate all sstables in a node (CASSANDRA-5791)
 + * Push notification when tracing completes for an operation (CASSANDRA-7807)
 + * Delay node up and node added notifications until native protocol 
server is started (CASSANDRA-8236)
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-30 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: cc0247b1252bf83cbd14057f60fcf18fc10cfacc
Parents: 04389ad 6ee4b09
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Mar 30 11:00:40 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Mar 30 11:00:40 2015 +0300

--
 src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc0247b1/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-27 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 04f351d57422b91dd1be3822fa28a3220a42056a
Parents: 5d9574f bd48424
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Mar 27 10:11:31 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Mar 27 10:11:31 2015 +0300

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java | 6 ++
 2 files changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/04f351d5/CHANGES.txt
--
diff --cc CHANGES.txt
index 1780249,3f5571e..4a25079
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,83 -1,5 +1,84 @@@
 +3.0
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-27 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java


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

Branch: refs/heads/trunk
Commit: db900a37465d4e3a0c915d16725c890f3ee375e9
Parents: 04f351d f7856c2
Author: Tyler Hobbs tylerho...@apache.org
Authored: Fri Mar 27 10:04:06 2015 -0500
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Fri Mar 27 10:04:06 2015 -0500

--
 .../org/apache/cassandra/io/sstable/IndexSummaryBuilder.java| 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/db900a37/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
index 2e96d03,ff06c10..696bbf8
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
@@@ -107,9 -107,12 +107,12 @@@ public class IndexSummaryBuilder implem
  
  // for initializing data structures, adjust our estimates based on 
the sampling level
  maxExpectedEntries = Math.max(1, (maxExpectedEntries * samplingLevel) 
/ BASE_SAMPLING_LEVEL);
 -offsets = new SafeMemoryWriter(4 * 
maxExpectedEntries).withByteOrder(ByteOrder.nativeOrder());
 -entries = new SafeMemoryWriter(40 * 
maxExpectedEntries).withByteOrder(ByteOrder.nativeOrder());
 +offsets = new SafeMemoryWriter(4 * 
maxExpectedEntries).order(ByteOrder.nativeOrder());
 +entries = new SafeMemoryWriter(40 * 
maxExpectedEntries).order(ByteOrder.nativeOrder());
- setNextSamplePosition(-minIndexInterval);
+ 
+ // the summary will always contain the first index entry 
(downsampling will never remove it)
+ nextSamplePosition = 0;
+ indexIntervalMatches++;
  }
  
  // the index file has been flushed to the provided position; stash it and 
use that to recalculate our max readable boundary

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-27 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/cql3/Cql.g


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

Branch: refs/heads/trunk
Commit: 2989edb39027ca4bb342d1b24c57285565aa126e
Parents: 05a86fd a23960e
Author: Tyler Hobbs tylerho...@apache.org
Authored: Fri Mar 27 15:52:57 2015 -0500
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Fri Mar 27 15:52:57 2015 -0500

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/cql3/Cql.g | 2 ++
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2989edb3/CHANGES.txt
--
diff --cc CHANGES.txt
index 6a499be,8854261..739926e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,83 -1,5 +1,84 @@@
 +3.0
 + * Compressed Commit Log (CASSANDRA-6809)
 + * Optimise IntervalTree (CASSANDRA-8988)
 + * Add a key-value payload for third party usage (CASSANDRA-8553)
 + * Bump metrics-reporter-config dependency for metrics 3.0 (CASSANDRA-8149)
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-26 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 5d9574fc00e5ef1f478e5c30dff60e57edce3964
Parents: 8e115da b66092f
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Mar 26 17:59:44 2015 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Mar 26 17:59:44 2015 -0500

--
 .../unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9574fc/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-24 Thread benedict

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 966ff2159aa73b941e5ccb80b8f8318981c70021
Parents: 44f8254 c397165
Author: Benedict Elliott Smith bened...@apache.org
Authored: Tue Mar 24 23:49:22 2015 +
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Tue Mar 24 23:49:22 2015 +

--
 .../org/apache/cassandra/io/sstable/format/SSTableReader.java| 4 ++--
 src/java/org/apache/cassandra/io/util/SafeMemory.java| 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/966ff215/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
index 77c9fdd,000..e59ca44
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
@@@ -1,2031 -1,0 +1,2031 @@@
 +/*
 + * 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.format;
 +
 +import java.io.*;
 +import java.nio.ByteBuffer;
 +import java.util.*;
 +import java.util.concurrent.*;
 +import java.util.concurrent.atomic.AtomicBoolean;
 +import java.util.concurrent.atomic.AtomicLong;
 +
 +import com.google.common.annotations.VisibleForTesting;
 +import com.google.common.base.Predicate;
 +import com.google.common.collect.Iterators;
 +import com.google.common.collect.Ordering;
 +import com.google.common.primitives.Longs;
 +import com.google.common.util.concurrent.RateLimiter;
 +
 +import com.clearspring.analytics.stream.cardinality.CardinalityMergeException;
 +import com.clearspring.analytics.stream.cardinality.HyperLogLogPlus;
 +import com.clearspring.analytics.stream.cardinality.ICardinality;
 +import org.apache.cassandra.cache.CachingOptions;
 +import org.apache.cassandra.cache.InstrumentingCache;
 +import org.apache.cassandra.cache.KeyCacheKey;
 +import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
 +import org.apache.cassandra.concurrent.ScheduledExecutors;
 +import org.apache.cassandra.config.*;
 +import org.apache.cassandra.db.*;
 +import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
 +import org.apache.cassandra.db.commitlog.ReplayPosition;
 +import org.apache.cassandra.db.composites.CellName;
 +import org.apache.cassandra.db.filter.ColumnSlice;
 +import org.apache.cassandra.db.index.SecondaryIndex;
 +import org.apache.cassandra.dht.*;
 +import org.apache.cassandra.io.compress.CompressionMetadata;
 +import org.apache.cassandra.io.sstable.*;
 +import org.apache.cassandra.io.sstable.metadata.*;
 +import org.apache.cassandra.io.util.*;
 +import org.apache.cassandra.metrics.RestorableMeter;
 +import org.apache.cassandra.metrics.StorageMetrics;
 +import org.apache.cassandra.service.ActiveRepairService;
 +import org.apache.cassandra.service.CacheService;
 +import org.apache.cassandra.service.StorageService;
 +import org.apache.cassandra.utils.*;
 +import org.apache.cassandra.utils.concurrent.OpOrder;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +import org.apache.cassandra.utils.concurrent.Ref;
 +import org.apache.cassandra.utils.concurrent.RefCounted;
 +import org.apache.cassandra.utils.concurrent.SelfRefCounted;
 +
 +import static 
org.apache.cassandra.db.Directories.SECONDARY_INDEX_NAME_SEPARATOR;
 +
 +/**
 + * An SSTableReader can be constructed in a number of places, but typically 
is either
 + * read from disk at startup, or constructed from a flushed memtable, or 
after compaction
 + * to replace some existing sstables. However once created, an sstablereader 
may also be modified.
 + *
 + * A reader's OpenReason describes its

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-23 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 1faca1cb588435b4b04f7137ee045f7d823b1e1b
Parents: 540e9cf bcf0ec6
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Mar 23 19:14:01 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Mar 23 19:14:01 2015 +0300

--
 CHANGES.txt |   1 +
 src/java/org/apache/cassandra/cql3/Lists.java   |   4 +-
 src/java/org/apache/cassandra/cql3/Maps.java|   3 +-
 .../org/apache/cassandra/cql3/Operation.java|   2 +-
 src/java/org/apache/cassandra/cql3/Sets.java|  25 +-
 .../cassandra/cql3/FrozenCollectionsTest.java   | 260 +++
 6 files changed, 286 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1faca1cb/CHANGES.txt
--
diff --cc CHANGES.txt
index c136c52,0e75973..e10c476
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,79 -1,5 +1,80 @@@
 +3.0
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-23 Thread marcuse

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java


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

Branch: refs/heads/trunk
Commit: 6633421ddeca4bb535f22a251605a04f0f870487
Parents: fb3d9fd fd0bdef
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Mar 23 09:11:02 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Mar 23 09:11:02 2015 +0100

--
 CHANGES.txt |  1 +
 .../db/compaction/LazilyCompactedRow.java   | 31 ++--
 2 files changed, 23 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6633421d/CHANGES.txt
--
diff --cc CHANGES.txt
index 9501253,25b0a06..4c3ef62
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,78 -1,5 +1,79 @@@
 +3.0
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-23 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: bee474626f71f7abe38e82b4fcdf3abdabadd29a
Parents: 6633421 ff14d7a
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Mar 23 09:28:26 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Mar 23 09:28:26 2015 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/db/compaction/LeveledManifest.java| 16 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bee47462/CHANGES.txt
--
diff --cc CHANGES.txt
index 4c3ef62,924bdcf..68df3e6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,78 -1,5 +1,79 @@@
 +3.0
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 +

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-20 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk

Conflicts:
bin/cqlsh


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

Branch: refs/heads/trunk
Commit: 237d0bc62ebc6e83e900a6c5ae8e342ad8bf84c3
Parents: 61c8ff4 7110904
Author: Tyler Hobbs tylerho...@apache.org
Authored: Fri Mar 20 10:30:28 2015 -0500
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Fri Mar 20 10:30:28 2015 -0500

--
 CHANGES.txt|   1 +
 bin/cqlsh  | 290 +---
 pylib/cqlshlib/async_insert.py | 115 --
 pylib/cqlshlib/meter.py|  59 
 4 files changed, 237 insertions(+), 228 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/237d0bc6/CHANGES.txt
--
diff --cc CHANGES.txt
index cd39890,a142999..1c4e9f5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,78 -1,5 +1,79 @@@
 +3.0
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-19 Thread dbrosius

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 850b5d0d21014df8d672bd420d7a26dd07e8f828
Parents: ce3053a 86b04ad
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Thu Mar 19 21:13:02 2015 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Thu Mar 19 21:13:02 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/850b5d0d/src/java/org/apache/cassandra/dht/AbstractBounds.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-19 Thread jake

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/gms/Gossiper.java
src/java/org/apache/cassandra/transport/Server.java


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

Branch: refs/heads/trunk
Commit: 4597bb5b1687048a2dd57bfea679e987637c5fcc
Parents: b25adc7 763130b
Author: T Jake Luciani j...@apache.org
Authored: Thu Mar 19 13:50:39 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Thu Mar 19 13:50:39 2015 -0400

--
 src/java/org/apache/cassandra/gms/EndpointState.java | 12 
 src/java/org/apache/cassandra/gms/Gossiper.java  | 12 ++--
 src/java/org/apache/cassandra/transport/Server.java  | 11 +--
 3 files changed, 11 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4597bb5b/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index d7b1ec7,9c0ef8a..ff1240a
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -891,15 -883,9 +891,9 @@@ public class Gossiper implements IFailu
  return;
  }
  
- if (localState.hasPendingEcho())
- {
- logger.debug({} has already a pending echo, skipping it, 
localState);
- return;
- }
- 
  localState.markDead();
  
 -MessageOutEchoMessage echoMessage = new 
MessageOutEchoMessage(MessagingService.Verb.ECHO, new EchoMessage(), 
EchoMessage.serializer);
 +MessageOutEchoMessage echoMessage = new 
MessageOutEchoMessage(MessagingService.Verb.ECHO, EchoMessage.instance, 
EchoMessage.serializer);
  logger.trace(Sending a EchoMessage to {}, addr);
  IAsyncCallback echoHandler = new IAsyncCallback()
  {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4597bb5b/src/java/org/apache/cassandra/transport/Server.java
--
diff --cc src/java/org/apache/cassandra/transport/Server.java
index 6aa929b,8f0f89f..e6e0a8f
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@@ -22,8 -22,9 +22,10 @@@ import java.net.InetAddress
  import java.net.InetSocketAddress;
  import java.net.UnknownHostException;
  import java.util.EnumMap;
+ import java.util.Map;
 +import java.util.List;
  import java.util.concurrent.Callable;
+ import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.atomic.AtomicBoolean;
  import javax.net.ssl.SSLContext;
  import javax.net.ssl.SSLEngine;

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-16 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 482cbc0c81342d14e133dc3f408aaf6ae7f4e680
Parents: a64f414 1a77a69
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Mar 16 13:38:48 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Mar 16 13:38:48 2015 +0100

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/db/DataTracker.java  | 6 +++---
 src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java  | 2 +-
 src/java/org/apache/cassandra/tools/StandaloneSplitter.java| 2 +-
 .../org/apache/cassandra/io/sstable/SSTableRewriterTest.java   | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/482cbc0c/CHANGES.txt
--
diff --cc CHANGES.txt
index 123e455,a48787f..ef2a7c7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,78 -1,10 +1,79 @@@
 +3.0
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-16 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: a64f4143cb603aaeaed066797519910cb236e784
Parents: b274aa1 022e3ee
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Mar 16 09:44:24 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Mar 16 09:44:24 2015 +0100

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/config/YamlConfigurationLoader.java | 2 +-
 src/java/org/apache/cassandra/tools/BulkLoader.java   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a64f4143/CHANGES.txt
--
diff --cc CHANGES.txt
index 7c0191e,d41a1a4..123e455
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,77 -1,9 +1,78 @@@
 +3.0
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-13 Thread jmckenzie

Merge branch 'cassandra-2.1' into trunk

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 5d6f9284fcf7eb893de2520b1f983ffa9b3ee5a7
Parents: 994d8f5 d97e7cb
Author: Joshua McKenzie jmcken...@apache.org
Authored: Fri Mar 13 13:02:30 2015 -0500
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Fri Mar 13 13:02:30 2015 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/io/sstable/SSTableRewriter.java   | 34 +++-
 2 files changed, 27 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d6f9284/CHANGES.txt
--
diff --cc CHANGES.txt
index 9caa127,d7ab277..7c0191e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,76 -1,8 +1,77 @@@
 +3.0
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-12 Thread jake

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: f843b42e87efc3d7cd167aa99d938109a51e7088
Parents: bc7941c 4646014
Author: T Jake Luciani j...@apache.org
Authored: Wed Mar 11 12:59:55 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Wed Mar 11 12:59:55 2015 -0400

--
 CHANGES.txt   | 1 +
 .../cassandra/stress/operations/userdefined/SchemaStatement.java  | 3 +++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f843b42e/CHANGES.txt
--
diff --cc CHANGES.txt
index b999577,c8a4a84..c67acd1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,74 -1,5 +1,75 @@@
 +3.0
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-11 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 87d56d12569681ea1304d08d42790c7ec76a1e34
Parents: f843b42 4831ba1
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Mar 11 15:09:58 2015 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Mar 11 15:09:58 2015 -0500

--
 NEWS.txt | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/87d56d12/NEWS.txt
--
diff --cc NEWS.txt
index d68460b,4ead1ea..c742f08
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,70 -13,8 +13,74 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +3.0
 +===
 +
 +New features
 +
 +   - Authentication  Authorization APIs have been updated to introduce
 + roles. Roles and Permissions granted to them are inherited, supporting
 + role based access control. The role concept supercedes that of users
 + and CQL constructs such as CREATE USER are deprecated but retained for
 + compatibility. The requirement to explicitly create Roles in Cassandra
 + even when auth is handled by an external system has been removed, so
 + authentication  authorization can be delegated to such systems in their
 + entirety.
 +   - In addition to the above, Roles are also first class resources and can 
be the
 + subject of permissions. Users (roles) can now be granted permissions on 
other
 + roles, including CREATE, ALTER, DROP  AUTHORIZE, which removesthe need 
for
 + superuser privileges in order to perform user/role management operations.
 +   - Creators of database resources (Keyspaces, Tables, Roles) are now 
automatically
 + granted all permissions on them (if the IAuthorizer implementation 
supports
 + this).
 +   - SSTable file name is changed. Now you don't have Keyspace/CF name
 + in file name. Also, secondary index has its own directory under parent's
 + directory.
 +   - Support for user-defined functions and user-defined aggregates have
 + been added to CQL.
 +   - Row-cache is now fully off-heap.
 +   - jemalloc is now automatically preloaded and used on Linux and OS-X if
 + installed.
 +   - Please ensure on Unix platforms that there is no libjnadispath.so
 + installed which is accessible by Cassandra. Old versions of
 + libjna packages ( 4.0.0) will cause problems - e.g. Debian Wheezy
 + contains libjna versin 3.2.x.
 +
 +
 +Upgrading
 +-
 +   - Pig's CqlStorage has been removed, use CqlNativeStorage instead
 +   - IAuthenticator been updated to remove responsibility for user/role
 + maintenance and is now solely responsible for validating credentials,
 + This is primarily done via SASL, though an optional method exists for
 + systems which need support for the Thrift login() method.
 +   - IRoleManager interface has been added which takes over the maintenance
 + functions from IAuthenticator. IAuthorizer is mainly unchanged. Auth data
 + in systems using the stock internal implementations PasswordAuthenticator
 +  CassandraAuthorizer will be automatically converted during upgrade,
 + with minimal operator intervention required. Custom implementations will
 + require modification, though these can be used in conjunction with the
 + stock CassandraRoleManager so providing an IRoleManager implementation
 + should not usually be necessary.
 +   - Fat client support has been removed since we have push notifications to 
clients
 +   - cassandra-cli has been removed. Please use cqlsh instead.
 +   - YamlFileNetworkTopologySnitch has been removed; switch to
 + GossipingPropertyFileSnitch instead.
 +   - CQL2 has been removed entirely in this release (previously deprecated
 + in 2.0.0). Please switch to CQL3 if you haven't already done so.
 +   - Very large batches will now be rejected (defaults to 50kb). This
 + can be customized by modifying batch_size_fail_threshold_in_kb.
 +   - The results of CQL3 queries containing an IN restriction will be ordered
 + in the normal order and not anymore in the order in which the column 
values were
 + specified in the IN restriction.
++   - Some secondary index queries with restrictions on non-indexed clustering
++ columns were not requiring ALLOW FILTERING as they should. This has been
++ fixed, and those queries now require ALLOW FILTERING (see CASSANDRA-8418
++ for details).
 +
  2.1.4
  =

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-10 Thread benedict

Merge branch 'cassandra-2.1' into trunk

Conflicts:

tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java


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

Branch: refs/heads/trunk
Commit: a0586f69291af79079db0f5cc495806a28fca7a6
Parents: bf9c503 6bbfb55
Author: Benedict Elliott Smith bened...@apache.org
Authored: Tue Mar 10 14:26:30 2015 +
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Tue Mar 10 14:26:30 2015 +

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/stress/Operation.java  |   2 +-
 .../apache/cassandra/stress/StressAction.java   |  46 +
 .../apache/cassandra/stress/StressMetrics.java  |  83 ++-
 .../apache/cassandra/stress/StressProfile.java  |  15 ++-
 .../stress/operations/FixedOpDistribution.java  |  10 ++
 .../stress/operations/OpDistribution.java   |   2 +
 .../operations/OpDistributionFactory.java   |   6 +-
 .../operations/SampledOpDistribution.java   |  17 
 .../SampledOpDistributionFactory.java   |  10 +-
 .../cassandra/stress/settings/Command.java  |  27 +++--
 .../cassandra/stress/settings/Option.java   |   1 +
 .../stress/settings/OptionAnyProbabilities.java |   5 +
 .../stress/settings/OptionDistribution.java |  17 ++--
 .../cassandra/stress/settings/OptionMulti.java  |  15 ++-
 .../settings/OptionRatioDistribution.java   |   5 +
 .../stress/settings/SettingsCommand.java|  48 ++---
 .../settings/SettingsCommandPreDefined.java |  12 ++-
 .../stress/settings/SettingsCommandUser.java|   5 +
 .../org/apache/cassandra/stress/util/Timer.java |  10 +-
 .../apache/cassandra/stress/util/Timing.java|  75 +-
 .../cassandra/stress/util/TimingInterval.java   | 102 +--
 22 files changed, 354 insertions(+), 160 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0586f69/CHANGES.txt
--
diff --cc CHANGES.txt
index a6adfe0,af5206b..b2b33b0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,68 -1,5 +1,69 @@@
 +3.0
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-10 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 9eebe874dd5c74082571de95101584327bc266cb
Parents: 4adb981 2206ffa
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Mar 10 14:02:57 2015 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Mar 10 14:02:57 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9eebe874/CHANGES.txt
--
diff --cc CHANGES.txt
index 2de6137,29e7541..d8c9b62
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,70 -1,5 +1,71 @@@
 +3.0
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455,

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-09 Thread jmckenzie

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: b426963eb8d0570a5dc4dee201bdee2782f2d964
Parents: 3d11ec5 9ee34b6
Author: Joshua McKenzie jmcken...@apache.org
Authored: Mon Mar 9 12:35:34 2015 -0500
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Mon Mar 9 12:35:34 2015 -0500

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


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

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-06 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 3a44b4c6b31708140d5dc80f0283df286653743c
Parents: a1b574e 2e3a287
Author: Marcus Eriksson marc...@apache.org
Authored: Fri Mar 6 11:41:02 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Fri Mar 6 11:41:02 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a44b4c6/CHANGES.txt
--
diff --cc CHANGES.txt
index e1efa3b,5acc288..48b7cf0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,66 -1,5 +1,67 @@@
 +3.0
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 
8761)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 + * Select optimal CRC32 implementation at runtime (CASSANDRA-8614)
 + * Evaluate MurmurHash of Token once per query (CASSANDRA-7096)
 +
 +
  2.1.4
+  * Use long for key count in cfstats (CASSANDRA-8913)
   * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
   *

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-04 Thread jake

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 4a1879c2359715577ed8d57563e33fd5fe51d869
Parents: 8501e51 213b066
Author: T Jake Luciani j...@apache.org
Authored: Wed Mar 4 16:29:34 2015 -0500
Committer: T Jake Luciani j...@apache.org
Committed: Wed Mar 4 16:29:34 2015 -0500

--
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-04 Thread jake

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: b2d16f4cdd1c3441b6f39ad10786b36ddc69730d
Parents: 4a1879c 4176f9e
Author: T Jake Luciani j...@apache.org
Authored: Wed Mar 4 16:37:17 2015 -0500
Committer: T Jake Luciani j...@apache.org
Committed: Wed Mar 4 16:37:17 2015 -0500

--
 .../org/apache/cassandra/stress/settings/SettingsPopulation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-04 Thread marcuse

Merge branch 'cassandra-2.1' into trunk

Conflicts:
NEWS.txt

test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java


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

Branch: refs/heads/trunk
Commit: b5b1af7036d9fdb68c397027040f099ae7140d58
Parents: 89d31f3 f6d0cf3
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Mar 4 09:08:04 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Mar 4 09:08:04 2015 +0100

--
 CHANGES.txt |   1 +
 NEWS.txt|   8 ++
 pylib/cqlshlib/cql3handling.py  |   1 -
 .../SizeTieredCompactionStrategy.java   | 136 ---
 .../SizeTieredCompactionStrategyOptions.java|  13 +-
 .../SizeTieredCompactionStrategyTest.java   |  90 
 6 files changed, 10 insertions(+), 239 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5b1af70/CHANGES.txt
--
diff --cc CHANGES.txt
index 45751f1,4992d85..1759f7c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,5 +1,66 @@@
 +3.0
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-03 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: b2dfe1be96288bd9d15ec40cd3d20deff09ca625
Parents: ab15d8e bef1d0c
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Mar 3 13:58:37 2015 -0800
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Mar 3 13:58:37 2015 -0800

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/service/CacheService.java | 10 ++
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2dfe1be/CHANGES.txt
--
diff --cc CHANGES.txt
index d8b222e,a90dd48..cc3658d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,5 +1,66 @@@
 +3.0
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 + * Select optimal CRC32 implementation at runtime (CASSANDRA-8614)
 + * Evaluate MurmurHash of Token once per query (CASSANDRA-7096)
 +
 +
  2.1.4
+  * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
   * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
   * Fix commitlog getPendingTasks

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-03 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 89d31f3da7c4007eb71c2e0de043bcaf7e4c5a27
Parents: 0014d92 d4e3786
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Mar 3 21:02:47 2015 -0800
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Mar 3 21:02:47 2015 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/utils/EstimatedHistogram.java |  2 +-
 .../cassandra/utils/EstimatedHistogramTest.java | 52 
 3 files changed, 44 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/89d31f3d/CHANGES.txt
--
diff --cc CHANGES.txt
index d6cb9b4,748acf8..45751f1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,5 +1,66 @@@
 +3.0
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 + * Select optimal CRC32 implementation at runtime (CASSANDRA-8614)
 + * Evaluate MurmurHash of Token once per query (CASSANDRA-7096)
 +
 +
  2.1.4
+  * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
   * Fix top partitions

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-03 Thread dbrosius

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: dd825a5f06fdcfaff46fd0c316840ad3a45504cf
Parents: 93b365c 9499f7c
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Tue Mar 3 21:54:03 2015 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue Mar 3 21:54:03 2015 -0500

--
 .../cassandra/io/compress/CompressionMetadata.java | 17 +++--
 .../cassandra/io/sstable/format/SSTableReader.java |  2 +-
 .../cassandra/streaming/StreamReceiveTask.java |  2 +-
 .../cassandra/stress/settings/SettingsSchema.java  |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd825a5f/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
--
diff --cc src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
index f550de4,59c5da5..eef9d0c
--- a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
@@@ -38,8 -38,6 +38,7 @@@ import java.util.TreeSet
  import com.google.common.annotations.VisibleForTesting;
  import com.google.common.primitives.Longs;
  
- import org.apache.cassandra.cache.RefCountedMemory;
 +import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.db.TypeSizes;
  import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.io.FSReadError;
@@@ -48,8 -46,6 +47,7 @@@ import org.apache.cassandra.io.IVersion
  import org.apache.cassandra.io.sstable.Component;
  import org.apache.cassandra.io.sstable.CorruptSSTableException;
  import org.apache.cassandra.io.sstable.Descriptor;
 +import org.apache.cassandra.io.sstable.format.Version;
- import org.apache.cassandra.io.sstable.format.SSTableWriter;
  import org.apache.cassandra.io.util.DataOutputPlus;
  import org.apache.cassandra.io.util.FileUtils;
  import org.apache.cassandra.io.util.Memory;
@@@ -269,11 -268,9 +267,10 @@@ public class CompressionMetadat
  private final CompressionParameters parameters;
  private final String filePath;
  private int maxCount = 100;
- private SafeMemory offsets = new SafeMemory(maxCount * 8);
+ private SafeMemory offsets = new SafeMemory(maxCount * 8L);
  private int count = 0;
- private Version latestVersion =  
DatabaseDescriptor.getSSTableFormat().info.getLatestVersion();
  
 +
  private Writer(CompressionParameters parameters, String path)
  {
  this.parameters = parameters;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd825a5f/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
index 0b55794,000..4468d57
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
@@@ -1,2057 -1,0 +1,2057 @@@
 +/*
 + * 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.format;
 +
 +import java.io.*;
 +import java.nio.ByteBuffer;
 +import java.util.*;
 +import java.util.concurrent.*;
 +import java.util.concurrent.atomic.AtomicBoolean;
 +import java.util.concurrent.atomic.AtomicLong;
 +
 +import com.google.common.annotations.VisibleForTesting;
 +import com.google.common.base.Predicate;
 +import com.google.common.collect.Iterators;
 +import com.google.common.collect.Ordering;
 +import com.google.common.primitives.Longs;
 +import com.google.common.util.concurrent.RateLimiter;
 +
 +import

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-03 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 0014d929f7504e2f41209af4d311d8105a1cd3aa
Parents: 3f8806d 0127b69
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Mar 3 20:56:09 2015 -0800
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Mar 3 20:56:09 2015 -0800

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java   | 4 ++--
 src/java/org/apache/cassandra/utils/TopKSampler.java  | 6 +++---
 test/unit/org/apache/cassandra/utils/TopKSamplerTest.java | 8 ++--
 4 files changed, 12 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0014d929/CHANGES.txt
--
diff --cc CHANGES.txt
index b877cbe,7ce6200..d6cb9b4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,5 +1,66 @@@
 +3.0
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 + * Select optimal CRC32 implementation at runtime (CASSANDRA-8614)
 + * Evaluate MurmurHash of Token once per query (CASSANDRA-7096)
 +
 +
  2.1.4
+  * Fix top partitions

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-03 Thread marcuse

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
src/java/org/apache/cassandra/service/ActiveRepairService.java


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

Branch: refs/heads/trunk
Commit: 2818ca4cf24f05a75041d220af4d3b0aa5203dbf
Parents: 7cc51f7 2f7077c
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Mar 3 10:44:21 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Mar 3 10:44:21 2015 +0100

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 14 +
 .../db/compaction/CompactionManager.java| 22 +---
 .../cassandra/service/ActiveRepairService.java  |  9 
 4 files changed, 29 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2818ca4c/CHANGES.txt
--
diff --cc CHANGES.txt
index 3892bbb,c3c7a19..23f9590
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,5 +1,66 @@@
 +3.0
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 + * Select optimal CRC32 implementation at

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-02-25 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 4807f12951667b6e5c0c08f9628841eb4901fc7f
Parents: 058e977 ca63607
Author: Tyler Hobbs tylerho...@apache.org
Authored: Wed Feb 25 10:42:52 2015 -0600
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Wed Feb 25 10:42:52 2015 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4807f129/CHANGES.txt
--
diff --cc CHANGES.txt
index 7bcfc36,70641fd..534a838
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,7 +1,68 @@@
 +3.0
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 + * Select optimal CRC32 implementation at runtime (CASSANDRA-8614)
 + * Evaluate MurmurHash of Token once per query (CASSANDRA-7096)
 +
 +
  2.1.4
+  * Fix parallelism adjustment in range and secondary index
+queries when the first fetch does not satisfy the
+limit (CASSANDRA-8856)
   * Check if the filtered sstables is

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-02-24 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: b944f0d666fa77e8f194ca078a861247f2b46747
Parents: ee5e487 0a7f508
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Feb 24 13:27:10 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Feb 24 13:27:10 2015 +0100

--
 CHANGES.txt| 1 +
 .../cassandra/db/compaction/SizeTieredCompactionStrategy.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b944f0d6/CHANGES.txt
--
diff --cc CHANGES.txt
index 6a3d059,b1bc26f..7bcfc36
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,5 +1,66 @@@
 +3.0
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 + * Select optimal CRC32 implementation at runtime (CASSANDRA-8614)
 + * Evaluate MurmurHash of Token once per query (CASSANDRA-7096)
 +
 +
  2.1.4
+  * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
   * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
   * Fix

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-02-20 Thread jake

Merge branch 'cassandra-2.1' into trunk

Conflicts:
build.xml


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

Branch: refs/heads/trunk
Commit: ea3ff25a0cc204b2c77b4c43da25011b8f62a845
Parents: a709821 407b5de
Author: T Jake Luciani j...@apache.org
Authored: Fri Feb 20 11:37:55 2015 -0500
Committer: T Jake Luciani j...@apache.org
Committed: Fri Feb 20 11:37:55 2015 -0500

--
 CHANGES.txt |   1 +
 build.xml   |   2 +-
 tools/lib/cassandra-driver-core-2.0.9.2.jar | Bin 0 - 1847276 bytes
 3 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea3ff25a/CHANGES.txt
--
diff --cc CHANGES.txt
index 85ca87d,d9560fc..07f3448
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,5 +1,66 @@@
 +3.0
 + * Add role based access control (CASSANDRA-7653, 8650, 7216)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 + * Select optimal CRC32 implementation at runtime (CASSANDRA-8614)
 + * Evaluate MurmurHash of Token once per query (CASSANDRA-7096)
 +
 +
  2.1.4
+  * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
   * Fix CommitLog.forceRecycleAllSegments() memory

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-02-10 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 0af528b942f8f061958f1736ac27da44ace4a723
Parents: 51057f4 f5380de
Author: Tyler Hobbs tylerho...@apache.org
Authored: Tue Feb 10 12:56:35 2015 -0600
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Tue Feb 10 12:56:35 2015 -0600

--
 CHANGES.txt   |   2 ++
 lib/cassandra-driver-internal-only-2.1.3.post.zip | Bin 138474 - 0 bytes
 lib/cassandra-driver-internal-only-2.1.4.post.zip | Bin 0 - 140181 bytes
 3 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0af528b9/CHANGES.txt
--
diff --cc CHANGES.txt
index 9f1bda5,92ee5d1..c722e94
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,64 -1,7 +1,66 @@@
 +3.0
 + * Add role based access control (CASSANDRA-7653, 8650)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.4
   * Write partition size estimates into a system table (CASSANDRA-7688)
+  * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
+(CASSANDRA-8154)
  
  
  2.1.3

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-02-10 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 187624b114711febc452ab70362014e986a1b24e
Parents: 0af528b ad91d41
Author: Tyler Hobbs tylerho...@apache.org
Authored: Tue Feb 10 13:21:37 2015 -0600
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Tue Feb 10 13:21:37 2015 -0600

--
 pylib/cqlshlib/cql3handling.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-02-09 Thread aleksey

Merge branch 'cassandra-2.1' into trunk

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/CFMetaData.java
src/java/org/apache/cassandra/db/DataTracker.java


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

Branch: refs/heads/trunk
Commit: afee0229e7dbd90eaaf94954d44b617c9445f9b4
Parents: 21c5a41 97da271
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Feb 10 04:25:23 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Feb 10 04:25:23 2015 +0300

--
 CHANGES.txt |  4 
 .../org/apache/cassandra/db/DataTracker.java|  2 ++
 .../cassandra/db/SizeEstimatesRecorder.java | 20 +++-
 .../org/apache/cassandra/db/SystemKeyspace.java |  3 ++-
 .../cassandra/service/CassandraDaemon.java  |  5 -
 5 files changed, 27 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/afee0229/CHANGES.txt
--
diff --cc CHANGES.txt
index b1fad72,c5cff48..9f1bda5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,7 +1,66 @@@
 +3.0
 + * Add role based access control (CASSANDRA-7653, 8650)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
+

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-02-05 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 4231b4e2a1be2d4f9107090949896f1ebc58e014
Parents: 49f1a62 2d5d301
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Feb 5 16:42:06 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Feb 5 16:42:06 2015 +0300

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-02-05 Thread aleksey

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/config/CFMetaData.java
src/java/org/apache/cassandra/config/KSMetaData.java
src/java/org/apache/cassandra/db/SystemKeyspace.java


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

Branch: refs/heads/trunk
Commit: e70959dea475928c8d87eea68b9fafb7a5ea0b62
Parents: 0fa19b7 e60089d
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Feb 5 16:30:47 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Feb 5 16:30:47 2015 +0300

--
 CHANGES.txt |   1 +
 .../cassandra/db/SizeEstimatesRecorder.java | 124 +++
 .../org/apache/cassandra/db/SystemKeyspace.java |  56 -
 .../cassandra/service/CassandraDaemon.java  |  12 +-
 4 files changed, 186 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e70959de/CHANGES.txt
--
diff --cc CHANGES.txt
index 61c57a3,959a2de..0aba61a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,63 -1,5 +1,64 @@@
 +3.0
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Write

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-02-05 Thread benedict

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: f161318fdc64a3a2ead6d25a650c51eb010cd4a5
Parents: 4231b4e b151134
Author: Benedict Elliott Smith bened...@apache.org
Authored: Thu Feb 5 14:33:02 2015 +
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Thu Feb 5 14:33:02 2015 +

--
 .../apache/cassandra/io/sstable/format/big/BigTableScanner.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f161318f/src/java/org/apache/cassandra/io/sstable/format/big/BigTableScanner.java
--
diff --cc 
src/java/org/apache/cassandra/io/sstable/format/big/BigTableScanner.java
index 85bc37d,000..1e187ff
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableScanner.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableScanner.java
@@@ -1,350 -1,0 +1,350 @@@
 +/*
 + * 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.format.big;
 +
 +import java.io.IOException;
 +import java.util.*;
 +
 +import com.google.common.collect.AbstractIterator;
 +import com.google.common.util.concurrent.RateLimiter;
 +
 +import org.apache.cassandra.db.DataRange;
 +import org.apache.cassandra.db.DecoratedKey;
 +import org.apache.cassandra.db.RowIndexEntry;
 +import org.apache.cassandra.db.RowPosition;
 +import org.apache.cassandra.db.columniterator.IColumnIteratorFactory;
 +import org.apache.cassandra.db.columniterator.LazyColumnIterator;
 +import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
 +import org.apache.cassandra.dht.AbstractBounds;
 +import org.apache.cassandra.dht.Bounds;
 +import org.apache.cassandra.dht.Range;
 +import org.apache.cassandra.dht.Token;
 +import org.apache.cassandra.io.sstable.CorruptSSTableException;
 +import org.apache.cassandra.io.sstable.ISSTableScanner;
 +import org.apache.cassandra.io.sstable.SSTableIdentityIterator;
 +import org.apache.cassandra.io.sstable.format.SSTableReader;
 +import org.apache.cassandra.io.util.FileUtils;
 +import org.apache.cassandra.io.util.RandomAccessReader;
 +import org.apache.cassandra.utils.ByteBufferUtil;
 +import org.apache.cassandra.utils.Pair;
 +
 +public class BigTableScanner implements ISSTableScanner
 +{
 +protected final RandomAccessReader dfile;
 +protected final RandomAccessReader ifile;
 +public final SSTableReader sstable;
 +
 +private final IteratorAbstractBoundsRowPosition rangeIterator;
 +private AbstractBoundsRowPosition currentRange;
 +
 +private final DataRange dataRange;
 +private final RowIndexEntry.IndexSerializer rowIndexEntrySerializer;
 +
 +protected IteratorOnDiskAtomIterator iterator;
 +
 +public static ISSTableScanner getScanner(SSTableReader sstable, DataRange 
dataRange, RateLimiter limiter)
 +{
 +return new BigTableScanner(sstable, dataRange, limiter);
 +}
 +public static ISSTableScanner getScanner(SSTableReader sstable, 
CollectionRangeToken tokenRanges, RateLimiter limiter)
 +{
 +// We want to avoid allocating a SSTableScanner if the range don't 
overlap the sstable (#5249)
- ListPairLong, Long positions = 
sstable.getPositionsForRanges(Range.normalize(tokenRanges));
++ListPairLong, Long positions = 
sstable.getPositionsForRanges(tokenRanges);
 +if (positions.isEmpty())
 +return new EmptySSTableScanner(sstable.getFilename());
 +
 +return new BigTableScanner(sstable, tokenRanges, limiter);
 +}
 +
 +/**
 + * @param sstable SSTable to scan; must not be null
 + * @param dataRange a single range to scan; must not be null
 + * @param limiter background i/o RateLimiter; may be

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-30 Thread jake

Merge branch 'cassandra-2.1' into trunk

Conflicts:
build.xml


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

Branch: refs/heads/trunk
Commit: 0b324c5e5575b6d86f7b57969e203fe80b3f6f80
Parents: caa0359 cdcf646
Author: T Jake Luciani j...@apache.org
Authored: Fri Jan 30 12:02:42 2015 -0500
Committer: T Jake Luciani j...@apache.org
Committed: Fri Jan 30 12:02:42 2015 -0500

--
 CHANGES.txt  |   1 +
 build.xml|   2 +-
 lib/libthrift-0.9.1.jar  | Bin 217054 - 0 bytes
 lib/libthrift-0.9.2.jar  | Bin 0 - 227712 bytes
 lib/licenses/libthrift-0.9.1.txt | 202 --
 lib/licenses/libthrift-0.9.2.txt | 202 ++
 6 files changed, 204 insertions(+), 203 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b324c5e/CHANGES.txt
--
diff --cc CHANGES.txt
index 21d06c3,92c1a17..fd3510c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,5 +1,63 @@@
 +3.0
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Upgrade libthrift to 0.9.2 (CASSANDRA-8685)
   * Don't use the shared ref in sstableloader (CASSANDRA-8704)
   * Purge internal prepared statements if

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-30 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: caa0359555282fb2e44db6f2769e3ab77d06e841
Parents: 806facc f123253
Author: Marcus Eriksson marc...@apache.org
Authored: Fri Jan 30 12:48:39 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Fri Jan 30 12:48:39 2015 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/io/sstable/SSTableLoader.java | 51 +++-
 2 files changed, 30 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/caa03595/CHANGES.txt
--
diff --cc CHANGES.txt
index a85a6e7,5113e07..21d06c3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,5 +1,63 @@@
 +3.0
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Don't use the shared ref in sstableloader (CASSANDRA-8704)
   * Purge internal prepared statements if related tables or
 keyspaces are dropped (CASSANDRA-8693)
   * (cqlsh) Handle unicode BOM at start of files (CASSANDRA-8638)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/caa03595/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-29 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 25b18b75839e148638c716a0311b56347b7aa9b2
Parents: 48a7e64 3ad0d3a
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Jan 29 10:26:23 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Jan 29 10:26:23 2015 +0100

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionManager.java| 46 +++-
 .../cassandra/tools/StandaloneScrubber.java |  4 +-
 .../cassandra/tools/StandaloneSplitter.java |  4 +-
 .../cassandra/tools/StandaloneUpgrader.java |  4 +-
 5 files changed, 55 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25b18b75/CHANGES.txt
--
diff --cc CHANGES.txt
index ab4621d,fce4898..157550a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,5 +1,62 @@@
 +3.0
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Stop compactions before exiting offline tools (CASSANDRA-8623)
   * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933)
   * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695)
   * Safer Resource Management (CASSANDRA-7705)

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-29 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 6145d50f5da993e29fd75b6ce32ab601c10a3e10
Parents: d76450c 05bbefd
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Jan 29 15:45:11 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Jan 29 15:45:11 2015 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6145d50f/CHANGES.txt
--
diff --cc CHANGES.txt
index 62c18f5,e3e19cf..0cd0b4d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,6 +1,63 @@@
 +3.0
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Purge internal prepared statements if related tables or
+keyspaces are dropped (CASSANDRA-8693)
   * (cqlsh) Handle unicode BOM at start of files (CASSANDRA-8638)
   * Stop compactions before exiting offline tools (CASSANDRA-8623)
   * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6145d50f/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-29 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: d76450c7986202141f3a917b3623a4c3138c1094
Parents: 6d2f276 c49f666
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Jan 29 14:39:07 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Jan 29 14:39:07 2015 -0600

--
 CHANGES.txt|  1 +
 bin/cqlsh  | 10 +++---
 pylib/cqlshlib/util.py | 29 +
 3 files changed, 37 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d76450c7/CHANGES.txt
--
diff --cc CHANGES.txt
index 157550a,a8f8b87..62c18f5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,5 +1,62 @@@
 +3.0
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * (cqlsh) Handle unicode BOM at start of files (CASSANDRA-8638)
   * Stop compactions before exiting offline tools (CASSANDRA-8623)
   * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933)
   * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695)

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

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-28 Thread marcuse

Merge branch 'cassandra-2.1' into trunk

Conflicts:
CHANGES.txt

src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java


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

Branch: refs/heads/trunk
Commit: b4b1bdd3250ea8f35739df4fcdcc92bf5351a3d6
Parents: 2b028b2 9efa017
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Jan 28 14:02:32 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Jan 28 14:02:32 2015 +0100

--
 CHANGES.txt |  2 +
 .../SizeTieredCompactionStrategy.java   | 77 +++-
 .../cassandra/io/sstable/ColumnNameHelper.java  | 22 ++
 .../io/sstable/format/SSTableReader.java| 49 +
 .../SizeTieredCompactionStrategyTest.java   | 12 +--
 .../cassandra/db/filter/ColumnSliceTest.java| 14 
 6 files changed, 167 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4b1bdd3/CHANGES.txt
--
diff --cc CHANGES.txt
index 5c6bb81,ff6a26f..432ebcc8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,9 +1,64 @@@
 +3.0
 + * rpc_interface and listen_interface generate NPE on startup when specified 
interface doesn't exist (CASSANDRA-8677)
 + * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms 
(CASSANDRA-8514)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-28 Thread aleksey

Merge branch 'cassandra-2.1' into trunk

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/ColumnDefinition.java


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

Branch: refs/heads/trunk
Commit: bbb1592e84d2949de20b8e1699ee12f027815a88
Parents: 9c4a776 b788bb3
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Jan 28 18:46:05 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Jan 28 18:46:05 2015 +0300

--
 CHANGES.txt| 7 +--
 src/java/org/apache/cassandra/thrift/ThriftConversion.java | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbb1592e/CHANGES.txt
--
diff --cc CHANGES.txt
index 53a2c63,b976a16..36b081b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,5 +1,61 @@@
 +3.0
-  * rpc_interface and listen_interface generate NPE on startup when specified 
interface doesn't exist (CASSANDRA-8677)
-  * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms 
(CASSANDRA-8514)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695)
   * Safer Resource Management (CASSANDRA-7705)
   * Make sure we compact highly overlapping cold sstables with
 STCS (CASSANDRA-8635)

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-23 Thread dbrosius

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 7b533d0677fcbd93b45ae442e60ab9a302f57d3d
Parents: feda54f 1bb0c14
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri Jan 23 21:04:59 2015 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri Jan 23 21:04:59 2015 -0500

--
 src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b533d06/src/java/org/apache/cassandra/tools/NodeTool.java
--
diff --cc src/java/org/apache/cassandra/tools/NodeTool.java
index b67dff9,674b346..18feac7
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@@ -1024,68 -1014,23 +1024,68 @@@ public class NodeToo
  String keyspace = args.get(0);
  String cfname = args.get(1);
  
 -ColumnFamilyStoreMBean store = probe.getCfsProxy(keyspace, 
cfname);
 +// calculate percentile of row size and column count
 +long[] estimatedRowSize = (long[]) 
probe.getColumnFamilyMetric(keyspace, cfname, EstimatedRowSizeHistogram);
 +long[] estimatedColumnCount = (long[]) 
probe.getColumnFamilyMetric(keyspace, cfname, EstimatedColumnCountHistogram);
  
 -long[] estimatedRowSizeHistogram = 
store.getEstimatedRowSizeHistogram();
 -long[] estimatedColumnCountHistogram = 
store.getEstimatedColumnCountHistogram();
 +// build arrays to store percentile values
 +double[] estimatedRowSizePercentiles = new double[7];
 +double[] estimatedColumnCountPercentiles = new double[7];
 +double[] offsetPercentiles = new double[]{0.5, 0.75, 0.95, 0.98, 
0.99};
  
- if (isEmpty(estimatedRowSize) || isEmpty(estimatedColumnCount))
 -if (ArrayUtils.isEmpty(estimatedRowSizeHistogram) || 
ArrayUtils.isEmpty(estimatedColumnCountHistogram))
++if (ArrayUtils.isEmpty(estimatedRowSize) || 
ArrayUtils.isEmpty(estimatedColumnCount))
  {
  System.err.println(No SSTables exists, unable to calculate 
'Partition Size' and 'Cell Count' percentiles);
 +
 +for (int i = 0; i  7; i++)
 +{
 +estimatedRowSizePercentiles[i] = Double.NaN;
 +estimatedColumnCountPercentiles[i] = Double.NaN;
 +}
 +}
 +else
 +{
 +long[] rowSizeBucketOffsets = new 
EstimatedHistogram(estimatedRowSize.length).getBucketOffsets();
 +long[] columnCountBucketOffsets = new 
EstimatedHistogram(estimatedColumnCount.length).getBucketOffsets();
 +EstimatedHistogram rowSizeHist = new 
EstimatedHistogram(rowSizeBucketOffsets, estimatedRowSize);
 +EstimatedHistogram columnCountHist = new 
EstimatedHistogram(columnCountBucketOffsets, estimatedColumnCount);
 +
 +if (rowSizeHist.isOverflowed())
 +{
 +System.err.println(String.format(Row sizes are larger 
than %s, unable to calculate percentiles, 
rowSizeBucketOffsets[rowSizeBucketOffsets.length - 1]));
 +for (int i = 0; i  offsetPercentiles.length; i++)
 +estimatedRowSizePercentiles[i] = Double.NaN;
 +}
 +else
 +{
 +for (int i = 0; i  offsetPercentiles.length; i++)
 +estimatedRowSizePercentiles[i] = 
rowSizeHist.percentile(offsetPercentiles[i]);
 +}
 +
 +if (columnCountHist.isOverflowed())
 +{
 +System.err.println(String.format(Column counts are 
larger than %s, unable to calculate percentiles, 
columnCountBucketOffsets[columnCountBucketOffsets.length - 1]));
 +for (int i = 0; i  
estimatedColumnCountPercentiles.length; i++)
 +estimatedColumnCountPercentiles[i] = Double.NaN;
 +}
 +else
 +{
 +for (int i = 0; i  offsetPercentiles.length; i++)
 +estimatedColumnCountPercentiles[i] = 
columnCountHist.percentile(offsetPercentiles[i]);
 +}
 +
 +// min value
 +estimatedRowSizePercentiles[5] = rowSizeHist.min();
 +estimatedColumnCountPercentiles[5] =

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-22 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 10b8a765bedc2ae57cd72050f99f89d81068f7f4
Parents: 9fcb409 6bedeff
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Jan 22 15:51:25 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Jan 22 15:51:25 2015 +0100

--
 CHANGES.txt  |  2 ++
 .../db/compaction/WrappingCompactionStrategy.java| 11 +++
 2 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/10b8a765/CHANGES.txt
--
diff --cc CHANGES.txt
index b62282a,ad9cb94..cdcb5cc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,9 +1,64 @@@
 +3.0
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Make sure we don't add tmplink files to the compaction
+strategy (CASSANDRA-8580)
   * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
   * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
 - * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
   * Add tooling to detect hot partitions (CASSANDRA-7974)
   * Fix cassandra-stress user-mode truncation of partition generation 
(CASSANDRA-8608)
   * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267)

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-22 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 8f51b8aafb8c56e4c93691a940a63785fc0ab445
Parents: 10b8a76 136abcc
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Jan 22 18:35:17 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Jan 22 18:35:17 2015 +0300

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-21 Thread benedict

Merge branch 'cassandra-2.1' into trunk

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 184bb65fcafb8603840fbbbda59665dcda275da3
Parents: 37f1278 1435b9a
Author: Benedict Elliott Smith bened...@apache.org
Authored: Wed Jan 21 16:52:20 2015 +
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Wed Jan 21 16:52:20 2015 +

--
 CHANGES.txt |   2 +
 .../org/apache/cassandra/stress/Operation.java  |   4 +-
 .../stress/generate/PartitionIterator.java  | 219 ++-
 3 files changed, 123 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/184bb65f/CHANGES.txt
--
diff --cc CHANGES.txt
index 6d60699,0c2bab8..66b17ce
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,58 -1,6 +1,60 @@@
 +3.0
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Fix cassandra-stress user-mode truncation of partition generation 
(CASSANDRA-8608)
+  * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267)
   * Don't allow starting multiple inc repairs on the same sstables 
(CASSANDRA-8316)
   * Invalidate prepared BATCH statements when related tables
 or keyspaces are dropped (CASSANDRA-8652)

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-21 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 5d3c2c985287ad2f2f899a84ccdcb2d3ce963854
Parents: 0c3720a 8092d2c
Author: Tyler Hobbs tylerho...@apache.org
Authored: Wed Jan 21 18:37:21 2015 -0600
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Wed Jan 21 18:37:21 2015 -0600

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

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-21 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 0c3720ab8003947f1fcb6b2b51feac1d7d134af1
Parents: 2b4cd10 7dc94ab
Author: Tyler Hobbs tylerho...@apache.org
Authored: Wed Jan 21 18:31:40 2015 -0600
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Wed Jan 21 18:31:40 2015 -0600

--
 CHANGES.txt   |   2 ++
 lib/cassandra-driver-internal-only-2.1.3.post.zip | Bin 0 - 138474 bytes
 lib/cassandra-driver-internal-only-2.1.3.zip  | Bin 132360 - 0 bytes
 3 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c3720ab/CHANGES.txt
--
diff --cc CHANGES.txt
index 2642c23,54f734c..b62282a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,60 -1,7 +1,62 @@@
 +3.0
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN 
restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
+  * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
 - * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
   * Add tooling to detect hot partitions (CASSANDRA-7974)
   * Fix cassandra-stress user-mode truncation of partition generation 
(CASSANDRA-8608)
   * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267)

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-21 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 37f1278970dc24f8ebc9777d04510e21ecc54608
Parents: 6d65d26 576a75f
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Jan 21 12:53:25 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Jan 21 12:53:25 2015 +0100

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-21 Thread marcuse

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
src/java/org/apache/cassandra/service/ActiveRepairService.java


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

Branch: refs/heads/trunk
Commit: 6d65d264eed638e86d19c102a2095e3e42f9deb4
Parents: b66a547 6d9d175
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Jan 21 10:24:02 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Jan 21 10:24:02 2015 +0100

--
 CHANGES.txt |   1 +
 .../db/compaction/CompactionManager.java|  42 -
 .../repair/RepairMessageVerbHandler.java| 157 ++-
 .../cassandra/service/ActiveRepairService.java  |  42 +++--
 .../cassandra/streaming/StreamSession.java  |   1 -
 5 files changed, 151 insertions(+), 92 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d65d264/CHANGES.txt
--
diff --cc CHANGES.txt
index b601bb9,ea2ecc0..6d60699
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,58 -1,5 +1,59 @@@
 +3.0
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Don't allow starting multiple inc repairs on the same sstables 
(CASSANDRA-8316)
   * Invalidate prepared BATCH statements when related tables
 or keyspaces are dropped (CASSANDRA-8652)
   * Fix missing results in secondary index queries on collections

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-20 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 6f51e35f583ed957fd8b85b269ed8e2532ea3854
Parents: a7a1921 5a84976
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Jan 20 18:39:00 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Jan 20 18:39:00 2015 +0300

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-20 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: a792a7bae437decb2b2772153413f4a8e6c86e59
Parents: 6f51e35 2445d4d
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Jan 20 11:40:59 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Jan 20 11:40:59 2015 -0600

--
 CHANGES.txt   |  3 +++
 .../db/index/composites/CompositesSearcher.java   |  1 +
 .../cassandra/cql3/ContainsRelationTest.java  | 18 ++
 3 files changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a792a7ba/CHANGES.txt
--
diff --cc CHANGES.txt
index 32a8846,1b14c62..5e09785
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,58 -1,7 +1,61 @@@
 +3.0
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Fix missing results in secondary index queries on collections
+with ALLOW FILTERING (CASSANDRA-8421)
+  * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627)
   * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618)
   * Fix NPE when passing wrong argument in ALTER TABLE statement 
(CASSANDRA-8355)
   * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a792a7ba/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-20 Thread aleksey

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/service/AbstractReadExecutor.java


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

Branch: refs/heads/trunk
Commit: 9c6cf3cdf4267b4aebb0f432d0776314f3c40c8c
Parents: a792a7b e2d140f
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Jan 21 00:59:40 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Jan 21 00:59:40 2015 +0300

--
 .../org/apache/cassandra/db/ReadCommand.java|  3 +-
 .../db/RetriedSliceFromReadCommand.java |  4 +-
 .../cassandra/db/SliceByNamesReadCommand.java   |  8 +--
 .../cassandra/db/SliceFromReadCommand.java  |  8 +--
 .../cassandra/service/AbstractReadExecutor.java | 56 +---
 5 files changed, 31 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c6cf3cd/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
--
diff --cc src/java/org/apache/cassandra/service/AbstractReadExecutor.java
index d76a2cc,0546e27..ec96d81
--- a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
+++ b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
@@@ -107,14 -94,21 +95,21 @@@ public abstract class AbstractReadExecu
  {
  if (isLocalRequest(endpoint))
  {
- logger.trace(reading digest locally);
- StageManager.getStage(Stage.READ).execute(new 
LocalReadRunnable(digestCommand, handler));
- }
- else
- {
- logger.trace(reading digest from {}, endpoint);
- MessagingService.instance().sendRRWithFailure(message, 
endpoint, handler);
+ hasLocalEndpoint = true;
+ continue;
  }
+ 
+ logger.trace(reading {} from {}, readCommand.isDigestQuery() ? 
digest : data, endpoint);
+ if (message == null)
+ message = readCommand.createMessage();
 -MessagingService.instance().sendRR(message, endpoint, handler);
++MessagingService.instance().sendRRWithFailure(message, endpoint, 
handler);
+ }
+ 
+ // We delay the local (potentially blocking) read till the end to 
avoid stalling remote requests.
+ if (hasLocalEndpoint)
+ {
+ logger.trace(reading {} locally, readCommand.isDigestQuery() ? 
digest : data);
+ StageManager.getStage(Stage.READ).maybeExecuteImmediately(new 
LocalReadRunnable(command, handler));
  }
  }

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-20 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: b66a547abb31e7385e85d3241e2b0dc278403716
Parents: 9c6cf3c caa4f3d
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Jan 20 17:49:04 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Jan 20 17:49:04 2015 -0600

--
 CHANGES.txt   |  2 ++
 .../org/apache/cassandra/cql3/QueryProcessor.java | 10 ++
 .../cassandra/cql3/PreparedStatementsTest.java| 18 +-
 3 files changed, 25 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b66a547a/CHANGES.txt
--
diff --cc CHANGES.txt
index 5e09785,296aa66..b601bb9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,58 -1,6 +1,60 @@@
 +3.0
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Invalidate prepared BATCH statements when related tables
+or keyspaces are dropped (CASSANDRA-8652)
   * Fix missing results in secondary index queries on collections
 with ALLOW FILTERING (CASSANDRA-8421)
   * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627)

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

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-15 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: a6ae07f1687dea674523ed901c271fb926acb51b
Parents: 0c0891a a3234e1
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Jan 15 11:57:35 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Jan 15 11:57:35 2015 -0600

--
 pylib/cqlshlib/test/test_cqlsh_output.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-15 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 076b5bdd10e14f4da5cc46863d69410900042b06
Parents: e245ba7 d406bab
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Jan 15 17:51:44 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Jan 15 17:51:44 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/076b5bdd/CHANGES.txt
--
diff --cc CHANGES.txt
index 30a741e,94a2dbd..37630e6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,55 -1,5 +1,56 @@@
 +3.0
 + * Add role based access control (CASSANDRA-7653)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618)
   * Fix NPE when passing wrong argument in ALTER TABLE statement 
(CASSANDRA-8355)
   * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
   * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/076b5bdd/bin/cqlsh
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-14 Thread aleksey

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 270a05d63fb4fb6425b3f01abbdd63243dd955e8
Parents: 7a47528 25d4a13
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Jan 14 19:20:32 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Jan 14 19:20:32 2015 +0300

--
 CHANGES.txt  |  1 +
 src/java/org/apache/cassandra/cql3/Cql.g | 15 +--
 .../org/apache/cassandra/cql3/AlterTableTest.java| 11 +--
 3 files changed, 19 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/270a05d6/CHANGES.txt
--
diff --cc CHANGES.txt
index 937515e,8f312a7..714863f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,54 -1,5 +1,55 @@@
 +3.0
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Fix NPE when passing wrong argument in ALTER TABLE statement 
(CASSANDRA-8355)
   * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
   * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)
   * Fix case-sensitivity of index name on CREATE and DROP INDEX

http://git-wip-us.apache.org/repos/asf/cassandra/blob/270a05d6/src/java/org/apache/cassandra/cql3/Cql.g
--
diff --cc src/java/org/apache/cassandra/cql3/Cql.g
index d8496b1,9067fc4..d73dc28
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@@ -1038,23 -936,20 +1038,26 @@@ intValue returns [Term.Raw value
  | QMARK { $value = newBindVariables(null); }
  ;
  
 -functionName returns [String s]
 -: f=IDENT   { $s = $f.text; }
 +functionName returns [FunctionName s]
 +: (ks=keyspaceName '.')?

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-14 Thread jmckenzie

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: c65a9f5c63f5e1a1a495cbe82b3d11bb3c848c20
Parents: 2fc9f32 2ff9137
Author: Joshua McKenzie jmcken...@apache.org
Authored: Wed Jan 14 11:46:42 2015 -0600
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Wed Jan 14 11:46:42 2015 -0600

--
 .../org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java| 2 --
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java   | 2 --
 src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java   | 4 +---
 src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java   | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c65a9f5c/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c65a9f5c/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-14 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 30a5597ca2eb5b13330cb5843a9ee036beac63de
Parents: 270a05d 064144b
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Jan 14 18:08:51 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Jan 14 18:08:51 2015 +0100

--
 test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/30a5597c/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-12 Thread brandonwilliams

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 3b945483bdb486487201923258421e3baa4a8b2a
Parents: 7bd6d56 f6d0f43
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Jan 12 11:57:36 2015 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Jan 12 11:57:36 2015 -0600

--
 examples/hadoop_cql3_word_count/src/WordCount.java | 3 +--
 examples/hadoop_cql3_word_count/src/WordCountCounters.java | 3 +--
 src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b945483/examples/hadoop_cql3_word_count/src/WordCount.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b945483/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-09 Thread dbrosius

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: c04c50c95baaf3be6c7069b3aa617a0a066cd792
Parents: fa0cc90 5364083
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri Jan 9 20:03:06 2015 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri Jan 9 20:03:06 2015 -0500

--
 .../org/apache/cassandra/cql3/statements/DropTypeStatement.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-08 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: d1a552dd7882f9ddb88e0e58d1af46791093
Parents: a289e71 14b2d7a
Author: Marcus Eriksson marc...@apache.org
Authored: Fri Jan 9 07:34:30 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Fri Jan 9 07:34:30 2015 +0100

--
 CHANGES.txt   | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1a552dd/CHANGES.txt
--
diff --cc CHANGES.txt
index 8686d6c,2028633..6d364cc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,5 +1,51 @@@
 +3.0
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)
   * Fix case-sensitivity of index name on CREATE and DROP INDEX
 statements (CASSANDRA-8365)
   * Better detection/logging for corruption in compressed sstables 
(CASSANDRA-8192)

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

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-07 Thread marcuse

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 49dea419319177d06652a5253e7bb3f8c65a89a0
Parents: 729ebe0 2afe0e8
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Jan 7 14:12:15 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Jan 7 14:12:15 2015 +0100

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/io/sstable/format/big/BigTableWriter.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/49dea419/CHANGES.txt
--
diff --cc CHANGES.txt
index 0fe2285,1f93bf5..9086774
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,5 +1,49 @@@
 +3.0
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 
7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * Use the correct repairedAt value when closing writer (CASSANDRA-8570)
   * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512)
   * Properly calculate expected write size during compaction (CASSANDRA-8532)
   * Invalidate affected prepared statements when a table's columns

http://git-wip-us.apache.org/repos/asf/cassandra/blob/49dea419/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
--
diff --cc 
src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
index 2d34209,000..868ee9f
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
@@@ -1,591 -1,0 +1,591 @@@
 +/*
 + * 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

[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-01-07 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java


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

Branch: refs/heads/trunk
Commit: 66348bbe5914581d53e0e76f7c64237d5a625615
Parents: 2b7522f 6afab52
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Jan 7 17:13:03 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Jan 7 17:13:03 2015 -0600

--

--

1 2 >

1 - 100 of 149 matches

Mail list logo