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

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

2014-11-05 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/LeveledCompactionStrategy.java
src/java/org/apache/cassandra/db/compaction/LeveledManifest.java

src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java

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


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

Branch: refs/heads/trunk
Commit: af44d1a7c3baad2b5ce006b9c0f5249c38cb0504
Parents: e369ff6 e16f584
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Nov 5 09:47:48 2014 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Nov 5 09:47:48 2014 +0100

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/config/CFMetaData.java |   3 +
 .../cassandra/db/CollationController.java   |   2 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  |  57 +---
 .../compaction/AbstractCompactionStrategy.java  |  14 +
 .../db/compaction/CompactionManager.java|   2 +-
 .../DateTieredCompactionStrategy.java   |  46 +--
 .../compaction/LeveledCompactionStrategy.java   |  60 +---
 .../db/compaction/LeveledManifest.java  | 111 ++-
 .../SizeTieredCompactionStrategy.java   |  63 ++--
 .../compaction/WrappingCompactionStrategy.java  | 331 +++
 .../io/sstable/format/SSTableReader.java|   3 +-
 .../db/compaction/CompactionsTest.java  |   4 +-
 .../LeveledCompactionStrategyTest.java  |  88 +++--
 14 files changed, 486 insertions(+), 299 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/af44d1a7/CHANGES.txt
--
diff --cc CHANGES.txt
index 817cbcf,80f4c8f..6ba76f9
--- 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
+  * Improve compaction of repaired/unrepaired sstables (CASSANDRA-8004)
   * Make cache serializers pluggable (CASSANDRA-8096)
   * Fix issues with CONTAINS (KEY) queries on secondary indexes
 (CASSANDRA-8147)

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

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

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

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

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

Branch: refs/heads/trunk
Commit: 47099c27866565ad50601036855caeb9190c0524
Parents: af44d1a 98acdb8
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Nov 5 16:32:25 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Nov 5 16:32:25 2014 +0300

--

--

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

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

Branch: refs/heads/trunk
Commit: 51bbec75744d6e8d9c696d375b724f82e469e698
Parents: 5edaa15 82b91ab
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Nov 5 20:35:23 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Nov 5 20:35:23 2014 +0300

--
 .../cql3/statements/CreateTableStatement.java   | 11 
 .../db/ColumnFamilyNotDefinedException.java | 28 
 2 files changed, 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/51bbec75/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
--

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

2014-11-05 Thread jake

Merge branch 'cassandra-2.1' into trunk

Conflicts:
NEWS.txt
build.xml


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

Branch: refs/heads/trunk
Commit: 19c2d22e93c52bc4699a0b5a0fdcdeedd3826449
Parents: 4fd3349 cea00e9
Author: Jake Luciani j...@apache.org
Authored: Wed Nov 5 16:04:24 2014 -0500
Committer: Jake Luciani j...@apache.org
Committed: Wed Nov 5 16:04:24 2014 -0500

--
 NEWS.txt   |  7 +++
 debian/changelog   |  7 ++-
 .../apache/cassandra/utils/concurrent/Locks.java   | 17 +
 .../cassandra/utils/JVMStabilityInspectorTest.java | 17 +
 .../apache/cassandra/stress/util/DynamicList.java  | 17 +
 5 files changed, 64 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/19c2d22e/NEWS.txt
--
diff --cc NEWS.txt
index ba369f6,61ce546..1d168f0
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,27 -13,13 +13,34 @@@ 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
 +
 +   - 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.
 +
 +
 +Upgrading
 +-
 +   - 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.
 +
+ 2.1.2
+ =
+ 
+ Upgrading
+ -
+ - Nothing specific to this release, but please see 2.1 if you are 
upgrading
+   from a previous version.
  
  2.1.1
  =

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

2014-11-05 Thread mishail

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

Branch: refs/heads/trunk
Commit: eccf25a17ead87016646f6f4bdd6d19194f79a4d
Parents: 8856934 cdf80d9
Author: Mikhail Stepura mish...@apache.org
Authored: Wed Nov 5 15:50:11 2014 -0800
Committer: Mikhail Stepura mish...@apache.org
Committed: Wed Nov 5 15:50:11 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eccf25a1/CHANGES.txt
--
diff --cc CHANGES.txt
index f0ee602,2e60f3a..b23f756
--- 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
+  * (cqlsh) parse_for_table_meta errors out on queries with undefined
+grammars (CASSANDRA-8262)
   * (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)

[3/3] 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/cql3/ColumnIdentifier.java
src/java/org/apache/cassandra/cql3/Cql.g
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
src/java/org/apache/cassandra/cql3/statements/Selectable.java
src/java/org/apache/cassandra/cql3/statements/Selection.java


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

Branch: refs/heads/trunk
Commit: 9bf17e15a8c98a457a4855e3bb5d61dfeebf986a
Parents: 254cd85 a446e80
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Nov 4 17:26:11 2014 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Nov 4 17:26:11 2014 -0600

--
 CHANGES.txt |   1 +
 .../apache/cassandra/cql3/ColumnIdentifier.java |  61 -
 src/java/org/apache/cassandra/cql3/Cql.g| 127 ++-
 .../cassandra/cql3/MultiColumnRelation.java |  12 +-
 .../org/apache/cassandra/cql3/Operation.java|  15 ++-
 .../cassandra/cql3/SingleColumnRelation.java|  12 +-
 .../cassandra/cql3/selection/RawSelector.java   |   9 +-
 .../cassandra/cql3/selection/Selectable.java|  60 +
 .../cassandra/cql3/selection/Selection.java |   4 +-
 .../cql3/statements/AlterTableStatement.java|  31 +++--
 .../cql3/statements/CreateIndexStatement.java   |  10 +-
 .../cql3/statements/DeleteStatement.java|   7 +-
 .../cassandra/cql3/statements/IndexTarget.java  |  30 -
 .../cql3/statements/ModificationStatement.java  |  21 +--
 .../cql3/statements/SelectStatement.java|  26 ++--
 .../cql3/statements/UpdateStatement.java|  17 +--
 .../unit/org/apache/cassandra/SchemaLoader.java |   6 +-
 .../cassandra/cql3/ThriftCompatibilityTest.java |  72 +++
 18 files changed, 382 insertions(+), 139 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bf17e15/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
--
diff --cc src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
index 9b4f29f,c1dcd87..e1454b1
--- a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
@@@ -24,11 -23,10 +24,13 @@@ import java.nio.ByteBuffer
  import org.apache.cassandra.cache.IMeasurableMemory;
  import org.apache.cassandra.config.CFMetaData;
  import org.apache.cassandra.config.ColumnDefinition;
 -import org.apache.cassandra.cql3.statements.Selectable;
 +import org.apache.cassandra.cql3.selection.Selectable;
 +import org.apache.cassandra.cql3.selection.Selector;
 +import org.apache.cassandra.cql3.selection.SimpleSelector;
  import org.apache.cassandra.db.marshal.AbstractType;
 +import org.apache.cassandra.exceptions.InvalidRequestException;
+ import org.apache.cassandra.db.marshal.CompositeType;
+ import org.apache.cassandra.db.marshal.UTF8Type;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.ObjectSizes;
  import org.apache.cassandra.utils.memory.AbstractAllocator;
@@@ -37,7 -35,7 +39,7 @@@
   * Represents an identifer for a CQL column definition.
   * TODO : should support light-weight mode without text representation for 
when not interned
   */
- public class ColumnIdentifier extends Selectable implements IMeasurableMemory
 -public class ColumnIdentifier implements Selectable, IMeasurableMemory
++public class ColumnIdentifier extends 
org.apache.cassandra.cql3.selection.Selectable implements IMeasurableMemory
  {
  public final ByteBuffer bytes;
  private final String text;
@@@ -107,12 -105,61 +109,69 @@@
  return new ColumnIdentifier(allocator.clone(bytes), text);
  }
  
 +public Selector.Factory newSelectorFactory(CFMetaData cfm, 
ListColumnDefinition defs) throws InvalidRequestException
 +{
 +ColumnDefinition def = cfm.getColumnDefinition(this);
 +if (def == null)
 +throw new InvalidRequestException(String.format(Undefined name 
%s in selection clause, this));
 +
 +return SimpleSelector.newFactory(def.name.toString(), 
addAndGetIndex(def, defs), def.type);
 +}
+ 
+ /**
+  * Because Thrift-created tables may have a non-text comparator, we 
cannot determine the proper 'key' until
+  * we know the comparator. ColumnIdentifier.Raw is a placeholder that can 
be converted to a real ColumnIdentifier
+  * once the comparator is known with

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

2014-11-03 Thread jmckenzie

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/cql/QueryProcessor.java
src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java


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

Branch: refs/heads/trunk
Commit: 49768fea0071bd2f084c70c9b87468e2f48eb2a5
Parents: 632ebc5 ad84e4d
Author: Joshua McKenzie jmcken...@apache.org
Authored: Mon Nov 3 13:06:25 2014 -0600
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Mon Nov 3 13:06:25 2014 -0600

--
 .../org/apache/cassandra/client/RingCache.java  |   8 +-
 .../cassandra/config/DatabaseDescriptor.java|   6 +-
 .../cql3/statements/SelectStatement.java|   4 +-
 .../apache/cassandra/db/BatchlogManager.java|   2 +-
 .../cassandra/db/HintedHandOffManager.java  |   2 +-
 .../db/marshal/LocalByPartionerType.java|   7 +-
 .../apache/cassandra/dht/AbstractBounds.java|   4 +-
 .../dht/AbstractByteOrderedPartitioner.java |  20 +-
 .../cassandra/dht/AbstractPartitioner.java  |   5 +-
 .../org/apache/cassandra/dht/AbstractToken.java |  53 +
 .../apache/cassandra/dht/BigIntegerToken.java   |   6 +-
 src/java/org/apache/cassandra/dht/Bounds.java   |   6 +-
 .../cassandra/dht/ByteOrderedPartitioner.java   |   4 +-
 .../org/apache/cassandra/dht/BytesToken.java|   5 +-
 .../apache/cassandra/dht/ExcludingBounds.java   |   4 +-
 .../org/apache/cassandra/dht/IPartitioner.java  |  12 +-
 .../cassandra/dht/IncludingExcludingBounds.java |   6 +-
 .../apache/cassandra/dht/LocalPartitioner.java  |   6 +-
 .../org/apache/cassandra/dht/LocalToken.java|   6 +-
 .../org/apache/cassandra/dht/LongToken.java |   6 +-
 .../cassandra/dht/Murmur3Partitioner.java   |  25 +-
 .../dht/OrderPreservingPartitioner.java |  20 +-
 .../apache/cassandra/dht/RandomPartitioner.java |  18 +-
 src/java/org/apache/cassandra/dht/Range.java|  39 ++--
 .../org/apache/cassandra/dht/RangeStreamer.java |   2 +-
 .../org/apache/cassandra/dht/RingPosition.java  |   2 +-
 .../org/apache/cassandra/dht/StringToken.java   |   6 +-
 src/java/org/apache/cassandra/dht/Token.java|  52 +
 .../apache/cassandra/gms/TokenSerializer.java   |   2 +-
 .../apache/cassandra/service/StorageProxy.java  |   2 +-
 .../cassandra/thrift/CassandraServer.java   |   4 +-
 .../apache/cassandra/tools/SSTableExport.java   |   2 +-
 .../apache/cassandra/tools/SSTableImport.java   |   6 +-
 .../cassandra/db/ColumnFamilyStoreTest.java |   2 +-
 .../apache/cassandra/db/KeyCollisionTest.java   | 230 ---
 .../apache/cassandra/dht/BootStrapperTest.java  |   2 +-
 .../dht/ByteOrderedPartitionerTest.java |   2 +-
 .../apache/cassandra/dht/KeyCollisionTest.java  | 230 +++
 .../cassandra/dht/Murmur3PartitionerTest.java   |   4 +-
 .../dht/OrderPreservingPartitionerTest.java |   2 +-
 .../cassandra/dht/PartitionerTestCase.java  |  12 +-
 .../cassandra/dht/RandomPartitionerTest.java|   2 +-
 .../org/apache/cassandra/dht/RangeTest.java |   4 +-
 43 files changed, 441 insertions(+), 401 deletions(-)
--


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

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/49768fea/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/49768fea/src/java/org/apache/cassandra/dht/BytesToken.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/49768fea/src/java/org/apache/cassandra/dht/RangeStreamer.java
--

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

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

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

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

Branch: refs/heads/trunk
Commit: 57b5fb64cb624d23a8026dda13e275ff59e50699
Parents: 49768fe 399a4ec
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Nov 3 14:42:56 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Nov 3 14:42:56 2014 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/57b5fb64/CHANGES.txt
--
diff --cc CHANGES.txt
index c87fa8d,50a540f..6f42f8c
--- 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
+  * Set socket timeout when reading remote version (CASSANDRA-8188)
   * 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)

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

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

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

Branch: refs/heads/trunk
Commit: 156e278ed841e5adf5172d3480af6143d844ab2f
Parents: 931a518 827d93e
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Nov 3 15:07:39 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Nov 3 15:07:39 2014 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/156e278e/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--

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

2014-11-03 Thread mishail

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

Branch: refs/heads/trunk
Commit: 02a20f70b0c3ae3b904cb1879927463fb5f8a85b
Parents: c93cbb2 a8072ae
Author: Mikhail Stepura mish...@apache.org
Authored: Mon Nov 3 14:46:20 2014 -0800
Committer: Mikhail Stepura mish...@apache.org
Committed: Mon Nov 3 14:46:20 2014 -0800

--
 build.xml | 6 ++
 1 file changed, 6 insertions(+)
--


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

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

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

Branch: refs/heads/trunk
Commit: 9274197b4bdb343731b964f2fcd8f70814f42a41
Parents: ba581f4 d230922
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Oct 31 14:17:11 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Oct 31 14:17:11 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9274197b/pylib/cqlshlib/helptopics.py
--

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

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

Branch: refs/heads/trunk
Commit: 8174dabf33e9e6cbdf2424692a9ee22df10f77f8
Parents: fbb6b8a 2e37655
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Oct 30 11:09:44 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Oct 30 11:09:44 2014 -0500

--
 .../unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8174dabf/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java
--

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

2014-10-29 Thread slebresne

Merge branch 'cassandra-2.1' into trunk

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


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

Branch: refs/heads/trunk
Commit: 45084f182a46234243b94059fd1b6b53e927ead8
Parents: 708c6ba 1d285ea
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Oct 29 10:49:20 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Oct 29 10:49:20 2014 +0100

--
 CHANGES.txt |  1 +
 doc/native_protocol_v3.spec |  8 +++--
 .../org/apache/cassandra/cql3/QueryOptions.java | 10 +++---
 .../apache/cassandra/cql3/UpdateParameters.java |  6 
 .../cassandra/cql3/selection/Selection.java |  2 +-
 .../cql3/selection/WritetimeOrTTLSelector.java  |  4 +--
 .../apache/cassandra/cql3/TimestampTest.java| 36 
 7 files changed, 56 insertions(+), 11 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/45084f18/src/java/org/apache/cassandra/cql3/selection/Selection.java
--
diff --cc src/java/org/apache/cassandra/cql3/selection/Selection.java
index 67cce72,000..cd5e2a8
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/cql3/selection/Selection.java
+++ b/src/java/org/apache/cassandra/cql3/selection/Selection.java
@@@ -1,390 -1,0 +1,390 @@@
 +/*
 + * 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.selection;
 +
 +import java.nio.ByteBuffer;
 +import java.util.ArrayList;
 +import java.util.Collection;
 +import java.util.Iterator;
 +import java.util.List;
 +
 +import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.config.ColumnDefinition;
 +import org.apache.cassandra.cql3.ColumnIdentifier;
 +import org.apache.cassandra.cql3.ColumnSpecification;
 +import org.apache.cassandra.cql3.ResultSet;
 +import org.apache.cassandra.db.Cell;
 +import org.apache.cassandra.db.CounterCell;
 +import org.apache.cassandra.db.ExpiringCell;
 +import org.apache.cassandra.db.context.CounterContext;
 +import org.apache.cassandra.exceptions.InvalidRequestException;
 +import org.apache.cassandra.utils.ByteBufferUtil;
 +
 +import com.google.common.collect.Iterators;
 +
 +public abstract class Selection
 +{
 +private final CollectionColumnDefinition columns;
 +private final ResultSet.Metadata metadata;
 +private final boolean collectTimestamps;
 +private final boolean collectTTLs;
 +
 +protected Selection(CollectionColumnDefinition columns, 
ListColumnSpecification metadata, boolean collectTimestamps, boolean 
collectTTLs)
 +{
 +this.columns = columns;
 +this.metadata = new ResultSet.Metadata(metadata);
 +this.collectTimestamps = collectTimestamps;
 +this.collectTTLs = collectTTLs;
 +}
 +
 +// Overriden by SimpleSelection when appropriate.
 +public boolean isWildcard()
 +{
 +return false;
 +}
 +
 +public ResultSet.Metadata getResultMetadata()
 +{
 +return metadata;
 +}
 +
 +public static Selection wildcard(CFMetaData cfm)
 +{
 +ListColumnDefinition all = new 
ArrayListColumnDefinition(cfm.allColumns().size());
 +Iterators.addAll(all, cfm.allColumnsInSelectOrder());
 +return new SimpleSelection(all, true);
 +}
 +
 +public static Selection forColumns(CollectionColumnDefinition columns)
 +{
 +return new SimpleSelection(columns, false);
 +}
 +
 +public int addColumnForOrdering(ColumnDefinition c)
 +{
 +columns.add(c);
 +metadata.addNonSerializedColumn(c);
 +return columns.size()

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

2014-10-29 Thread yukim

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

Branch: refs/heads/trunk
Commit: a2c4caa0068c7b480ce6889c47a022d7482e21d7
Parents: 7c595cb b6c9c35
Author: Yuki Morishita yu...@apache.org
Authored: Wed Oct 29 19:09:16 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Oct 29 19:09:16 2014 -0500

--
 .../cassandra/db/ColumnFamilyMetricTest.java | 19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2c4caa0/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
--
diff --cc test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
index e3e81d8,c91ed27..f09eb93
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java
@@@ -20,22 -20,22 +20,35 @@@ package org.apache.cassandra.db
  import java.nio.ByteBuffer;
  import java.util.Collection;
  
++import org.junit.BeforeClass;
  import org.junit.Test;
  
  import org.apache.cassandra.SchemaLoader;
- import org.apache.cassandra.io.sstable.SSTableReader;
++import org.apache.cassandra.config.KSMetaData;
+ import org.apache.cassandra.io.sstable.format.SSTableReader;
++import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.utils.ByteBufferUtil;
  
  import static org.junit.Assert.assertEquals;
  import static org.apache.cassandra.Util.cellname;
  
--public class ColumnFamilyMetricTest extends SchemaLoader
++public class ColumnFamilyMetricTest
  {
++@BeforeClass
++public static void defineSchema() throws Exception
++{
++SchemaLoader.prepareServer();
++SchemaLoader.createKeyspace(Keyspace1,
++SimpleStrategy.class,
++KSMetaData.optsWithRF(1),
++SchemaLoader.standardCFMD(Keyspace1, 
Standard2));
++}
++
  @Test
  public void testSizeMetric()
  {
  Keyspace keyspace = Keyspace.open(Keyspace1);
--ColumnFamilyStore store = keyspace.getColumnFamilyStore(Standard1);
++ColumnFamilyStore store = keyspace.getColumnFamilyStore(Standard2);
  store.disableAutoCompaction();
  
  store.truncateBlocking();

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

2014-10-29 Thread yukim

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

Branch: refs/heads/trunk
Commit: 3329cd79a80f09da1932a772b3615080fde06830
Parents: a2c4caa 62688d1
Author: Yuki Morishita yu...@apache.org
Authored: Wed Oct 29 19:14:00 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Oct 29 19:14:00 2014 -0500

--

--

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

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

Branch: refs/heads/trunk
Commit: 7e7cb6e375534bdfdf18f07f85acd06de7191185
Parents: 82e26b2 6e62030
Author: Jonathan Ellis jbel...@apache.org
Authored: Sat Oct 25 10:33:02 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sat Oct 25 10:33:02 2014 -0500

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


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

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

2014-10-24 Thread tylerhobbs

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/config/DatabaseDescriptor.java


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

Branch: refs/heads/trunk
Commit: 209ea6e9b1c02f37576ae195bf59803d31b30cbb
Parents: 2976e69 860cde7
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Oct 24 12:07:55 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Oct 24 12:07:55 2014 -0500

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/209ea6e9/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 00e875b,34bd39a..a448463
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -66,6 -66,6 +66,7 @@@ import org.apache.cassandra.net.Messagi
  import org.apache.cassandra.scheduler.IRequestScheduler;
  import org.apache.cassandra.scheduler.NoScheduler;
  import org.apache.cassandra.service.CacheService;
++import org.apache.cassandra.thrift.ThriftServer;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.FBUtilities;
  import org.apache.cassandra.utils.memory.HeapPool;

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

Branch: refs/heads/trunk
Commit: 658a86933c7f7280039a704a9df0658a402ae719
Parents: 3042aca 8e5fdc2
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Oct 23 13:11:10 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Oct 23 13:11:10 2014 -0500

--
 test/conf/logback-test.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

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

Branch: refs/heads/trunk
Commit: a0a30e03a1ff571b0804ea20c1575fa39542eb6b
Parents: c235603 3261d5e
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Oct 21 17:57:50 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Oct 21 17:57:50 2014 +0200

--
 CHANGES.txt |  2 +
 .../cql3/statements/SelectStatement.java| 39 +++-
 .../statements/SingleColumnRestriction.java | 10 +
 .../org/apache/cassandra/db/DataTracker.java|  4 +-
 .../io/sstable/IndexSummaryManager.java |  2 +-
 .../cassandra/io/sstable/SSTableRewriter.java   | 18 -
 .../cassandra/cql3/ContainsRelationTest.java| 22 +++
 .../io/sstable/IndexSummaryManagerTest.java |  2 +-
 .../cassandra/io/sstable/SSTableReaderTest.java |  2 +-
 9 files changed, 86 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0a30e03/CHANGES.txt
--
diff --cc CHANGES.txt
index 85cb24b,96a5e23..cdae72a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,6 +1,37 @@@
 +3.0
 + * 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.1
+  * Dont notify when replacing tmplink files (CASSANDRA-8157)
+  * Fix validation with multiple CONTAINS clause (CASSANDRA-8131)
   * Fix validation of collections in TriggerExecutor (CASSANDRA-8146)
   * Fix IllegalArgumentException when a list of IN values containing tuples
 is passed as a single arg to a prepared statement with the v1 or v2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0a30e03/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index ff905c1,233f3db..30c5390
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -31,8 -31,8 +31,9 @@@ import org.github.jamm.MemoryMeter
  
  import org.apache.cassandra.auth.Permission;
  import org.apache.cassandra.cql3.*;
+ import org.apache.cassandra.cql3.statements.SingleColumnRestriction.Contains;
  import org.apache.cassandra.db.composites.*;
 +import org.apache.cassandra.db.composites.Composite.EOC;
  import org.apache.cassandra.transport.messages.ResultMessage;
  import org.apache.cassandra.config.CFMetaData;
  import org.apache.cassandra.config.ColumnDefinition;

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

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

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

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

Branch: refs/heads/trunk
Commit: 8ee73941954d288978da1913ad574a9e81fefa85
Parents: c6de882 ba68130
Author: T Jake Luciani j...@apache.org
Authored: Mon Oct 20 13:33:35 2014 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Mon Oct 20 13:33:35 2014 -0400

--

--

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

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

Branch: refs/heads/trunk
Commit: fea7d9a0311ad5d52696d8bfaf920acfd191be84
Parents: c183f55 f4037ed
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Oct 17 11:55:26 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Oct 17 11:55:26 2014 +0200

--
 CHANGES.txt  |  1 +
 .../cql3/statements/DeleteStatement.java | 19 +++
 .../cql3/statements/ModificationStatement.java   | 14 +-
 3 files changed, 33 insertions(+), 1 deletion(-)
--


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

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

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

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

Branch: refs/heads/trunk
Commit: bb6b0d64edcc35958f95128f0996c4532bacc104
Parents: 027006d ed7eed8
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Oct 16 11:12:21 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Oct 16 11:12:21 2014 -0500

--
 CHANGES.txt |  4 +++
 .../service/pager/AbstractQueryPager.java   | 27 +++-
 .../service/pager/SliceQueryPager.java  | 10 +---
 3 files changed, 31 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb6b0d64/CHANGES.txt
--
diff --cc CHANGES.txt
index 4237862,67b25dc..772b6ef
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,6 +1,36 @@@
 +3.0
 + * 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.1
+  * Fix ClassCastException in DISTINCT query on static columns with
+query paging (CASSANDRA-8108)
   * Fix NPE on null nested UDT inside a set (CASSANDRA-8105)
   * Fix exception when querying secondary index on set items or map keys
 when some clustering columns are specified (CASSANDRA-8073)

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

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

Branch: refs/heads/trunk
Commit: 96f40e66b0eb3a41df0a116fa7da9db2f2b40e3f
Parents: bb6b0d6 2966b61
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Oct 16 19:16:54 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Oct 16 19:16:54 2014 +0300

--
 CHANGES.txt |  1 +
 .../cassandra/db/HintedHandOffManager.java  | 56 +++-
 .../cassandra/service/StorageService.java   |  2 +-
 .../apache/cassandra/db/HintedHandOffTest.java  |  7 +--
 4 files changed, 33 insertions(+), 33 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/96f40e66/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/96f40e66/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index b341276,46248cb..dac1705
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1963,9 -2020,12 +1963,9 @@@ public class StorageService extends Not
  {
  MigrationManager.instance.scheduleSchemaPull(endpoint, state);
  
 -if (isClientMode)
 -return;
 -
  if (tokenMetadata.isMember(endpoint))
  {
- HintedHandOffManager.instance.scheduleHintDelivery(endpoint);
+ HintedHandOffManager.instance.scheduleHintDelivery(endpoint, 
true);
  for (IEndpointLifecycleSubscriber subscriber : 
lifecycleSubscribers)
  subscriber.onUp(endpoint);
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/96f40e66/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
--
diff --cc test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index c49cc7a,c29c08e..13f9b2d
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@@ -23,25 -23,18 +23,22 @@@ package org.apache.cassandra.db
  import java.net.InetAddress;
  import java.util.Map;
  import java.util.UUID;
- import java.util.concurrent.TimeUnit;
  
 +import org.junit.BeforeClass;
  import org.junit.Test;
  
  import com.google.common.collect.Iterators;
  
  import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.Util;
 +import org.apache.cassandra.config.KSMetaData;
  import org.apache.cassandra.cql3.UntypedResultSet;
  import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
  import org.apache.cassandra.db.marshal.Int32Type;
  import org.apache.cassandra.db.marshal.UUIDType;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.utils.ByteBufferUtil;
- import org.apache.cassandra.utils.FBUtilities;
  
  import static org.junit.Assert.assertEquals;
  import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;

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

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

Branch: refs/heads/trunk
Commit: 175d34777b00ea201a4aa8b74f04ce48648cc8f9
Parents: 08a868f 1dea983
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Oct 16 18:35:49 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Oct 16 18:40:50 2014 +0200

--
 CHANGES.txt |   1 +
 NEWS.txt|   7 +
 pylib/cqlshlib/cql3handling.py  |   4 +
 pylib/cqlshlib/cqlhandling.py   |   3 +-
 .../DateTieredCompactionStrategy.java   | 399 +++
 .../DateTieredCompactionStrategyOptions.java| 100 +
 .../DateTieredCompactionStrategyTest.java   | 254 
 7 files changed, 767 insertions(+), 1 deletion(-)
--


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

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/175d3477/pylib/cqlshlib/cqlhandling.py
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/175d3477/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
index 000,ef189ba..eeb98b7
mode 00,100644..100644
--- 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
@@@ -1,0 -1,242 +1,254 @@@
+ /**
+  * 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.db.compaction;
+ 
+ import java.nio.ByteBuffer;
+ import java.util.*;
+ 
++import org.junit.BeforeClass;
+ import org.junit.Test;
+ 
+ import com.google.common.collect.Iterables;
+ import com.google.common.collect.Lists;
+ 
+ import org.apache.cassandra.SchemaLoader;
+ import org.apache.cassandra.Util;
++import org.apache.cassandra.config.KSMetaData;
+ import org.apache.cassandra.db.ColumnFamilyStore;
+ import org.apache.cassandra.db.DecoratedKey;
+ import org.apache.cassandra.db.Keyspace;
+ import org.apache.cassandra.db.Mutation;
+ import org.apache.cassandra.exceptions.ConfigurationException;
+ import org.apache.cassandra.io.sstable.SSTableReader;
++import org.apache.cassandra.locator.SimpleStrategy;
+ import org.apache.cassandra.utils.ByteBufferUtil;
+ import org.apache.cassandra.utils.Pair;
+ 
+ import static 
org.apache.cassandra.db.compaction.DateTieredCompactionStrategy.getBuckets;
+ import static 
org.apache.cassandra.db.compaction.DateTieredCompactionStrategy.newestBucket;
+ import static 
org.apache.cassandra.db.compaction.DateTieredCompactionStrategy.trimToThreshold;
+ import static 
org.apache.cassandra.db.compaction.DateTieredCompactionStrategy.filterOldSSTables;
+ import static 
org.apache.cassandra.db.compaction.DateTieredCompactionStrategy.validateOptions;
+ 
+ import static org.junit.Assert.*;
+ 
+ public class DateTieredCompactionStrategyTest extends SchemaLoader
+ {
 -public static final String KEYSPACE1 = Keyspace1;
++public static final String KEYSPACE1 = DateTieredCompactionStrategyTest;
+ private static final String CF_STANDARD1 = Standard1;
++@BeforeClass
++public static void defineSchema() throws ConfigurationException
++{
++

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

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

Branch: refs/heads/trunk
Commit: 0ca6beb6823bcf6f31c69454da98c1f53cd88780
Parents: 543fbc3 440824c
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Oct 17 03:40:46 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Oct 17 03:40:46 2014 +0300

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/BatchlogManager.java| 63 ++--
 .../cassandra/service/StorageService.java   | 25 ++--
 .../cassandra/db/BatchlogManagerTest.java   |  8 +--
 4 files changed, 57 insertions(+), 40 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ca6beb6/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
--

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

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

Branch: refs/heads/trunk
Commit: 25821864f7b8a9926761b9c93d5afeb637850a26
Parents: cd60129 4b7161d
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:34:26 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:34:26 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/db/commitlog/CommitLogArchiver.java   | 16 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
--


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

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

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

Branch: refs/heads/trunk
Commit: 18912409116e4ceb8cac037264e76c194fb879d6
Parents: 2582186 b76dc97
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:59:14 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:59:14 2014 -0700

--
 .../cassandra/db/commitlog/CommitLogArchiver.java  | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)
--

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

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

Branch: refs/heads/trunk
Commit: caf8b70508fa95d0a47d3ba52830033512dfa033
Parents: 13c4719 3a94b33
Author: Tyler Hobbs tylerho...@apache.org
Authored: Tue Oct 14 13:23:25 2014 -0500
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Tue Oct 14 13:23:25 2014 -0500

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/marshal/AsciiType.java  | 27 ++-
 .../org/apache/cassandra/transport/CBUtil.java  | 51 +---
 3 files changed, 71 insertions(+), 8 deletions(-)
--


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

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

2014-10-13 Thread yukim

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

Branch: refs/heads/trunk
Commit: 27fdf4211a3a8eb01367209d3d7121f40e044718
Parents: 9333f86 dee15a8
Author: Yuki Morishita yu...@apache.org
Authored: Mon Oct 13 12:11:40 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Mon Oct 13 12:11:40 2014 -0500

--
 CHANGES.txt |   1 +
 .../apache/cassandra/db/AtomicBTreeColumns.java | 138 ---
 src/java/org/apache/cassandra/db/Memtable.java  |  10 +-
 .../cassandra/utils/concurrent/Locks.java   |  37 +
 4 files changed, 166 insertions(+), 20 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/27fdf421/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
--
diff --cc src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
index 0572c4a,7b5e8a8..7a98cb9
--- a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
+++ b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
@@@ -35,10 -36,9 +36,11 @@@ import org.apache.cassandra.db.composit
  import org.apache.cassandra.db.composites.Composite;
  import org.apache.cassandra.db.filter.ColumnSlice;
  import org.apache.cassandra.utils.ObjectSizes;
 +import org.apache.cassandra.utils.SearchIterator;
  import org.apache.cassandra.utils.btree.BTree;
 +import org.apache.cassandra.utils.btree.BTreeSearchIterator;
  import org.apache.cassandra.utils.btree.UpdateFunction;
+ import org.apache.cassandra.utils.concurrent.Locks;
  import org.apache.cassandra.utils.concurrent.OpOrder;
  import org.apache.cassandra.utils.memory.HeapAllocator;
  import org.apache.cassandra.utils.memory.MemtableAllocator;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/27fdf421/src/java/org/apache/cassandra/db/Memtable.java
--

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

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

Branch: refs/heads/trunk
Commit: e473769fbffb04669b45633378f849f614169a19
Parents: fa592a4 11e8dc1
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Oct 11 21:44:44 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Oct 11 21:44:44 2014 +0300

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/ConsistencyLevel.java   |  4 ++--
 .../service/DatacenterWriteResponseHandler.java | 16 +---
 3 files changed, 12 insertions(+), 9 deletions(-)
--


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

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

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

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

Branch: refs/heads/trunk
Commit: 47863bc32d4273978f0e26532c24e61b67075423
Parents: 810c2d5 e711929
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Oct 10 16:57:38 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Oct 10 16:57:38 2014 +0300

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


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

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

2014-10-10 Thread aleksey

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/db/DefsTables.java


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

Branch: refs/heads/trunk
Commit: fa592a46bda084c7ec5579698c2a9e159923ddf3
Parents: 47863bc 42582ec
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Oct 10 20:27:52 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Oct 10 20:27:52 2014 +0300

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/db/DefsTables.java | 330 +--
 2 files changed, 156 insertions(+), 175 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa592a46/src/java/org/apache/cassandra/db/DefsTables.java
--
diff --cc src/java/org/apache/cassandra/db/DefsTables.java
index 14c5241,59f2e20..1693914
--- a/src/java/org/apache/cassandra/db/DefsTables.java
+++ b/src/java/org/apache/cassandra/db/DefsTables.java
@@@ -278,96 -308,50 +251,103 @@@ public class DefsTable
  
  // New keyspace with types
  for (Map.EntryDecoratedKey, ColumnFamily entry : 
diff.entriesOnlyOnRight().entrySet())
- {
- ColumnFamily cfTypes = entry.getValue();
- if (!cfTypes.hasColumns())
- continue;
- 
- for (UserType ut : UTMetaData.fromSchema(new Row(entry.getKey(), 
cfTypes)).values())
- addType(ut);
- }
+ if (entry.getValue().hasColumns())
+ created.addAll(UTMetaData.fromSchema(new Row(entry.getKey(), 
entry.getValue())).values());
  
- for (Map.EntryDecoratedKey, 
MapDifference.ValueDifferenceColumnFamily modifiedEntry : 
diff.entriesDiffering().entrySet())
+ for (Map.EntryDecoratedKey, 
MapDifference.ValueDifferenceColumnFamily entry : 
diff.entriesDiffering().entrySet())
  {
- DecoratedKey keyspace = modifiedEntry.getKey();
- ColumnFamily prevCFTypes = modifiedEntry.getValue().leftValue(); 
// state before external modification
- ColumnFamily newCFTypes = modifiedEntry.getValue().rightValue(); 
// updated state
+ String keyspaceName = 
AsciiType.instance.compose(entry.getKey().getKey());
  
- if (!prevCFTypes.hasColumns()) // whole keyspace was deleted and 
now it's re-created
+ ColumnFamily pre  = entry.getValue().leftValue();
+ ColumnFamily post = entry.getValue().rightValue();
+ 
+ if (pre.hasColumns()  post.hasColumns())
  {
- for (UserType ut : UTMetaData.fromSchema(new Row(keyspace, 
newCFTypes)).values())
- addType(ut);
+ MapDifferenceByteBuffer, UserType delta =
+ 
Maps.difference(Schema.instance.getKSMetaData(keyspaceName).userTypes.getAllTypes(),
+ UTMetaData.fromSchema(new 
Row(entry.getKey(), post)));
+ 
+ dropped.addAll(delta.entriesOnlyOnLeft().values());
+ created.addAll(delta.entriesOnlyOnRight().values());
+ Iterables.addAll(altered, 
Iterables.transform(delta.entriesDiffering().values(), new 
FunctionMapDifference.ValueDifferenceUserType, UserType()
+ {
+ public UserType 
apply(MapDifference.ValueDifferenceUserType pair)
+ {
+ return pair.rightValue();
+ }
+ }));
  }
- else if (!newCFTypes.hasColumns()) // whole keyspace is deleted
+ else if (pre.hasColumns())
  {
- for (UserType ut : UTMetaData.fromSchema(new Row(keyspace, 
prevCFTypes)).values())
- dropType(ut);
+ 
dropped.addAll(Schema.instance.getKSMetaData(keyspaceName).userTypes.getAllTypes().values());
  }
- else // has modifications in the types, need to perform nested 
diff to determine what was really changed
+ else if (post.hasColumns())
  {
- MapDifferenceByteBuffer, UserType typesDiff = 
Maps.difference(UTMetaData.fromSchema(new Row(keyspace, prevCFTypes)),
-   
  UTMetaData.fromSchema(new Row(keyspace, newCFTypes)));
- 
- for (UserType type :

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

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

Branch: refs/heads/trunk
Commit: a9bad890fede3fee534c9fd94340d960caf86b1c
Parents: 2fe5b9a 5a33a9a
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Oct 9 15:35:37 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Oct 9 15:35:37 2014 +0300

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  2 ++
 .../org/apache/cassandra/db/DataTracker.java|  7 +
 .../notifications/TruncationNotification.java   | 32 
 4 files changed, 42 insertions(+)
--


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

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

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

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

Branch: refs/heads/trunk
Commit: 7892b8355ca640055420e030b1c06e39b065452a
Parents: 50734f2 708adca
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Oct 9 11:10:29 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Oct 9 11:10:29 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7892b835/CHANGES.txt
--
diff --cc CHANGES.txt
index 16b450a,417e8c1..5ec542c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,5 +1,37 @@@
 +3.0
 + * Support for scripting languages in user-defined functions (CASSANDRA-7526)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Improve query to read paxos table on propose (CASSANDRA-7929)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Optimize java source-based UDF invocation (CASSANDRA-7924)
 + * 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)
 + * 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)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 +
 +
  2.1.1
+  * Allow concurrent use of CQLBulkOutputFormat (CASSANDRA-7776)
   * Shutdown JVM on OOM (CASSANDRA-7507)
   * Upgrade netty version and enable epoll event loop (CASSANDRA-7761)
   * Don't duplicate sstables smaller than split size when using

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

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

Branch: refs/heads/trunk
Commit: 2e8ba0364d6dba78d4dbc7253571180217be6cc8
Parents: 36edbda ed1681a
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Oct 8 01:22:56 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Oct 8 01:22:56 2014 +0300

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


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

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

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

2014-10-06 Thread jasobrown

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/thrift/SSLTransportFactory.java


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

Branch: refs/heads/trunk
Commit: f7266855218b8e9eb34a62ad933c4ed889a71c64
Parents: 3afd0a8 2601604
Author: Jason Brown jasobr...@apple.com
Authored: Mon Oct 6 14:56:35 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Oct 6 14:56:35 2014 -0700

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/thrift/SSLTransportFactory.java | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
--


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

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

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

2014-10-02 Thread marcuse

Merge branch 'cassandra-2.1' into trunk

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


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

Branch: refs/heads/trunk
Commit: 906fd4d81b5f814a7dcae4597576a5e34887b4e6
Parents: be199a0 97b1d9f
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Oct 2 10:44:51 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Oct 2 10:48:06 2014 +0200

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/db/ColumnFamily.java   |  32 ++--
 .../db/compaction/LazilyCompactedRow.java   |  36 +++--
 .../cassandra/io/sstable/ColumnStats.java   |  67 
 .../cassandra/io/sstable/SSTableWriter.java |  32 ++--
 .../cql3/SSTableMetadataTrackingTest.java   | 160 +++
 .../apache/cassandra/db/RangeTombstoneTest.java |  94 +++
 7 files changed, 385 insertions(+), 37 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/906fd4d8/src/java/org/apache/cassandra/db/ColumnFamily.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/906fd4d8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/906fd4d8/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
--
diff --cc test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
index 9da5f2f,e266bf6..2a6b952
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
@@@ -50,10 -51,9 +50,11 @@@ import org.apache.cassandra.db.index.Pe
  import org.apache.cassandra.db.index.SecondaryIndex;
  import org.apache.cassandra.db.index.SecondaryIndexSearcher;
  import org.apache.cassandra.db.marshal.Int32Type;
 +import org.apache.cassandra.db.marshal.IntegerType;
  import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.io.sstable.SSTableReader;
 +import org.apache.cassandra.locator.SimpleStrategy;
+ import org.apache.cassandra.io.sstable.metadata.StatsMetadata;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.concurrent.OpOrder;
  import org.apache.cassandra.utils.memory.MemtableAllocator;

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

Branch: refs/heads/trunk
Commit: f07c842080dbffde107b16b622e587ad7b08e8f5
Parents: d92932a 4743811
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Oct 2 11:22:19 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Oct 2 11:22:19 2014 +0200

--
 CHANGES.txt |  2 +
 .../db/marshal/DynamicCompositeType.java| 13 +++-
 .../unit/org/apache/cassandra/SchemaLoader.java |  2 +
 .../db/marshal/DynamicCompositeTypeTest.java| 79 ++--
 4 files changed, 90 insertions(+), 6 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f07c8420/test/unit/org/apache/cassandra/SchemaLoader.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f07c8420/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
index 7056a40,87e6ac9..eaedb4b
--- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
@@@ -49,8 -42,11 +49,10 @@@ public class DynamicCompositeTypeTes
  private static final DynamicCompositeType comparator;
  static
  {
 -MapByte, AbstractType? aliases = new HashMapByte, 
AbstractType?();
  aliases.put((byte)'b', BytesType.instance);
+ aliases.put((byte)'B', ReversedType.getInstance(BytesType.instance));
  aliases.put((byte)'t', TimeUUIDType.instance);
+ aliases.put((byte)'T', 
ReversedType.getInstance(TimeUUIDType.instance));
  comparator = DynamicCompositeType.getInstance(aliases);
  }

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

2014-10-02 Thread yukim

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

Branch: refs/heads/trunk
Commit: a479fe09beaffded53e2038d0abd3c5e0f8f0c77
Parents: d4c1e9c ca224b3
Author: Yuki Morishita yu...@apache.org
Authored: Thu Oct 2 12:16:55 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Thu Oct 2 12:16:55 2014 -0500

--
 CHANGES.txt | 1 +
 .../org/apache/cassandra/repair/RepairMessageVerbHandler.java   | 5 -
 2 files changed, 5 insertions(+), 1 deletion(-)
--


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

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

2014-09-30 Thread yukim

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

Branch: refs/heads/trunk
Commit: c5c3ee9261dcd8d782215f9f9f3a2ecbcca837f0
Parents: 318deca ef65d58
Author: Yuki Morishita yu...@apache.org
Authored: Tue Sep 30 11:38:10 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Sep 30 11:38:10 2014 -0500

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5c3ee92/src/java/org/apache/cassandra/streaming/StreamCoordinator.java
--

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

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

Branch: refs/heads/trunk
Commit: dffdae0c94352d99ebc147dae6282670315e8fd2
Parents: 6618bd8 c65ef9a
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Sep 23 18:59:18 2014 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Sep 23 18:59:18 2014 -0700

--
 .../cassandra/cql3/statements/SelectStatement.java   |  4 ++--
 .../cassandra/cql3/SelectWithTokenFunctionTest.java  | 11 +++
 2 files changed, 13 insertions(+), 2 deletions(-)
--


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

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

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

Branch: refs/heads/trunk
Commit: 77625187458beaadd8f964f8efba72292c012244
Parents: cfb7ace eecc034
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sat Sep 20 08:44:43 2014 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sat Sep 20 08:44:43 2014 +0100

--
 .../apache/cassandra/stress/StressAction.java   | 34 +++-
 .../cassandra/stress/settings/SettingsRate.java | 24 +++---
 2 files changed, 31 insertions(+), 27 deletions(-)
--

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

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

Branch: refs/heads/trunk
Commit: bcec4ea3d19feba3b4c8089872cea8cc070f44b9
Parents: 4c80d0f 1949212
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Sep 19 09:15:48 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Sep 19 09:15:48 2014 -0500

--
 .../org/apache/cassandra/service/AbstractWriteResponseHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

2014-09-19 Thread benedict

Merge branch 'cassandra-2.1' into trunk

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


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

Branch: refs/heads/trunk
Commit: 0956a8a717781c8a748931f04a18a215d7d53869
Parents: 3e305f8 0e83100
Author: Benedict Elliott Smith bened...@apache.org
Authored: Fri Sep 19 18:26:23 2014 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Fri Sep 19 18:26:23 2014 +0100

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/db/DataTracker.java|   5 +-
 .../compaction/AbstractCompactionStrategy.java  |  56 -
 .../db/compaction/CompactionManager.java| 199 +-
 .../cassandra/db/compaction/CompactionTask.java | 204 +--
 .../compaction/LeveledCompactionStrategy.java   |  43 ++--
 .../cassandra/db/compaction/Upgrader.java   |   3 +-
 .../cassandra/utils/CloseableIterator.java  |   2 +-
 .../LeveledCompactionStrategyTest.java  |   2 +-
 9 files changed, 289 insertions(+), 226 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0956a8a7/CHANGES.txt
--
diff --cc CHANGES.txt
index e00d990,f55e5d2..0af1681
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,5 +1,30 @@@
 +3.0
 + * 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)
 + * 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
+  * Fix resource leak in event of corrupt sstable
   * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
   * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
   * Invalidate prepared statements when their keyspace or table is

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0956a8a7/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
--
diff --cc 
src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
index 28ab84e,97696a8..6a0e0df
--- 
a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
+++ 
b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
@@@ -19,8 -19,10 +19,9 @@@ package org.apache.cassandra.db.compact
  
  import java.util.*;
  
+ import com.google.common.base.Throwables;
  import com.google.common.collect.ImmutableMap;
  import com.google.common.base.Predicate;
 -import com.google.common.collect.ImmutableMap;
  import com.google.common.collect.Iterables;
  import com.google.common.util.concurrent.RateLimiter;
  import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0956a8a7/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 85b7e38,e309cfb..0f8acba
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -1031,78 -990,63 +1040,74 @@@ public class CompactionManager implemen
  if (!new File(sstable.getFilename()).exists())
  {
  logger.info(Skipping anticompaction for {}, required sstable

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

2014-09-19 Thread mishail

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

Branch: refs/heads/trunk
Commit: cfb7aceac5f4c53767c1f1b95656c0ca33946851
Parents: 2a59f81 6e5dd23
Author: Mikhail Stepura mish...@apache.org
Authored: Fri Sep 19 18:24:17 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Fri Sep 19 18:24:17 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb7acea/CHANGES.txt
--
diff --cc CHANGES.txt
index a55488f,2f8a95b..0f94df9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,5 +1,30 @@@
 +3.0
 + * 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)
 + * 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
+  * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
   * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891)
   * Fix resource leak in event of corrupt sstable
   * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)

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

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

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

Branch: refs/heads/trunk
Commit: b18478d05771d730ffaba0b236570b523e5a16e8
Parents: 381ff18 74877bb
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Sep 18 08:12:39 2014 +
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Sep 18 08:12:39 2014 +

--

--

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

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

Branch: refs/heads/trunk
Commit: a810c477d983b4f7aa54892a8244063825bcd9b6
Parents: b18478d 3dd2f00
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Sep 18 12:37:01 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Sep 18 12:37:01 2014 -0500

--
 CHANGES.txt |  4 +-
 .../org/apache/cassandra/transport/Message.java | 76 +++-
 .../transport/messages/ErrorMessage.java| 15 +++-
 3 files changed, 90 insertions(+), 5 deletions(-)
--


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

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

2014-09-18 Thread mishail

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

Branch: refs/heads/trunk
Commit: e9f94447ed3f53b5f6050dda6772f44c5daaabc1
Parents: a810c47 146b8e3
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Sep 18 13:31:08 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Sep 18 13:31:08 2014 -0700

--
 CHANGES.txt |  1 +
 bin/cqlsh   | 46 ++
 2 files changed, 31 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9f94447/CHANGES.txt
--
diff --cc CHANGES.txt
index 254fe2b,a34e0b1..ddc115e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,5 +1,30 @@@
 +3.0
 + * 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)
 + * 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
+  * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
   * Provide visibility into prepared statements churn (CASSANDRA-7921)
   * Invalidate prepared statements when their keyspace or table is
 dropped (CASSANDRA-7566)

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

2014-09-17 Thread yukim

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

Branch: refs/heads/trunk
Commit: 87ba0dc1bce26ab97f5dd26edfd4a5c91ef9df48
Parents: 50c27cc 125b464
Author: Yuki Morishita yu...@apache.org
Authored: Wed Sep 17 09:48:14 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Sep 17 09:48:14 2014 -0500

--
 .../cassandra/service/StorageService.java   |  92 +---
 .../org/apache/cassandra/tools/NodeTool.java|   2 +-
 .../service/StorageServiceServerTest.java   | 210 ++-
 3 files changed, 267 insertions(+), 37 deletions(-)
--


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

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

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

2014-09-17 Thread yukim

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

Branch: refs/heads/trunk
Commit: 134c2e96929ce82f347815d72a476184332c6016
Parents: 9553dae 7c34d8b
Author: Yuki Morishita yu...@apache.org
Authored: Wed Sep 17 15:14:46 2014 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Sep 17 15:14:46 2014 -0500

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


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

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

2014-09-17 Thread xedin

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

Branch: refs/heads/trunk
Commit: 065cd67ab2fcac348e1b1a48bc22aa3ae3a4adfa
Parents: a8285fe 8026163
Author: Pavel Yaskevich xe...@apache.org
Authored: Wed Sep 17 22:35:27 2014 -0700
Committer: Pavel Yaskevich xe...@apache.org
Committed: Wed Sep 17 22:35:27 2014 -0700

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/RowIndexEntry.java  | 16 -
 .../apache/cassandra/db/RowIndexEntryTest.java  | 69 
 3 files changed, 85 insertions(+), 1 deletion(-)
--


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

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

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

Branch: refs/heads/trunk
Commit: 674808340422d473579f27cee5829004cc21d241
Parents: 065cd67 dfe1f23
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Sep 17 22:47:05 2014 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Sep 17 22:47:05 2014 -0700

--
 CHANGES.txt|  1 +
 src/java/org/apache/cassandra/service/ClientState.java | 12 
 2 files changed, 5 insertions(+), 8 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/67480834/src/java/org/apache/cassandra/service/ClientState.java
--
diff --cc src/java/org/apache/cassandra/service/ClientState.java
index 2fd9b68,af4dead..20682e9
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@@ -25,7 -25,9 +25,8 @@@ import java.util.concurrent.TimeUnit
  import com.google.common.cache.CacheBuilder;
  import com.google.common.cache.CacheLoader;
  import com.google.common.cache.LoadingCache;
+ import com.google.common.collect.Iterables;
  import com.google.common.collect.Sets;
 -import org.apache.commons.lang3.StringUtils;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;

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

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

Branch: refs/heads/trunk
Commit: 196e5146d300986760fee83bc4fdcfb18e35bb5e
Parents: 38d5178 681c380
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Sep 16 13:22:50 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Sep 16 13:22:50 2014 -0500

--
 CHANGES.txt |  1 +
 .../apache/cassandra/cql3/QueryProcessor.java   | 53 +---
 .../cassandra/metrics/CqlStatementMetrics.java  |  1 +
 3 files changed, 36 insertions(+), 19 deletions(-)
--


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

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

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

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

Branch: refs/heads/trunk
Commit: 61a27af490a2ba6111baecaf5b12fd2ede3f64de
Parents: 196e514 b319b40
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Sep 16 14:10:25 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Sep 16 14:10:25 2014 -0500

--
 CHANGES.txt |  1 -
 .../apache/cassandra/cql3/QueryProcessor.java   | 53 +++-
 .../cassandra/metrics/CqlStatementMetrics.java  |  1 -
 3 files changed, 19 insertions(+), 36 deletions(-)
--


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

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

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

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

Branch: refs/heads/trunk
Commit: 8215744ffb38d496d878e4c1705d066d3ff314e0
Parents: 61a27af 109313c
Author: Benedict Elliott Smith bened...@apache.org
Authored: Tue Sep 16 20:48:57 2014 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Tue Sep 16 20:48:57 2014 +0100

--
 CHANGES.txt   | 1 +
 .../org/apache/cassandra/stress/settings/OptionReplication.java   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8215744f/CHANGES.txt
--
diff --cc CHANGES.txt
index 2db88fb,1764a20..593310a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
 +3.0
 + * Improve compaction logging (CASSANDRA-7818)
 + * 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
+  * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
   * Fix saving caches when a table is dropped (CASSANDRA-7784)
   * Add better error checking of new stress profile (CASSANDRA-7716)
   * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom 
(CASSANDRA-7934)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8215744f/tools/stress/src/org/apache/cassandra/stress/settings/OptionReplication.java
--

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

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

Branch: refs/heads/trunk
Commit: e225176b31413c3c5f31885eac364fa06deaca2e
Parents: fb6c285 094aa8e
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Sep 15 06:53:18 2014 +
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Sep 15 06:53:18 2014 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e225176b/CHANGES.txt
--
diff --cc CHANGES.txt
index 1e08d3c,608e4b1..bf3567f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 +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
+  * 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
   * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)

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

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

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

Branch: refs/heads/trunk
Commit: 969967cf9f5597a32d1a8d2575434f8088add87e
Parents: 35af28e 6bff5a3
Author: Benedict Elliott Smith bened...@apache.org
Authored: Mon Sep 15 16:56:50 2014 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Mon Sep 15 16:56:50 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/969967cf/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
--

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

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

Branch: refs/heads/trunk
Commit: 56674e0e59b9e7c189257af1c573db85ea566068
Parents: 7b5164f 3909567
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Sep 15 20:16:24 2014 +
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Sep 15 20:16:24 2014 +

--
 debian/patches/002cassandra_logdir_fix.dpatch | 19 +++
 debian/patches/00list |  1 +
 2 files changed, 20 insertions(+)
--

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

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

Branch: refs/heads/trunk
Commit: 7fc0e9efead0752532f492c9396c602a9d9fd0a1
Parents: ff60429 4efb6dc
Author: Benedict Elliott Smith bened...@apache.org
Authored: Tue Sep 16 06:29:00 2014 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Tue Sep 16 06:29:00 2014 +0100

--
 .../apache/cassandra/stress/StressMetrics.java  |  9 +--
 .../cassandra/stress/settings/SettingsNode.java | 25 +++-
 .../cassandra/stress/util/JmxCollector.java | 12 +++---
 .../stress/util/SmartThriftClient.java  |  3 +--
 4 files changed, 41 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fc0e9ef/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
--
diff --cc tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
index b2b4972,00f479e..7dba724
--- a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
@@@ -29,9 -29,10 +29,10 @@@ import java.util.concurrent.CountDownLa
  import java.util.concurrent.ThreadFactory;
  import java.util.concurrent.TimeUnit;
  
 +import com.google.common.util.concurrent.Uninterruptibles;
  import org.apache.commons.lang3.time.DurationFormatUtils;
 -
  import org.apache.cassandra.concurrent.NamedThreadFactory;
+ import org.apache.cassandra.stress.settings.SettingsLog;
  import org.apache.cassandra.stress.settings.StressSettings;
  import org.apache.cassandra.stress.util.JmxCollector;
  import org.apache.cassandra.stress.util.Timing;

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

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

Branch: refs/heads/trunk
Commit: 477c54c03cb708911d2173a0730b189ad844e2da
Parents: 0808166 0e652e7
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sun Sep 14 09:09:57 2014 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sun Sep 14 09:09:57 2014 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/service/GCInspector.java   |  83 -
 .../cassandra/service/GCInspectorMXBean.java|  25 
 .../org/apache/cassandra/tools/NodeProbe.java   |  11 +-
 .../org/apache/cassandra/tools/NodeTool.java|  15 +++
 .../apache/cassandra/stress/StressAction.java   |   2 +-
 .../apache/cassandra/stress/StressMetrics.java  |  60 --
 .../cassandra/stress/settings/SettingsPort.java |   3 +
 .../cassandra/stress/util/JmxCollector.java | 119 +++
 .../apache/cassandra/stress/util/Timing.java|  36 --
 10 files changed, 330 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/477c54c0/CHANGES.txt
--
diff --cc CHANGES.txt
index c35e5b2,4c39f5c..e9d48e9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 +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
+  * GCInspector more closely tracks GC; cassandra-stress and nodetool report it
   * 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/477c54c0/src/java/org/apache/cassandra/tools/NodeProbe.java
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/477c54c0/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
--
diff --cc tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
index 0ef5df1,9e8e961..3f6f9c6
--- a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
@@@ -27,9 -28,11 +28,11 @@@ import java.util.concurrent.CountDownLa
  import java.util.concurrent.ThreadFactory;
  import java.util.concurrent.TimeUnit;
  
 +import com.google.common.util.concurrent.Uninterruptibles;
  import org.apache.commons.lang3.time.DurationFormatUtils;
 -
  import org.apache.cassandra.concurrent.NamedThreadFactory;
+ import org.apache.cassandra.stress.settings.StressSettings;
+ import org.apache.cassandra.stress.util.JmxCollector;
  import org.apache.cassandra.stress.util.Timing;
  import org.apache.cassandra.stress.util.TimingInterval;
  import org.apache.cassandra.stress.util.Uncertainty;

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

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

Branch: refs/heads/trunk
Commit: 14b1c96072dfdfccb8c1a2c10e8feb4b8189846f
Parents: 477c54c eea042b
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sun Sep 14 09:13:44 2014 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sun Sep 14 09:13:44 2014 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/stress/settings/SettingsNode.java | 47 ++-
 .../stress/settings/StressSettings.java |  5 +-
 .../cassandra/stress/util/JavaDriverClient.java | 16 -
 .../stress/util/SmartThriftClient.java  | 62 ++--
 5 files changed, 106 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14b1c960/CHANGES.txt
--
diff --cc CHANGES.txt
index e9d48e9,7e18719..1e08d3c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 +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
+  * cassandra-stress supports whitelist mode for node config
   * GCInspector more closely tracks GC; cassandra-stress and nodetool report it
   * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
   * Add human readable option to nodetool commands (CASSANDRA-5433)

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

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

Branch: refs/heads/trunk
Commit: 58985409c9e7883bd1362687413771dcbc90ccf7
Parents: 14b1c96 a6678a2
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sun Sep 14 13:51:08 2014 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sun Sep 14 13:51:08 2014 +0100

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

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

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

Branch: refs/heads/trunk
Commit: 319d9e13c98f11d1769cfa6940f8d805dd5a9406
Parents: 57016e6 1cef273
Author: Brandon Williams brandonwilli...@apache.org
Authored: Sat Sep 13 12:17:18 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Sat Sep 13 12:17:18 2014 -0500

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/tools/NodeTool.java| 73 ++--
 2 files changed, 51 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/319d9e13/CHANGES.txt
--
diff --cc CHANGES.txt
index d04814e,7f10ca5..488f4fd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 +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
+  * Add human readable option to nodetool commands (CASSANDRA-5433)
   * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
   * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
   * (cqlsh) tab-completion for triggers (CASSANDRA-7824)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/319d9e13/src/java/org/apache/cassandra/tools/NodeTool.java
--
diff --cc src/java/org/apache/cassandra/tools/NodeTool.java
index 9fbee9c,cc38107..8f0dcef
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@@ -605,15 -616,20 +616,20 @@@ public class NodeToo
  }
  }
  
 -@Command(name = cfstats, description = Print statistics on column 
families)
 +@Command(name = cfstats, description = Print statistics on tables)
  public static class CfStats extends NodeToolCmd
  {
 -@Arguments(usage = [keyspace.cfname...], description = List of 
column families (or keyspace) names)
 +@Arguments(usage = [keyspace.table...], description = List of 
tables (or keyspace) names)
  private ListString cfnames = new ArrayList();
  
 -@Option(name = -i, description = Ignore the list of column 
families and display the remaining cfs)
 +@Option(name = -i, description = Ignore the list of tables and 
display the remaining cfs)
  private boolean ignore = false;
  
+ @Option(title = human_readable,
+ name = {-H, --human-readable},
+ description = Display bytes in human readable form, i.e. KB, 
MB, GB, TB)
+ private boolean humanReadable = false;
+ 
  @Override
  public void execute(NodeProbe probe)
  {

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

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

Branch: refs/heads/trunk
Commit: 0808166375ba3fc08f09d1a7637de3cb0094ddcd
Parents: 4191967 d002c7e
Author: Brandon Williams brandonwilli...@apache.org
Authored: Sat Sep 13 18:04:41 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Sat Sep 13 18:04:41 2014 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/service/StorageService.java   | 33 
 .../org/apache/cassandra/tools/NodeTool.java| 40 
 3 files changed, 59 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/08081663/CHANGES.txt
--
diff --cc CHANGES.txt
index 488f4fd,6e029ab..c35e5b2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 +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
+  * 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)
   * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/08081663/src/java/org/apache/cassandra/tools/NodeTool.java
--
diff --cc src/java/org/apache/cassandra/tools/NodeTool.java
index 8f0dcef,e7d1404..0bfbc13
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@@ -1892,11 -1909,15 +1909,16 @@@ public class NodeToo
  {
  ownerships = probe.effectiveOwnership(keyspace);
  hasEffectiveOwns = true;
 -} catch (IllegalStateException e)
 +}
 +catch (IllegalStateException e)
  {
  ownerships = probe.getOwnership();
- System.out.printf(Note: Ownership information does not 
include topology; for complete information, specify a keyspace%n);
+ errors.append(Note:  + e.getMessage() + %n);
+ }
+ catch (IllegalArgumentException ex)
+ {
+ System.out.printf(%nError:  + ex.getMessage() + %n);
+ return;
  }
  
  MapString, SetHostStat dcs = getOwnershipByDc(probe, resolveIp, 
tokensToEndpoints, ownerships);

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

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

Branch: refs/heads/trunk
Commit: 7b495e25017b73096f784a31fe224cebe439e24e
Parents: ec1f8f9 23b957c
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Sep 12 13:15:06 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Sep 12 13:15:06 2014 -0500

--
 debian/init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

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

Branch: refs/heads/trunk
Commit: 793630a950fce4da5190222fa3bfe1d13237c1c6
Parents: a002a0e d93a580
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Sep 12 17:46:10 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Sep 12 17:46:10 2014 -0500

--
 .../org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 1 +
 1 file changed, 1 insertion(+)
--

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

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

Branch: refs/heads/trunk
Commit: e7752549d586a98befff72768a09550dba1b4456
Parents: 14372cd 5fb32ba
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Sep 10 17:21:32 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Sep 10 17:21:32 2014 -0500

--
 test/cassandra.in.sh | 54 ---
 1 file changed, 54 deletions(-)
--

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

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

Branch: refs/heads/trunk
Commit: 51a6f0f7facb4eed17d34702f9527ac7fd1aef75
Parents: e775254 530c9f5
Author: Benedict Elliott Smith bened...@apache.org
Authored: Thu Sep 11 11:28:36 2014 +0700
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Thu Sep 11 11:28:36 2014 +0700

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

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

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

Branch: refs/heads/trunk
Commit: 1963b7f032b2faf31f6bda545330e8146a44ea45
Parents: 51a6f0f 73b2dcc
Author: Benedict Elliott Smith bened...@apache.org
Authored: Thu Sep 11 12:36:08 2014 +0700
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Thu Sep 11 12:36:08 2014 +0700

--
 .../cassandra/stress/settings/GroupedOptions.java   | 16 
 .../cassandra/stress/settings/OptionSimple.java |  5 +
 .../stress/settings/SettingsCommandPreDefined.java  |  6 ++
 .../settings/SettingsCommandPreDefinedMixed.java|  7 ++-
 .../stress/settings/SettingsCommandUser.java|  7 +--
 5 files changed, 30 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1963b7f0/tools/stress/src/org/apache/cassandra/stress/settings/GroupedOptions.java
--

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

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

Branch: refs/heads/trunk
Commit: b1774b7879e4deff0f60cb8496ef59e81ba167b7
Parents: b867050 1456ec8
Author: Mikhail Stepura mish...@apache.org
Authored: Tue Sep 9 15:13:12 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Tue Sep 9 15:13:12 2014 -0700

--
 CHANGES.txt|  1 +
 bin/cqlsh  |  8 
 doc/cql3/CQL.textile   | 33 +
 pylib/cqlshlib/cql3handling.py | 24 
 4 files changed, 66 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1774b78/CHANGES.txt
--
diff --cc CHANGES.txt
index c151969,1706faf..f264cd7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
 +3.0
 + * 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
+  * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
   * (cqlsh): Support for query paging (CASSANDRA-7514)
   * (cqlsh): Show progress of COPY operations (CASSANDRA-7789)
   * Add syntax to remove multiple elements from a map (CASSANDRA-6599)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1774b78/pylib/cqlshlib/cql3handling.py
--
diff --cc pylib/cqlshlib/cql3handling.py
index 9512a8b,43882de..63d6a69
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -228,12 -228,12 +228,14 @@@ JUNK ::= /([ \t\r\f\v]+|(--|[/][/])[^\n
| createColumnFamilyStatement
| createIndexStatement
| createUserTypeStatement
 +  | createFunctionStatement
+   | createTriggerStatement
| dropKeyspaceStatement
| dropColumnFamilyStatement
| dropIndexStatement
| dropUserTypeStatement
 +  | dropFunctionStatement
+   | dropTriggerStatement
| alterTableStatement
| alterKeyspaceStatement
| alterUserTypeStatement

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

2014-09-09 Thread slebresne

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java


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

Branch: refs/heads/trunk
Commit: 25272a4732e75f142fb521b46eb394606d0483aa
Parents: c200851 3ba392f
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Sep 9 16:41:00 2014 -0700
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Sep 9 16:41:00 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/hadoop/cql3/CqlConfigHelper.java  | 25 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/25272a47/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--

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

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

Branch: refs/heads/trunk
Commit: 2cba3fc95117b74b7cfb82d39c0ddb8b1829536d
Parents: 25272a4 9b9bf45
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Sep 9 18:39:53 2014 -0700
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Sep 9 18:39:53 2014 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/db/ArrayBackedSortedColumns.java  |  5 ++
 .../io/sstable/AbstractSSTableSimpleWriter.java | 11 ++-
 .../cassandra/io/sstable/CQLSSTableWriter.java  | 81 
 .../io/sstable/SSTableSimpleUnsortedWriter.java | 38 ++---
 .../io/sstable/CQLSSTableWriterTest.java| 39 ++
 6 files changed, 143 insertions(+), 32 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cba3fc9/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cba3fc9/src/java/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.java
--

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

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

Branch: refs/heads/trunk
Commit: 1198df4beb50c03a7900ff55cd11dde8aff6c377
Parents: 6cb1f07 4bdbdc1
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Mon Sep 8 22:21:59 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Mon Sep 8 22:21:59 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1198df4b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
--

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

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

Branch: refs/heads/trunk
Commit: f203f0f3f9506736e3cc3309a67182a413fa575c
Parents: eec381e a44d641
Author: Benedict Elliott Smith bened...@apache.org
Authored: Mon Sep 8 08:06:45 2014 +0700
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Mon Sep 8 08:06:45 2014 +0700

--

--

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

2014-09-07 Thread mishail

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

Branch: refs/heads/trunk
Commit: f34e829a2f583bf8b6b06c3099abba35902a5b81
Parents: f203f0f f1f5f5f
Author: Mikhail Stepura mish...@apache.org
Authored: Sun Sep 7 20:09:56 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Sun Sep 7 20:09:56 2014 -0700

--
 CHANGES.txt  |   1 +
 bin/cqlsh| 165 +-
 pylib/cqlshlib/test/test_cqlsh_completion.py |   2 +-
 3 files changed, 97 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f34e829a/CHANGES.txt
--
diff --cc CHANGES.txt
index 674a72d,7737269..a9be239
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 +3.0
 + * 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
+  * (cqlsh): Support for query paging (CASSANDRA-7514)
   * (cqlsh): Show progress of COPY operations (CASSANDRA-7789)
   * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
   * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)

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

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

Branch: refs/heads/trunk
Commit: d5cfe2b4ab4139955a92667d0fecac880cbdfa0b
Parents: b4839a3 350a94c
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Sep 5 10:54:40 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Sep 5 10:54:40 2014 +0200

--
 .../unit/org/apache/cassandra/cql3/DeleteTest.java | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)
--

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

2014-09-05 Thread marcuse

Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/tools/NodeProbe.java


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

Branch: refs/heads/trunk
Commit: 37a9d405c7fe5de84450e20960d94a134d3e85e9
Parents: 719bb39 dd972e6
Author: Marcus Eriksson marc...@apache.org
Authored: Fri Sep 5 11:10:40 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Fri Sep 5 11:10:40 2014 +0200

--
 CHANGES.txt |  2 ++
 .../db/compaction/CompactionManager.java|  9 +-
 .../cassandra/service/StorageService.java   | 12 
 .../cassandra/service/StorageServiceMBean.java  |  6 ++--
 .../org/apache/cassandra/tools/NodeProbe.java   | 30 
 5 files changed, 31 insertions(+), 28 deletions(-)
--


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

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/37a9d405/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java
index a0d4db7,3f3073d..55f462e
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@@ -203,34 -203,28 +203,28 @@@ public class NodeProbe implements AutoC
  
  public void forceKeyspaceCleanup(PrintStream out, String keyspaceName, 
String... columnFamilies) throws IOException, ExecutionException, 
InterruptedException
  {
- switch (forceKeyspaceCleanup(keyspaceName, columnFamilies))
+ if (forceKeyspaceCleanup(keyspaceName, columnFamilies) != 0)
  {
- case ABORTED:
- failed = true;
- out.println(Aborted cleaning up atleast one table in 
keyspace +keyspaceName+, check server logs for more information.);
- break;
+ failed = true;
 -out.println(Aborted cleaning up atleast one column family in 
keyspace +keyspaceName+, check server logs for more information.);
++out.println(Aborted cleaning up atleast one table in keyspace 
+keyspaceName+, check server logs for more information.);
  }
  }
  
  public void scrub(PrintStream out, boolean disableSnapshot, boolean 
skipCorrupted, String keyspaceName, String... columnFamilies) throws 
IOException, ExecutionException, InterruptedException
  {
- switch (scrub(disableSnapshot, skipCorrupted, keyspaceName, 
columnFamilies))
+ if (scrub(disableSnapshot, skipCorrupted, keyspaceName, 
columnFamilies) != 0)
  {
- case ABORTED:
- failed = true;
- out.println(Aborted scrubbing atleast one table in keyspace 
+keyspaceName+, check server logs for more information.);
- break;
+ failed = true;
 -out.println(Aborted scrubbing atleast one column family in 
keyspace +keyspaceName+, check server logs for more information.);
++out.println(Aborted scrubbing atleast one table in keyspace 
+keyspaceName+, check server logs for more information.);
  }
  }
  
  public void upgradeSSTables(PrintStream out, String keyspaceName, boolean 
excludeCurrentVersion, String... columnFamilies) throws IOException, 
ExecutionException, InterruptedException
  {
- switch (upgradeSSTables(keyspaceName, excludeCurrentVersion, 
columnFamilies))
+ if (upgradeSSTables(keyspaceName, excludeCurrentVersion, 
columnFamilies) != 0)
  {
- case ABORTED:
- failed = true;
- out.println(Aborted upgrading sstables for atleast one table 
in keyspace +keyspaceName+, check server logs for more information.);
- break;
+ failed = true;
 -out.println(Aborted upgrading sstables for atleast one column 
family in keyspace +keyspaceName+, check server logs for more information.);
++out.println(Aborted upgrading sstables for atleast one table in 
keyspace +keyspaceName+, check server logs for more information.);
  }
  }

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

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

Branch: refs/heads/trunk
Commit: 022932338261a1491b0172cce3b5f0e6e5a3e04b
Parents: fbc0f44 037963c
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Sep 5 11:10:56 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Sep 5 11:10:56 2014 -0500

--
 CHANGES.txt |   1 +
 ...assandra-driver-internal-only-2.1.0.post.zip | Bin 128879 - 129435 bytes
 2 files changed, 1 insertion(+)
--


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

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

2014-09-04 Thread mishail

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

Branch: refs/heads/trunk
Commit: 2f3fab14f055fe64d5091171d2e7d54899fe63c5
Parents: befd0b9 c54126b
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Sep 4 13:36:36 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Sep 4 13:36:36 2014 -0700

--
 pylib/cqlshlib/test/test_keyspace_init.cql | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--

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

Branch: refs/heads/trunk
Commit: 1bc8ffdae24f1362aa04088991ad44b84e194d13
Parents: f92d00c bff7572
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Sep 1 09:13:32 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Sep 1 09:13:32 2014 +0200

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


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

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

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

Branch: refs/heads/trunk
Commit: d931629ca822a3074ac1f8f5c6d8accadb265d14
Parents: f18108d ec09753
Author: Jake Luciani j...@apache.org
Authored: Wed Aug 27 11:08:07 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Wed Aug 27 11:08:07 2014 -0400

--
 .../db/commitlog/CommitLogSegmentManager.java   | 15 
 .../cql3/DropKeyspaceCommitLogRecycleTest.java  | 91 
 2 files changed, 106 insertions(+)
--

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

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

Branch: refs/heads/trunk
Commit: af8c2a3ab6ad90a9a9b9815a2c4c781182b65987
Parents: 0d0aed8 4327c29
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Aug 27 11:03:51 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Aug 27 11:03:51 2014 -0500

--
 CHANGES.txt   |  1 +
 src/java/org/apache/cassandra/service/StorageService.java | 10 ++
 src/java/org/apache/cassandra/streaming/StreamPlan.java   |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)
--


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

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

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

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

Branch: refs/heads/trunk
Commit: bf52074f6b66d468da0e9facddf291f3b472c07e
Parents: af8c2a3 c7f9c8d
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Aug 27 14:22:38 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Aug 27 14:22:38 2014 -0500

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


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

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

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

2014-08-27 Thread mishail

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

Branch: refs/heads/trunk
Commit: b31787435a44fa8168fd18b4bfeb1d06544fb3af
Parents: bf52074 d01250d
Author: Mikhail Stepura mish...@apache.org
Authored: Wed Aug 27 15:44:23 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Wed Aug 27 15:44:23 2014 -0700

--
 CHANGES.txt|  1 +
 bin/cqlsh  | 27 +
 pylib/cqlshlib/async_insert.py | 13 
 pylib/cqlshlib/meter.py| 59 +
 4 files changed, 79 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3178743/CHANGES.txt
--
diff --cc CHANGES.txt
index d33af9a,4fb773d..f04d6c5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
 +3.0
 + * 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
+  * (cqlsh): Show progress of COPY operations (CASSANDRA-7789)
   * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
   * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
   * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)

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

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

Branch: refs/heads/trunk
Commit: b743eabd7a12603b8e6a56cd818355560e5c0cf4
Parents: 3648549 dac984f
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Aug 23 01:05:47 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Aug 23 01:05:47 2014 +0300

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


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

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

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

Branch: refs/heads/trunk
Commit: 5ec10197f970ab5753a111947cf2a94b1ea287d9
Parents: 8bd1bf6 f36d1b5
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Aug 21 10:38:01 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Aug 21 10:38:01 2014 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/io/sstable/SSTableDeletingTask.java   | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


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

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

2014-08-21 Thread mishail

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

Branch: refs/heads/trunk
Commit: bc9dc0f0a0c135f0697eb48e02c38199feb0e40f
Parents: b281f33 854aab7
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Aug 21 19:57:54 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Aug 21 19:57:54 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc9dc0f0/CHANGES.txt
--
diff --cc CHANGES.txt
index bf861c9,5a1767a..711ca08
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
 +3.0
 + * 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
+  * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
   * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
   * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
 output (CASSANDRA-7659)

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

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

Branch: refs/heads/trunk
Commit: b42a15b896334ec4a6a1c71a11a641d253d709b1
Parents: e6668be 1aea6d5
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Aug 20 17:52:04 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Aug 20 17:52:04 2014 -0500

--
 CHANGES.txt|  2 ++
 bin/cqlsh  | 16 +---
 pylib/cqlshlib/cql3handling.py |  8 
 3 files changed, 15 insertions(+), 11 deletions(-)
--


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

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

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

Branch: refs/heads/trunk
Commit: 96addeedf6e355d35f5e554344ee781d351efa42
Parents: 7192f17 3a03d4b
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Aug 19 14:55:30 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Aug 19 14:55:30 2014 -0500

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


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

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

2014-08-19 Thread mishail

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

Branch: refs/heads/trunk
Commit: c69f257f9e5f14ce36f0aa8e91bc7eb13ce2d7b8
Parents: 96addee a323a1a
Author: Mikhail Stepura mish...@apache.org
Authored: Tue Aug 19 13:23:30 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Tue Aug 19 13:23:30 2014 -0700

--
 CHANGES.txt|   1 +
 bin/cqlsh  |  50 
 pylib/cqlshlib/async_insert.py | 110 
 3 files changed, 135 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c69f257f/CHANGES.txt
--
diff --cc CHANGES.txt
index 283ce8d,6facab9..5655d39
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
 +3.0
 + * Verify that UDF class methods are static (CASSANDRA-7781)
 + * 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
+  * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
   * 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)

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

2014-08-19 Thread mishail

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

Branch: refs/heads/trunk
Commit: 501c3e564b4d73cec45cb16c38ea1656e3bc363d
Parents: c69f257 a37a036
Author: Mikhail Stepura mish...@apache.org
Authored: Tue Aug 19 14:57:48 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Tue Aug 19 14:57:48 2014 -0700

--
 pylib/cqlshlib/test/test_cqlsh_completion.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

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

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

Branch: refs/heads/trunk
Commit: e98a40f9e4d022f15170c42ffdc30611b69d2257
Parents: 8ce346d f454fec
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 18 14:26:13 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 18 14:26:13 2014 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/AbstractNativeCell.java | 11 ++
 .../cassandra/db/composites/AbstractCType.java  | 22 
 .../composites/CompoundSparseCellNameType.java  | 11 ++
 4 files changed, 45 insertions(+)
--


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

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

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

Branch: refs/heads/trunk
Commit: 7879b2fe9a7d76145839c64da557c17195a7f750
Parents: ff88f23 eab1584
Author: Jake Luciani j...@apache.org
Authored: Fri Aug 15 15:16:36 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Fri Aug 15 15:16:36 2014 -0400

--

--

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

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

Branch: refs/heads/trunk
Commit: 5233948d124824edd8483a649aa6fec82f2259b1
Parents: 7879b2f ea68619
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Aug 15 22:21:14 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Aug 15 22:21:14 2014 +0300

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++---
 src/java/org/apache/cassandra/service/CacheService.java | 11 +++
 3 files changed, 15 insertions(+), 7 deletions(-)
--


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

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

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

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

Branch: refs/heads/trunk
Commit: 6ad0ddb5407557c19f21c6f89253ca994116c9de
Parents: 642e6c5 96d0331
Author: Jake Luciani j...@apache.org
Authored: Fri Aug 15 17:16:59 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Fri Aug 15 17:16:59 2014 -0400

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/transport/Message.java | 23 +++-
 2 files changed, 14 insertions(+), 10 deletions(-)
--


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

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

Branch: refs/heads/trunk
Commit: fd43c33c66ac493bf7cf1f7b96c7c93346b407c3
Parents: 4304b3a 4c510dc
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Aug 14 10:53:00 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Aug 14 10:53:00 2014 -0500

--
 .../org/apache/cassandra/tools/NodeTool.java| 66 ++--
 1 file changed, 48 insertions(+), 18 deletions(-)
--


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

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

2014-08-14 Thread mishail

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

Branch: refs/heads/trunk
Commit: edb5f0883370a718816272e45695f31651751885
Parents: a712cd1 91e63d0
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Aug 14 14:33:17 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Aug 14 14:33:17 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/edb5f088/CHANGES.txt
--
diff --cc CHANGES.txt
index 2c6f8a4,e48117a..816640e
--- 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
+  * (cqlsh) Error when tracing query (CASSANDRA-7613)
   * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
   * SSTableExport uses correct validator to create string representation of 
partition
 keys (CASSANDRA-7498)

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

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

Branch: refs/heads/trunk
Commit: 231ad7a4e8ff4d857c35373890eec9a2e8413415
Parents: df8b568 f08785f
Author: Jake Luciani j...@apache.org
Authored: Wed Aug 13 10:51:16 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Wed Aug 13 10:51:16 2014 -0400

--
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 9 -
 src/java/org/apache/cassandra/transport/Frame.java | 4 ++--
 2 files changed, 2 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/231ad7a4/src/java/org/apache/cassandra/service/CassandraDaemon.java
--

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

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

Branch: refs/heads/trunk
Commit: c61784cd8f183c816229bed6add0f642a45e3449
Parents: a26f192 88ad4f4
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Aug 13 11:57:51 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Aug 13 11:57:51 2014 -0500

--
 CHANGES.txt |   1 +
 .../hadoop/AbstractBulkOutputFormat.java|  73 ++
 .../hadoop/AbstractBulkRecordWriter.java| 251 ++
 .../cassandra/hadoop/BulkOutputFormat.java  |  49 +---
 .../cassandra/hadoop/BulkRecordWriter.java  | 259 ++-
 .../cassandra/hadoop/cql3/CqlConfigHelper.java  |   2 +-
 .../cassandra/hadoop/cql3/CqlOutputFormat.java  |   2 +-
 .../io/sstable/AbstractSSTableSimpleWriter.java |  10 +-
 .../cassandra/io/sstable/CQLSSTableWriter.java  |   3 +-
 9 files changed, 358 insertions(+), 292 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c61784cd/CHANGES.txt
--
diff --cc CHANGES.txt
index 9063813,de93018..4ed4d51
--- 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
+  * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
   * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
   * SSTableExport uses correct validator to create string representation of 
partition
 keys (CASSANDRA-7498)

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

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

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

Branch: refs/heads/trunk
Commit: 5aaa4a0270f421a2bfde6246a48b1350bebb4cd6
Parents: 9b4c4ef 50fc8ba
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Aug 13 14:25:37 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Aug 13 14:25:37 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5aaa4a02/CHANGES.txt
--
diff --cc CHANGES.txt
index 4ed4d51,f34cec7..99fe367
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,4 +1,21 @@@
 +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
-  * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
   * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
   * SSTableExport uses correct validator to create string representation of 
partition
 keys (CASSANDRA-7498)

1 2 3 4 >

1 - 100 of 365 matches

Mail list logo