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

2014-11-05 Thread mishail 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
pylib/cqlshlib/cql3handling.py


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

Branch: refs/heads/trunk
Commit: 8856934fc8d062730f4b9c0a6adf1023bc331697
Parents: 19c2d22 8515029
Author: Mikhail Stepura mish...@apache.org
Authored: Wed Nov 5 15:37:43 2014 -0800
Committer: Mikhail Stepura mish...@apache.org
Committed: Wed Nov 5 15:37:43 2014 -0800

--
 CHANGES.txt | 1 +
 pylib/cqlshlib/cql3handling.py  | 3 ++-
 pylib/cqlshlib/test/test_cql_parsing.py | 9 -
 3 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8856934f/CHANGES.txt
--
diff --cc CHANGES.txt
index 736c659,ee18be0..f0ee602
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,5 +1,38 @@@
 +3.0
 + * 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 pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 
7781, 7929,
 +   7924, 7812, 8063)
 + * 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.1.2
+  * (cqlsh) Fix SELECT ... TOKEN() function broken in C* 2.1.1 (CASSANDRA-8258)
   * Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209)
   * Optimize partitioner tokens (CASSANDRA-8230)
   * Improve compaction of repaired/unrepaired sstables (CASSANDRA-8004)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8856934f/pylib/cqlshlib/cql3handling.py
--
diff --cc pylib/cqlshlib/cql3handling.py
index 6d333a4,b1179ca..b2999a7
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -209,7 -206,7 +209,8 @@@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n
  mapLiteral ::= { term : term ( , term : term )* }
 ;
  
- functionName ::= identifier ( : : identifier )?
 -functionName ::= identifier | TOKEN
++functionName ::= identifier ( : : identifier )? 
++ | TOKEN
   ;
  
  statementBody ::= useStatement

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

2014-11-04 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/db/index/SecondaryIndex.java


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

Branch: refs/heads/trunk
Commit: 07068e204df0f6b49eaef3034d4782f10a9d6fe1
Parents: 525ac00 2d4a305
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Nov 4 12:03:35 2014 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Nov 4 12:03:35 2014 -0600

--
 CHANGES.txt | 1 +
 .../db/index/AbstractSimplePerColumnSecondaryIndex.java | 5 +
 .../apache/cassandra/db/index/PerColumnSecondaryIndex.java  | 7 ++-
 src/java/org/apache/cassandra/db/index/SecondaryIndex.java  | 7 +++
 .../apache/cassandra/db/index/SecondaryIndexManager.java| 4 ++--
 .../db/index/composites/CompositesIndexOnClusteringKey.java | 9 +
 .../db/index/composites/CompositesIndexOnPartitionKey.java  | 9 +
 test/unit/org/apache/cassandra/db/RangeTombstoneTest.java   | 3 +++
 .../org/apache/cassandra/db/SecondaryIndexCellSizeTest.java | 3 +++
 9 files changed, 45 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/07068e20/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
--
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndex.java
index b52b6a2,044912f..2717e08
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
@@@ -26,7 -26,7 +26,8 @@@ import java.util.concurrent.ConcurrentH
  import java.util.concurrent.Future;
  import java.util.concurrent.FutureTask;
  
 +import org.apache.cassandra.io.sstable.format.SSTableReader;
+ import com.google.common.base.Objects;
  import org.apache.commons.lang3.StringUtils;
  
  import org.slf4j.Logger;

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/07068e20/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
--

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

2014-11-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/db/compaction/Upgrader.java
src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java


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

Branch: refs/heads/trunk
Commit: 0f59629ce280ba2a74d65a7719dde7cf79923f05
Parents: e60a06c 5160c91
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Nov 3 17:02:10 2014 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Nov 3 17:02:10 2014 +0100

--
 CHANGES.txt |   2 +
 .../org/apache/cassandra/db/DataTracker.java| 109 ++--
 .../db/compaction/CompactionManager.java|  29 +-
 .../cassandra/db/compaction/CompactionTask.java |   7 +-
 .../cassandra/db/compaction/Scrubber.java   |  12 +-
 .../cassandra/db/compaction/Upgrader.java   |  31 +-
 .../io/sstable/IndexSummaryManager.java |   2 +-
 .../cassandra/io/sstable/SSTableRewriter.java   | 160 +++---
 .../io/sstable/format/SSTableReader.java|   6 +
 .../db/compaction/AntiCompactionTest.java   |  42 +-
 .../io/sstable/IndexSummaryManagerTest.java |   2 +-
 .../cassandra/io/sstable/SSTableReaderTest.java |   2 +-
 .../io/sstable/SSTableRewriterTest.java | 504 +++
 13 files changed, 755 insertions(+), 153 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f59629c/CHANGES.txt
--
diff --cc CHANGES.txt
index 3a8ada2,32083cc..9754110
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,6 +1,39 @@@
 +3.0
 + * 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 pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 
7781, 7929,
 +   7924, 7812, 8063)
 + * 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.1.2
+  * Refactor how we track live size (CASSANDRA-7852)
+  * Make sure unfinished compaction files are removed (CASSANDRA-8124)
   * Fix shutdown when run as Windows service (CASSANDRA-8136)
   * Fix DESCRIBE TABLE with custom indexes (CASSANDRA-8031)
   * Fix race in RecoveryManagerTest (CASSANDRA-8176)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f59629c/src/java/org/apache/cassandra/db/DataTracker.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f59629c/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 3ee36cd,84c3cb5..cccb7f9
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -1045,76 -987,63 +1046,78 @@@ public class CompactionManager implemen
  if (!new

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

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

Branch: refs/heads/trunk
Commit: 3042aca0b750d0cb79e2639639d26f1b58d73ee1
Parents: 60c0cad 1467118
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Oct 23 12:00:03 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Oct 23 12:00:03 2014 -0500

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


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

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

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

Branch: refs/heads/trunk
Commit: e93bcdf45610230a357c3895d4eb6f723d32119f
Parents: d375de2 814e55a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Oct 2 10:11:50 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Oct 2 10:11:50 2014 +0200

--
 CHANGES.txt |   1 +
 src/java/org/apache/cassandra/cql3/Lists.java   |   4 +-
 .../cassandra/serializers/ListSerializer.java   |   7 +
 .../cassandra/serializers/MapSerializer.java|   4 +
 .../cassandra/serializers/SetSerializer.java|   4 +
 .../org/apache/cassandra/cql3/CQLTester.java|   2 +-
 .../apache/cassandra/cql3/CollectionsTest.java  | 255 +--
 7 files changed, 142 insertions(+), 135 deletions(-)
--


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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e93bcdf4/test/unit/org/apache/cassandra/cql3/CQLTester.java
--

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

2014-09-15 Thread benedict 
Merge branch 'cassandra-2.1' into trunk

Conflicts:

src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
src/java/org/apache/cassandra/service/QueryState.java


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

Branch: refs/heads/trunk
Commit: 35af28e550cd80be7df36283fe283454977a2a37
Parents: e225176 1d7691e
Author: Benedict Elliott Smith bened...@apache.org
Authored: Mon Sep 15 15:03:29 2014 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Mon Sep 15 15:03:29 2014 +0100

--
 CHANGES.txt   |  5 +++--
 src/java/org/apache/cassandra/config/CFMetaData.java  |  3 ++-
 src/java/org/apache/cassandra/db/BatchlogManager.java |  2 +-
 .../org/apache/cassandra/dht/Murmur3Partitioner.java  |  3 ++-
 .../io/compress/CompressedRandomAccessReader.java |  3 ++-
 src/java/org/apache/cassandra/service/QueryState.java |  3 ++-
 .../org/apache/cassandra/service/StorageProxy.java|  8 
 .../streaming/compress/CompressedInputStream.java |  3 ++-
 src/java/org/apache/cassandra/utils/FBUtilities.java  | 14 --
 9 files changed, 18 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/35af28e5/CHANGES.txt
--
diff --cc CHANGES.txt
index bf3567f,4c0dbf9..b6e9165
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,8 +1,30 @@@
 +3.0
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Support Java source code for user-defined functions (CASSANDRA-7562)
 + * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Verify that UDF class methods are static (CASSANDRA-7781)
 + * Support pure user-defined functions (CASSANDRA-7395, 7740)
 + * 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)
 +
 +
  2.1.1
+  * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom 
(CASSANDRA-7934)
   * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
-  * cassandra-stress supports whitelist mode for node config
-  * GCInspector more closely tracks GC; cassandra-stress and nodetool report it
+  * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
+  * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
   * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
   * Add human readable option to nodetool commands (CASSANDRA-5433)
   * Don't try to set repairedAt on old sstables (CASSANDRA-7913)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/35af28e5/src/java/org/apache/cassandra/config/CFMetaData.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/35af28e5/src/java/org/apache/cassandra/db/BatchlogManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/35af28e5/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
--
diff --cc 
src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
index d71964c,4521c19..dca5ade
--- 
a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
+++ 
b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
@@@ -90,69 -85,65 +91,69 @@@ public class CompressedRandomAccessRead
  {
  try
  {
 -decompressChunk(metadata.chunkFor(current));
 -}
 -catch (CorruptBlockException e)
 -{
 -throw new CorruptSSTableException(e, getPath());
 -}
 -catch (IOException e)
 -{
 -throw new FSReadError(e, getPath());
 -}
 -}
 +long

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

2014-09-05 Thread jasobrown 
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/916efcb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/916efcb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/916efcb6

Branch: refs/heads/trunk
Commit: 916efcb6fb4d0b1c788c74e97053701155d0ed1d
Parents: 0229323 7d21569
Author: Jason Brown jasobr...@apple.com
Authored: Fri Sep 5 16:48:17 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri Sep 5 16:48:17 2014 -0700

--
 build.xml   |   4 ++--
 lib/thrift-server-0.3.6.jar | Bin 39588 - 0 bytes
 lib/thrift-server-0.3.7.jar | Bin 0 - 39988 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/916efcb6/build.xml
--
diff --cc build.xml
index 00d1c86,5f2b568..8016a8b
--- a/build.xml
+++ b/build.xml
@@@ -493,10 -495,9 +493,10 @@@
  dependency groupId=org.mindrot artifactId=jbcrypt/
  dependency groupId=com.yammer.metrics artifactId=metrics-core/
  dependency groupId=com.addthis.metrics 
artifactId=reporter-config/
- dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.6/
+ dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.7/
  dependency groupId=com.clearspring.analytics artifactId=stream 
version=2.5.2 /
  dependency groupId=net.sf.supercsv artifactId=super-csv 
version=2.1.0 /
 +dependency groupId=org.javassist artifactId=javassist/
  
  dependency groupId=ch.qos.logback artifactId=logback-core/
  dependency groupId=ch.qos.logback artifactId=logback-classic/

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

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

Branch: refs/heads/trunk
Commit: 83bf0d5d591aaabebda0c86ccad88afe1db5e5f6
Parents: 936dea8 2001c25
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Sep 3 13:05:36 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Sep 3 13:05:36 2014 -0500

--
 CHANGES.txt| 3 ++-
 .../org/apache/cassandra/cql3/statements/SelectStatement.java  | 6 ++
 .../org/apache/cassandra/cql3/MultiColumnRelationTest.java | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)
--


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

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

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

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

Branch: refs/heads/trunk
Commit: eeb150e9e318460e906ffc1a1d0b485cd00100f8
Parents: 1bc8ffd 4018232
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Sep 1 15:49:43 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Sep 1 15:49:43 2014 +0200

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/db/DataTracker.java   | 12 
 .../apache/cassandra/db/compaction/LeveledManifest.java |  5 -
 .../org/apache/cassandra/io/sstable/SSTableReader.java  |  5 +
 4 files changed, 22 insertions(+), 1 deletion(-)
--


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

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

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

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

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

Branch: refs/heads/trunk
Commit: f18108d812bb90d03a4bff5172cd0a428b7cae80
Parents: 14dbba9 5abd129
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Aug 27 13:09:18 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Aug 27 13:09:18 2014 +0200

--
 CHANGES.txt |  2 ++
 .../org/apache/cassandra/db/ColumnIndex.java|  2 +-
 .../org/apache/cassandra/db/RangeTombstone.java |  8 +-
 .../db/compaction/LazilyCompactedRow.java   |  3 ++-
 .../apache/cassandra/db/RangeTombstoneTest.java | 26 
 5 files changed, 38 insertions(+), 3 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f18108d8/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
--

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

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

Branch: refs/heads/trunk
Commit: 3aa721577986e44950533cf1024bab17251b0ae4
Parents: 3ca9576 c489a4e
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Aug 23 18:28:39 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Aug 23 18:28:39 2014 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3aa72157/src/java/org/apache/cassandra/config/CFMetaData.java
--

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

2014-08-22 Thread slebresne 
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/bc630832
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc630832
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc630832

Branch: refs/heads/trunk
Commit: bc6308321729ac613b3db912782ff257b43c568e
Parents: aad152d 94f1107
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Aug 22 16:17:01 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Aug 22 16:17:01 2014 +0200

--
 build.xml |   2 +-
 tools/lib/cassandra-driver-core-2.0.4.jar | Bin 544025 - 0 bytes
 tools/lib/cassandra-driver-core-2.0.5.jar | Bin 0 - 544552 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)
--


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

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

2014-08-21 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk

Conflicts:

src/java/org/apache/cassandra/cql3/statements/SchemaAlteringStatement.java


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

Branch: refs/heads/trunk
Commit: e60d9f43d9e8ea06ddbc0c532cc89ea1348992f5
Parents: df9cac0 edbd7d3
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Aug 21 14:29:28 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Aug 21 14:29:28 2014 -0500

--
 CHANGES.txt |  2 ++
 .../cql3/statements/AlterKeyspaceStatement.java |  3 ++-
 .../cql3/statements/AlterTableStatement.java|  3 ++-
 .../cql3/statements/AlterTypeStatement.java |  3 ++-
 .../statements/CreateFunctionStatement.java |  3 ++-
 .../cql3/statements/CreateIndexStatement.java   |  5 +++--
 .../statements/CreateKeyspaceStatement.java |  8 +---
 .../cql3/statements/CreateTableStatement.java   | 10 ++
 .../cql3/statements/CreateTriggerStatement.java |  3 ++-
 .../cql3/statements/CreateTypeStatement.java|  5 +++--
 .../cql3/statements/DropFunctionStatement.java  |  8 +---
 .../cql3/statements/DropIndexStatement.java |  5 +++--
 .../cql3/statements/DropKeyspaceStatement.java  |  8 +---
 .../cql3/statements/DropTableStatement.java |  8 +---
 .../cql3/statements/DropTriggerStatement.java   |  3 ++-
 .../cql3/statements/DropTypeStatement.java  |  9 ++---
 .../statements/SchemaAlteringStatement.java | 20 +---
 17 files changed, 72 insertions(+), 34 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e60d9f43/src/java/org/apache/cassandra/cql3/statements/CreateFunctionStatement.java
--
diff --cc 
src/java/org/apache/cassandra/cql3/statements/CreateFunctionStatement.java
index 094c318,000..47bacd2
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateFunctionStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateFunctionStatement.java
@@@ -1,180 -1,0 +1,181 @@@
 +/*
 + * 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.cql3.statements;
 +
 +import java.util.ArrayList;
 +import java.util.List;
 +
 +import org.apache.cassandra.auth.Permission;
 +import org.apache.cassandra.config.Schema;
 +import org.apache.cassandra.config.UFMetaData;
 +import org.apache.cassandra.cql3.CQL3Type;
 +import org.apache.cassandra.cql3.ColumnIdentifier;
 +import org.apache.cassandra.cql3.QueryOptions;
 +import org.apache.cassandra.cql3.functions.Functions;
 +import org.apache.cassandra.cql3.udf.UDFRegistry;
 +import org.apache.cassandra.exceptions.InvalidRequestException;
 +import org.apache.cassandra.exceptions.RequestValidationException;
 +import org.apache.cassandra.exceptions.UnauthorizedException;
 +import org.apache.cassandra.service.ClientState;
 +import org.apache.cassandra.service.MigrationManager;
 +import org.apache.cassandra.service.QueryState;
 +import org.apache.cassandra.transport.Event;
 +import org.apache.cassandra.transport.messages.ResultMessage;
 +
 +/**
 + * A codeCREATE FUNCTION/code statement parsed from a CQL query.
 + */
 +public final class CreateFunctionStatement extends SchemaAlteringStatement
 +{
 +final boolean orReplace;
 +final boolean ifNotExists;
 +final String namespace;
 +final String functionName;
 +final String qualifiedName;
 +final String language;
 +final String body;
 +

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

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

Branch: refs/heads/trunk
Commit: 314afb8dfaa95bcfc5d3861ca0fe987b78402278
Parents: 753ccff 6e05125
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Aug 20 20:44:12 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Aug 20 20:44:12 2014 +0300

--
 CHANGES.txt |   1 +
 .../cassandra/hadoop/cql3/CqlConfigHelper.java  |  89 +
 .../cassandra/hadoop/cql3/CqlRecordReader.java  |  19 +-
 ...mitedLocalNodeFirstLocalBalancingPolicy.java | 185 +++
 4 files changed, 198 insertions(+), 96 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/314afb8d/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--

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

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

Branch: refs/heads/trunk
Commit: 7192f17e3c67f0bb865e62001ed9a2957dc88ddf
Parents: 1ed1af5 92325cc
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Aug 19 11:21:11 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Aug 19 11:21:11 2014 -0500

--
 CHANGES.txt |  2 +
 pylib/cqlshlib/cql3handling.py  | 10 ++--
 .../cql3/statements/SelectStatement.java|  7 +++
 .../cql3/SingleColumnRelationTest.java  | 51 
 4 files changed, 64 insertions(+), 6 deletions(-)
--


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

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

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

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

Branch: refs/heads/trunk
Commit: 504d3c515418a81a6dcec2970585ba88a42badc9
Parents: 7be2d0b 558bb72
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Aug 20 02:40:03 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Aug 20 02:40:03 2014 +0300

--
 CHANGES.txt  | 2 ++
 src/java/org/apache/cassandra/cql3/Constants.java| 4 ++--
 src/java/org/apache/cassandra/cql3/UpdateParameters.java | 7 +++
 3 files changed, 11 insertions(+), 2 deletions(-)
--


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

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

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

2014-08-18 Thread slebresne 
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/9aea917b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9aea917b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9aea917b

Branch: refs/heads/trunk
Commit: 9aea917b2cefdc8a35ff58efdba85268a1ecf7d2
Parents: 4e334ab 5db108c
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 18 10:23:20 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 18 10:23:20 2014 +0200

--
 CHANGES.txt |   8 +-
 build.xml   |   2 +-
 .../cql3/statements/BatchStatement.java |  20 +-
 .../cql3/statements/CQL3CasConditions.java  | 203 --
 .../cql3/statements/CQL3CasRequest.java | 268 +++
 .../cql3/statements/ModificationStatement.java  |  45 ++--
 .../apache/cassandra/service/CASConditions.java |  39 ---
 .../apache/cassandra/service/CASRequest.java|  45 
 .../apache/cassandra/service/StorageProxy.java  |  13 +-
 .../cassandra/thrift/CassandraServer.java   |  16 +-
 10 files changed, 359 insertions(+), 300 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aea917b/CHANGES.txt
--
diff --cc CHANGES.txt
index 0512463,cecf153..1ac981b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 +3.0
 + * Support pure user-defined functions (CASSANDRA-7395)
 + * 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)
 +
 +
  2.1.1
+  * Support list index operations with conditions (CASSANDRA-7499)
   * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
   * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
   * (cqlsh) Error when tracing query (CASSANDRA-7613)
@@@ -64,10 -52,6 +70,8 @@@ Merged from 2.0
   * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
   * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
  Merged from 2.0:
- ===
- 2.0.10
 + * Fix race condition in StreamTransferTask that could lead to
 +   infinite loops and premature sstable deletion (CASSANDRA-7704)
   * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222)
   * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756)
   * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aea917b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
index 000,a85c1e5..b04c624
mode 00,100644..100644
--- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
@@@ -1,0 -1,268 +1,268 @@@
+ /*
+  * 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.cql3.statements;
+ 
+ import java.nio.ByteBuffer;
+ import java.util.*;
+ 
+ import

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

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

Branch: refs/heads/trunk
Commit: e7d65346c2b29cdfae68fae7bc8c96c149324c38
Parents: ddeb496 69abfaa
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Aug 18 22:01:35 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Aug 18 22:01:35 2014 +0300

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


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

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

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

Branch: refs/heads/trunk
Commit: 4e334ab82858972b768920dc2f752ea1f283ec2c
Parents: fe05727 7035cfc
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sun Aug 17 20:50:42 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sun Aug 17 20:50:42 2014 +0300

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/client/RingCache.java  | 58 ++--
 .../apache/cassandra/hadoop/ConfigHelper.java   | 11 
 3 files changed, 40 insertions(+), 30 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e334ab8/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
--

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

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

Branch: refs/heads/trunk
Commit: c4077ad6615d6f96da1588a68c1805f160d6ad0d
Parents: fd43c33 27cbf55
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Aug 14 15:51:09 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Aug 14 15:51:09 2014 -0500

--
 CHANGES.txt |   1 +
 .../hadoop/cql3/CqlBulkOutputFormat.java| 106 ++
 .../hadoop/cql3/CqlBulkRecordWriter.java| 199 +++
 3 files changed, 306 insertions(+)
--


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

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

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

Branch: refs/heads/trunk
Commit: 70d8ad1196d60fec06184873d570e17502800da8
Parents: edb5f08 7a0f496
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Aug 14 16:45:00 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Aug 14 16:45:00 2014 -0500

--

--

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

2014-08-12 Thread jake 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
test/unit/org/apache/cassandra/db/CommitLogTest.java


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

Branch: refs/heads/trunk
Commit: 7ce2242846a77ecb1285e3e26deb8b6c4974be10
Parents: 3c6e33e 54c6e66
Author: Jake Luciani j...@apache.org
Authored: Tue Aug 12 10:11:09 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Tue Aug 12 10:11:09 2014 -0400

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 23 +++
 .../org/apache/cassandra/db/CommitLogTest.java  | 30 
 3 files changed, 49 insertions(+), 5 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ce22428/test/unit/org/apache/cassandra/db/CommitLogTest.java
--
diff --cc test/unit/org/apache/cassandra/db/CommitLogTest.java
index a919c85,ed9601d..fba86f6
--- a/test/unit/org/apache/cassandra/db/CommitLogTest.java
+++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java
@@@ -42,10 -40,11 +42,13 @@@ import org.apache.cassandra.db.commitlo
  import org.apache.cassandra.db.commitlog.ReplayPosition;
  import org.apache.cassandra.db.commitlog.CommitLogSegment;
  import org.apache.cassandra.db.composites.CellName;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.locator.SimpleStrategy;
+ import org.apache.cassandra.db.composites.CellNameType;
+ import org.apache.cassandra.db.filter.NamesQueryFilter;
  import org.apache.cassandra.net.MessagingService;
  import org.apache.cassandra.service.StorageService;
+ import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.FBUtilities;
  
  import static org.apache.cassandra.utils.ByteBufferUtil.bytes;

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

2014-08-07 Thread slebresne 
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/d1e41c01
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1e41c01
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1e41c01

Branch: refs/heads/trunk
Commit: d1e41c01eeebe9c8cf034e42d41e94dcc2265d49
Parents: 56141ae 0c2bbef
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Aug 7 18:36:33 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Aug 7 18:36:33 2014 +0200

--
 CHANGES.txt   |  1 +
 .../db/index/AbstractSimplePerColumnSecondaryIndex.java   |  6 ++
 .../org/apache/cassandra/db/index/SecondaryIndex.java | 10 ++
 .../apache/cassandra/db/index/SecondaryIndexManager.java  |  4 ++--
 4 files changed, 19 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1e41c01/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
--

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

2014-08-06 Thread slebresne 
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/f7fab28e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7fab28e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7fab28e

Branch: refs/heads/trunk
Commit: f7fab28ecb235faf2ba807720cdca091be7461d0
Parents: 740bcb5 40a1cd3
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Aug 6 11:11:37 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Aug 6 11:11:37 2014 +0200

--
 CHANGES.txt |  1 +
 .../AbstractCompoundCellNameType.java   | 21 +++---
 .../org/apache/cassandra/cql3/CQLTester.java| 22 +++
 .../apache/cassandra/cql3/UserTypesTest.java| 23 
 4 files changed, 59 insertions(+), 8 deletions(-)
--


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

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

2014-08-06 Thread slebresne 
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/774f3acb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/774f3acb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/774f3acb

Branch: refs/heads/trunk
Commit: 774f3acbfdcff3ab20c838023f6f1de0eb2d5626
Parents: f7fab28 6386abc
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Aug 6 12:14:36 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Aug 6 12:14:36 2014 +0200

--
 CHANGES.txt | 1 +
 .../org/apache/cassandra/service/EmbeddedCassandraService.java  | 5 +
 2 files changed, 6 insertions(+)
--


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

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

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

Branch: refs/heads/trunk
Commit: 6fad4b09fb9bfd58b3acdb6fc1f9f28543229d80
Parents: 63393eb 3faf88c
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Aug 1 15:47:50 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Aug 1 15:47:50 2014 -0500

--
 CHANGES.txt  |  1 +
 src/java/org/apache/cassandra/config/CFMetaData.java | 10 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fad4b09/src/java/org/apache/cassandra/config/CFMetaData.java
--

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

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

Branch: refs/heads/trunk
Commit: 16a3a37874198884611de48b372672c91c154ccb
Parents: ae93155 51dfe78
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Jul 24 20:40:45 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Jul 24 20:40:45 2014 +0300

--
 CHANGES.txt | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


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

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

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

Branch: refs/heads/trunk
Commit: 23bc3934010773bdf36de1e72e5d00a33021fe5a
Parents: 2f3f683 bc1f53a
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Jul 24 18:02:21 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Jul 24 18:02:21 2014 -0500

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/cql3handling.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

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

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

Branch: refs/heads/trunk
Commit: 82cfcab4c8ab3a14cc38d86898721901ef5a02f9
Parents: 6319dc8 c70216a
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Jul 15 18:23:39 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Jul 15 18:23:39 2014 -0500

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/82cfcab4/src/java/org/apache/cassandra/tools/NodeTool.java
--

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

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

Branch: refs/heads/trunk
Commit: 33060c66d753c33620fe3e9ea8ea020fc745df11
Parents: 2d69ad2 d979ba2
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jul 11 14:22:33 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jul 11 14:22:33 2014 -0500

--

--

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

2014-06-20 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
test/unit/org/apache/cassandra/cql3/DeleteTest.java


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

Branch: refs/heads/trunk
Commit: e88c83006a9ff479be07f8e1bd377526a4bf8369
Parents: d2a3827 ee401cf
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Jun 20 15:23:46 2014 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Jun 20 15:23:46 2014 -0700

--
 CHANGES.txt |   2 +-
 .../apache/cassandra/cql3/QueryProcessor.java   |   1 +
 .../cql3/statements/BatchStatement.java |  75 ++
 .../transport/messages/BatchMessage.java|  11 +-
 .../org/apache/cassandra/cql3/BatchTests.java   | 145 +++
 .../org/apache/cassandra/cql3/DeleteTest.java   |  25 +++-
 6 files changed, 215 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e88c8300/CHANGES.txt
--
diff --cc CHANGES.txt
index f30ef3c,4f68cf7..aea3cf6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 +3.0
 + * 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-7208)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + 
 +
 +
  2.1.0-rc2
+  * Allow counter mutations in UNLOGGED batches (CASSANDRA-7351)
   * Modify reconcile logic to always pick a tombstone over a counter cell
 (CASSANDRA-7346)
   * Avoid incremental compaction on Windows (CASSANDRA-7365)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e88c8300/src/java/org/apache/cassandra/transport/messages/BatchMessage.java
--

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

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

Branch: refs/heads/trunk
Commit: 46536510a85ea854f7871082214026c133e3ce15
Parents: 1914a11 4ab20ba
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Jun 3 19:06:23 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Jun 3 19:06:23 2014 +0300

--

--

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

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

Branch: refs/heads/trunk
Commit: d079c76d21fd3ee5672bc3c617fa8174af405ec4
Parents: a53f5d3 929eaa7
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed May 28 23:27:08 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed May 28 23:27:08 2014 +0300

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/tools/Shuffle.java | 287 ---
 2 files changed, 122 insertions(+), 166 deletions(-)
--


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

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

2014-05-23 Thread slebresne 
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/efbf3c76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efbf3c76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efbf3c76

Branch: refs/heads/trunk
Commit: efbf3c768caee2287360d2ba7e31fd89214d2c05
Parents: 35801be dfcb734
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri May 23 18:03:06 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri May 23 18:03:06 2014 +0200

--
 CHANGES.txt  |  1 +
 src/java/org/apache/cassandra/cql3/UserTypes.java|  6 --
 .../cassandra/hadoop/pig/AbstractCassandraStorage.java   | 11 +--
 3 files changed, 10 insertions(+), 8 deletions(-)
--


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

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

2014-05-21 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
src/java/org/apache/cassandra/db/marshal/UUIDType.java


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

Branch: refs/heads/trunk
Commit: 91741025cd81d3d62408edcac25c29ae23adb2a0
Parents: a519c0a e024a1c
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed May 21 17:54:27 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed May 21 17:54:27 2014 +0200

--
 CHANGES.txt |  3 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  1 +
 .../apache/cassandra/db/marshal/DateType.java   | 38 +-
 .../cassandra/db/marshal/TimestampType.java | 43 +--
 .../serializers/TimestampSerializer.java| 68 ++---
 .../apache/cassandra/service/CacheService.java  | 11 +++
 .../cassandra/db/RecoveryManagerTest.java   |  3 +
 .../serializers/TimestampSerializerTest.java| 77 
 8 files changed, 155 insertions(+), 89 deletions(-)
--


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

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

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

Branch: refs/heads/trunk
Commit: 61084fb53b92be987134028d796a6245fd3c1c0b
Parents: 8c2d938 606bc51
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon May 19 13:59:20 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon May 19 13:59:20 2014 -0500

--
 CHANGES.txt | 16 
 build.xml   |  2 +-
 .../cassandra/thrift/THsHaDisruptorServer.java  |  3 ++-
 3 files changed, 19 insertions(+), 2 deletions(-)
--


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

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

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

2014-05-15 Thread jbellis 
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/10aef4d8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10aef4d8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10aef4d8

Branch: refs/heads/trunk
Commit: 10aef4d87ad44cd7a124b941aa4997d3372be1f3
Parents: 94c0299 0b26c77
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu May 8 16:00:28 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu May 8 16:00:28 2014 -0500

--
 CHANGES.txt |  2 +
 .../cassandra/db/commitlog/CommitLog.java   |  4 +-
 .../db/commitlog/CommitLogArchiver.java | 30 +++--
 .../db/commitlog/CommitLogDescriptor.java   | 71 ++--
 .../db/commitlog/CommitLogReplayer.java | 48 +++--
 .../db/commitlog/CommitLogSegment.java  | 57 
 .../db/commitlog/CommitLogSegmentManager.java   |  7 +-
 .../apache/cassandra/utils/PureJavaCrc32.java   | 17 -
 8 files changed, 184 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/10aef4d8/CHANGES.txt
--
diff --cc CHANGES.txt
index 7b387ac,1ebc050..7802d7b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +3.0
 + * 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-7208)
 +
  2.1.0-rc1
+  * Make commitlog archive+restore more robust (CASSANDRA-6974)
   * Fix marking commitlogsegments clean (CASSANDRA-6959)
   * Add snapshot manifest describing files included (CASSANDRA-6326)
   * Parallel streaming for sstableloader (CASSANDRA-3668)

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

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

Branch: refs/heads/trunk
Commit: d8490ccea1e38c1a4246a025fc01b76191387a0f
Parents: c0be341 e786101
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu May 1 18:00:31 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu May 1 18:00:31 2014 +0200

--
 .rat-excludes   |  1 +
 CHANGES.txt |  1 +
 NEWS.txt|  5 ++
 build.xml   |  2 +-
 conf/logback-tools.xml  | 19 +
 conf/logback.xml| 19 +
 debian/changelog|  6 ++
 debian/rules|  2 +-
 .../org/apache/cassandra/dht/BootStrapper.java  |  2 +-
 .../org/apache/cassandra/dht/RangeStreamer.java | 81 +++-
 .../io/util/ChecksummedSequentialWriter.java| 17 
 .../cassandra/service/StorageService.java   | 44 ++-
 test/conf/logback-test.xml  | 19 +
 .../stress/settings/OptionCompaction.java   | 17 
 14 files changed, 227 insertions(+), 8 deletions(-)
--


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

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

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

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

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

2014-04-30 Thread slebresne 
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/6b4d9803
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b4d9803
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b4d9803

Branch: refs/heads/trunk
Commit: 6b4d980357de573f9128c3a065a6d11c54a3b571
Parents: ad34247 9872b74
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Apr 30 20:22:53 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Apr 30 20:22:53 2014 +0200

--
 CHANGES.txt |   1 +
 build.xml   |   2 +-
 doc/native_protocol_v3.spec | 911 +++
 src/java/org/apache/cassandra/auth/Auth.java|  16 +-
 .../cassandra/auth/CassandraAuthorizer.java |   6 +-
 .../cassandra/auth/PasswordAuthenticator.java   |   4 +-
 .../org/apache/cassandra/cql3/Attributes.java   |   8 +-
 .../cassandra/cql3/BatchQueryOptions.java   |  81 +-
 .../apache/cassandra/cql3/ColumnCondition.java  |  32 +-
 .../org/apache/cassandra/cql3/Constants.java|  20 +-
 src/java/org/apache/cassandra/cql3/Lists.java   |  34 +-
 src/java/org/apache/cassandra/cql3/Maps.java|  32 +-
 .../org/apache/cassandra/cql3/QueryHandler.java |   3 +-
 .../org/apache/cassandra/cql3/QueryOptions.java | 283 --
 .../apache/cassandra/cql3/QueryProcessor.java   |  29 +-
 .../org/apache/cassandra/cql3/ResultSet.java|   6 +-
 src/java/org/apache/cassandra/cql3/Sets.java|  26 +-
 src/java/org/apache/cassandra/cql3/Term.java|  18 +-
 .../apache/cassandra/cql3/UpdateParameters.java |   6 +-
 .../org/apache/cassandra/cql3/UserTypes.java|  18 +-
 .../cassandra/cql3/functions/FunctionCall.java  |  20 +-
 .../cql3/statements/BatchStatement.java |  95 +-
 .../cql3/statements/CQL3CasConditions.java  |  14 +-
 .../cql3/statements/ModificationStatement.java  |  63 +-
 .../cassandra/cql3/statements/Restriction.java  |  28 +-
 .../cql3/statements/SelectStatement.java| 150 +--
 .../org/apache/cassandra/db/DefsTables.java |  19 +-
 .../cassandra/db/marshal/CollectionType.java|  29 +-
 .../apache/cassandra/db/marshal/ListType.java   |  12 +-
 .../apache/cassandra/db/marshal/MapType.java|  21 +-
 .../apache/cassandra/db/marshal/SetType.java|  15 +-
 .../apache/cassandra/db/marshal/UserType.java   |   5 +
 .../hadoop/pig/AbstractCassandraStorage.java|  11 +-
 .../cassandra/io/sstable/CQLSSTableWriter.java  |  11 +-
 .../serializers/CollectionSerializer.java   | 106 ++-
 .../cassandra/serializers/ListSerializer.java   |  39 +-
 .../cassandra/serializers/MapSerializer.java|  48 +-
 .../cassandra/serializers/SetSerializer.java|  39 +-
 .../cassandra/service/IMigrationListener.java   |   3 +
 .../cassandra/service/MigrationManager.java |  18 +
 .../cassandra/thrift/CassandraServer.java   |   4 +-
 .../org/apache/cassandra/transport/CBUtil.java  |  17 +
 .../org/apache/cassandra/transport/Client.java  |   4 +-
 .../apache/cassandra/transport/DataType.java|  79 +-
 .../org/apache/cassandra/transport/Event.java   | 158 +++-
 .../apache/cassandra/transport/OptionCodec.java |  28 +-
 .../org/apache/cassandra/transport/Server.java  |  21 +-
 .../cassandra/transport/SimpleClient.java   |   4 +-
 .../transport/messages/BatchMessage.java|  53 +-
 .../transport/messages/EventMessage.java|   6 +-
 .../transport/messages/ExecuteMessage.java  |   5 +-
 .../cassandra/transport/SerDeserTest.java   | 217 +
 52 files changed, 2232 insertions(+), 646 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b4d9803/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --cc src/java/org/apache/cassandra/cql3/QueryProcessor.java
index db99060,40c45af..9a5ac92
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@@ -51,13 -51,14 +51,13 @@@ public class QueryProcessor implements 
  private static final Logger logger = 
LoggerFactory.getLogger(QueryProcessor.class);
  private static final MemoryMeter meter = new 
MemoryMeter().withGuessing(MemoryMeter.Guess.FALLBACK_BEST);
  private static final long MAX_CACHE_PREPARED_MEMORY = 
Runtime.getRuntime().maxMemory() / 256;
 -private static final int MAX_CACHE_PREPARED_COUNT = 1;
  
- private static

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

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

Branch: refs/heads/trunk
Commit: 343b3fdbcf04a4ab049e50123e3c7e9b5b6835ce
Parents: 0d533ef 7c0c34b
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Apr 25 17:04:15 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Apr 25 17:04:15 2014 +0300

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

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

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

Branch: refs/heads/trunk
Commit: 97dcba60199eeb5df94718bb808f8be5a8cbc016
Parents: f9fb533 5045d3e
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Apr 22 19:50:16 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Apr 22 19:50:16 2014 +0300

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/BatchlogManager.java|  2 +-
 .../cassandra/db/HintedHandOffManager.java  |  4 +--
 .../apache/cassandra/net/MessagingService.java  | 27 ++--
 .../apache/cassandra/net/WriteCallbackInfo.java | 16 +---
 .../apache/cassandra/service/StorageProxy.java  |  7 -
 6 files changed, 41 insertions(+), 16 deletions(-)
--


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

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

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

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

Branch: refs/heads/trunk
Commit: 33fa4f648019a6ad5a191aed4a42b32805d70cf8
Parents: 462c2dc 30e2bff
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Tue Apr 22 01:50:23 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue Apr 22 01:50:23 2014 -0400

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


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

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

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

Branch: refs/heads/trunk
Commit: e100288123b055021d9b8873ab86f0dbf5fc9f22
Parents: 4d06917 66af6fe
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Apr 18 03:16:14 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Apr 18 03:16:14 2014 +0300

--
 CHANGES.txt |   1 +
 NEWS.txt|  11 +-
 .../apache/cassandra/db/BatchlogManager.java| 102 +++
 .../apache/cassandra/db/ColumnFamilyStore.java  |   6 --
 .../cassandra/db/HintedHandOffManager.java  |  19 +---
 .../org/apache/cassandra/db/SystemKeyspace.java |  55 +++---
 .../db/commitlog/CommitLogReplayer.java |  12 +--
 .../apache/cassandra/service/StorageProxy.java  |   9 +-
 .../cassandra/db/BatchlogManagerTest.java   |  84 +--
 .../apache/cassandra/db/HintedHandOffTest.java  |  19 ++--
 10 files changed, 214 insertions(+), 104 deletions(-)
--


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

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

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

2014-04-01 Thread slebresne 
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/6660970c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6660970c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6660970c

Branch: refs/heads/trunk
Commit: 6660970c397a0ac53881422a35920bee2bf2d5f7
Parents: 5cdfa69 353b214
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Apr 1 11:30:06 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Apr 1 11:30:06 2014 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/db/filter/ColumnCounter.java  | 28 ++--
 2 files changed, 21 insertions(+), 8 deletions(-)
--


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

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

2014-03-27 Thread slebresne 
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/fc75fc2e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc75fc2e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc75fc2e

Branch: refs/heads/trunk
Commit: fc75fc2e40daf2430031afba1e664ea0d016f865
Parents: da6f78d 1f397a3
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Mar 27 16:22:04 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Mar 27 16:22:04 2014 +0100

--
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java   | 3 +++
 src/java/org/apache/cassandra/db/marshal/BooleanType.java | 9 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)
--

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

2014-03-22 Thread vijay 
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/46d07618
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46d07618
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46d07618

Branch: refs/heads/trunk
Commit: 46d0761851ce0d772c9ffbc5ed4e4d40d0e41421
Parents: 699189f e955016
Author: Vijay vijay2...@gmail.com
Authored: Sat Mar 22 13:57:46 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Sat Mar 22 13:57:46 2014 -0700

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

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

2014-03-22 Thread vijay 
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/053c17d8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/053c17d8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/053c17d8

Branch: refs/heads/trunk
Commit: 053c17d88ebcfc8d938a69f361333b7d29ae1d08
Parents: 46d0761 fbc112d
Author: Vijay vijay2...@gmail.com
Authored: Sat Mar 22 19:27:50 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Sat Mar 22 19:27:50 2014 -0700

--
 conf/commitlog_archiving.properties |  2 +-
 .../org/apache/cassandra/tools/NodeTool.java| 43 +---
 2 files changed, 20 insertions(+), 25 deletions(-)
--

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

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

Branch: refs/heads/trunk
Commit: 9f057832e3796635eb4fc1f6d757dffed0d47c4e
Parents: 00317fc 75508ec
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Mar 19 18:01:48 2014 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Mar 19 18:01:48 2014 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/cache/AutoSavingCache.java |   3 +-
 .../cache/SerializingCacheProvider.java |   4 +-
 .../apache/cassandra/db/BatchlogManager.java|  12 +-
 .../cassandra/db/ColumnFamilySerializer.java|   7 +-
 .../org/apache/cassandra/db/ColumnIndex.java|   6 +-
 .../apache/cassandra/db/ColumnSerializer.java   |   4 +-
 .../apache/cassandra/db/CounterMutation.java|   3 +-
 .../org/apache/cassandra/db/DeletionInfo.java   |   4 +-
 .../org/apache/cassandra/db/DeletionTime.java   |   4 +-
 src/java/org/apache/cassandra/db/Mutation.java  |   4 +-
 .../org/apache/cassandra/db/OnDiskAtom.java |   3 +-
 .../apache/cassandra/db/PagedRangeCommand.java  |   4 +-
 .../apache/cassandra/db/RangeSliceCommand.java  |   4 +-
 .../apache/cassandra/db/RangeSliceReply.java|   4 +-
 .../org/apache/cassandra/db/RangeTombstone.java |   5 +-
 .../apache/cassandra/db/RangeTombstoneList.java |   4 +-
 .../org/apache/cassandra/db/ReadCommand.java|   4 +-
 .../org/apache/cassandra/db/ReadResponse.java   |   5 +-
 src/java/org/apache/cassandra/db/Row.java   |   3 +-
 .../org/apache/cassandra/db/RowIndexEntry.java  |   4 +-
 .../org/apache/cassandra/db/RowPosition.java|   4 +-
 .../cassandra/db/SliceByNamesReadCommand.java   |   3 +-
 .../cassandra/db/SliceFromReadCommand.java  |   4 +-
 .../apache/cassandra/db/SnapshotCommand.java|   4 +-
 .../apache/cassandra/db/TruncateResponse.java   |   4 +-
 .../org/apache/cassandra/db/Truncation.java |   4 +-
 .../org/apache/cassandra/db/WriteResponse.java  |   4 +-
 .../cassandra/db/commitlog/CommitLog.java   |   8 +-
 .../cassandra/db/commitlog/ReplayPosition.java  |   4 +-
 .../db/compaction/AbstractCompactedRow.java |   3 +-
 .../db/compaction/LazilyCompactedRow.java   |   3 +-
 .../cassandra/db/composites/AbstractCType.java  |   4 +-
 .../db/composites/AbstractCellNameType.java |   4 +-
 .../apache/cassandra/db/filter/ColumnSlice.java |   4 +-
 .../cassandra/db/filter/IDiskAtomFilter.java|   5 +-
 .../cassandra/db/filter/NamesQueryFilter.java   |   4 +-
 .../cassandra/db/filter/SliceQueryFilter.java   |   4 +-
 .../apache/cassandra/dht/AbstractBounds.java|   3 +-
 .../org/apache/cassandra/dht/BootStrapper.java  |   4 +-
 src/java/org/apache/cassandra/dht/Token.java|   4 +-
 .../org/apache/cassandra/gms/EchoMessage.java   |   4 +-
 .../org/apache/cassandra/gms/EndpointState.java |   3 +-
 .../org/apache/cassandra/gms/GossipDigest.java  |   3 +-
 .../apache/cassandra/gms/GossipDigestAck.java   |   4 +-
 .../apache/cassandra/gms/GossipDigestAck2.java  |   3 +-
 .../apache/cassandra/gms/GossipDigestSyn.java   |   5 +-
 .../apache/cassandra/gms/HeartBeatState.java|   3 +-
 .../apache/cassandra/gms/VersionedValue.java|   3 +-
 .../apache/cassandra/io/ISSTableSerializer.java |   5 +-
 .../org/apache/cassandra/io/ISerializer.java|   6 +-
 .../cassandra/io/IVersionedSerializer.java  |   6 +-
 .../io/compress/CompressionMetadata.java|   3 +-
 .../io/compress/CompressionParameters.java  |   4 +-
 .../cassandra/io/sstable/IndexHelper.java   |   3 +-
 .../cassandra/io/sstable/IndexSummary.java  |   7 +-
 .../cassandra/io/sstable/SSTableReader.java |   4 +-
 .../cassandra/io/sstable/SSTableWriter.java |   4 +-
 .../io/sstable/metadata/CompactionMetadata.java |   4 +-
 .../metadata/IMetadataComponentSerializer.java  |   5 +-
 .../sstable/metadata/IMetadataSerializer.java   |   6 +-
 .../metadata/LegacyMetadataSerializer.java  |   3 +-
 .../io/sstable/metadata/MetadataSerializer.java |   6 +-
 .../io/sstable/metadata/StatsMetadata.java  |   4 +-
 .../io/sstable/metadata/ValidationMetadata.java |   4 +-
 .../cassandra/io/util/AbstractDataOutput.java   |  43 +-
 .../io/util/ByteBufferOutputStream.java |  46 --
 .../io/util/ChecksummedOutputStream.java|  56 ---
 .../cassandra/io/util/DataOutputBuffer.java |  23 +-
 .../cassandra/io/util/DataOutputByteBuffer.java |  59 +++
 .../cassandra/io/util/DataOutputPlus.java   |  32 ++
 .../io/util/DataOutputStreamAndChannel.java |  55 +++
 .../cassandra/io/util/DataOutputStreamPlus.java |  57 +++
 .../io/util/FastByteArrayOutputStream.java  |  11 +

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

2014-03-17 Thread slebresne 
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/67b85218
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67b85218
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67b85218

Branch: refs/heads/trunk
Commit: 67b852182b73b3ac95f496209c97f5957cc248bf
Parents: b74c2ad 67119a5
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Mar 17 11:09:02 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Mar 17 11:09:02 2014 +0100

--
 CHANGES.txt  | 2 ++
 NOTICE.txt   | 2 +-
 .../org/apache/cassandra/cql3/statements/BatchStatement.java | 8 
 3 files changed, 7 insertions(+), 5 deletions(-)
--


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

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

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

Branch: refs/heads/trunk
Commit: a03ac8d07f04328427020a5dbe68545cf264ce47
Parents: 5023486 ad5169d
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Mar 12 15:08:55 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Mar 12 15:08:55 2014 +0300

--
 CHANGES.txt | 2 ++
 src/java/org/apache/cassandra/service/FileCacheService.java | 3 +++
 2 files changed, 5 insertions(+)
--


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

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

2014-03-12 Thread jbellis 
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/9b123292
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b123292
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b123292

Branch: refs/heads/trunk
Commit: 9b1232929dea23a067283c6f0df2a12bb7814c77
Parents: 8873afc 9405ce0
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Mar 12 10:04:58 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Mar 12 10:04:58 2014 -0500

--
 CHANGES.txt |  2 +
 .../io/compress/CompressedSequentialWriter.java | 35 -
 .../apache/cassandra/io/sstable/Descriptor.java |  3 +
 .../cassandra/io/sstable/SSTableWriter.java | 19 +++--
 .../io/util/DataIntegrityMetadata.java  | 83 
 .../cassandra/io/util/SequentialWriter.java | 35 +
 6 files changed, 79 insertions(+), 98 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b123292/CHANGES.txt
--
diff --cc CHANGES.txt
index a722c6c,7a1fc60..76b1942
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,6 +1,11 @@@
 +3.0
 + * Remove CQL2 (CASSANDRA-5918)
 + * add Thrift get_multi_slice call (CASSANDRA-6757)
 +
 +
  2.1.0-beta2
+  * Switch CRC component to Adler and include it for compressed sstables 
+(CASSANDRA-4165)
   * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
   * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
   * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)

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

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

Branch: refs/heads/trunk
Commit: c1647c59e414565d60d3936fe834106f66c6ef13
Parents: f32c4da 0cb1e3d
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Mar 12 18:30:18 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Mar 12 18:30:18 2014 -0500

--
 CHANGES.txt |   2 +-
 .../org/apache/cassandra/utils/btree/BTree.java |  49 ++--
 .../apache/cassandra/utils/btree/Builder.java   |   8 +-
 .../cassandra/utils/btree/NodeBuilder.java  |   2 +-
 .../cassandra/utils/btree/UpdateFunction.java   |   1 -
 .../apache/cassandra/db/RangeTombstoneTest.java |   8 +-
 .../org/apache/cassandra/utils/BTreeTest.java   | 125 +++
 7 files changed, 175 insertions(+), 20 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1647c59/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
--

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

2014-03-11 Thread vijay 
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/5023486f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5023486f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5023486f

Branch: refs/heads/trunk
Commit: 5023486f4c7b6caa2d1b628cc4f702d993553bba
Parents: 2037a8d e22d0b1
Author: Vijay vijay2...@gmail.com
Authored: Tue Mar 11 21:14:44 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Tue Mar 11 21:14:44 2014 -0700

--
 .../org/apache/cassandra/tools/NodeTool.java| 217 +--
 1 file changed, 102 insertions(+), 115 deletions(-)
--

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

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

Branch: refs/heads/trunk
Commit: baa2b692db781c46170b707cdc5cafd033ac42b0
Parents: 572d328 5310f26
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat Mar 8 22:23:41 2014 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat Mar 8 22:23:41 2014 -0500

--
 NEWS.txt | 19 +++
 debian/changelog |  6 ++
 .../org/apache/cassandra/tools/NodeProbe.java|  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)
--


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

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

2014-03-04 Thread slebresne 
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/21c7252d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21c7252d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21c7252d

Branch: refs/heads/trunk
Commit: 21c7252d6e9c2c3ed8918ac32867b32fe980d911
Parents: db6b563 947e10f
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Mar 4 11:53:23 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Mar 4 11:53:23 2014 +0100

--
 CHANGES.txt |  3 ++
 .../cql3/statements/UpdateStatement.java| 12 +++---
 .../org/apache/cassandra/db/SuperColumns.java   |  5 +++
 .../db/columniterator/IndexedSliceReader.java   | 45 +---
 .../db/columniterator/SSTableNamesIterator.java |  6 ++-
 5 files changed, 59 insertions(+), 12 deletions(-)
--


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

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

2014-02-20 Thread slebresne 
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/63e0eb4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63e0eb4f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63e0eb4f

Branch: refs/heads/trunk
Commit: 63e0eb4faab4f06181cddd9911db9f7be93a3961
Parents: 2621707 13b753b
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Feb 20 21:13:10 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Feb 20 21:13:10 2014 +0100

--
 src/java/org/apache/cassandra/db/composites/AbstractCType.java  | 2 ++
 src/java/org/apache/cassandra/db/filter/ColumnSlice.java| 5 +
 .../org/apache/cassandra/db/marshal/AbstractCompositeType.java  | 2 ++
 src/java/org/apache/cassandra/db/marshal/LongType.java  | 2 +-
 4 files changed, 10 insertions(+), 1 deletion(-)
--