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

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

2014-11-05 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: 98acdb8dd12d295ad8c61a460947f581174550de
Parents: e16f584 32da3c8
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Nov 5 16:31:55 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Nov 5 16:31:55 2014 +0300

--

--

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

2014-11-05 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: 82b91aba697db1a61bbee134b89667a59b3a6b2b
Parents: 40ba9fe 89257bc
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Nov 5 20:35:08 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Nov 5 20:35:08 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/82b91aba/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
--
diff --cc 
src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
index 44b187d,5160d6f..672bb50
--- a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
@@@ -37,8 -36,7 +37,7 @@@ import org.apache.cassandra.exceptions.
  import org.apache.cassandra.io.compress.CompressionParameters;
  import org.apache.cassandra.service.ClientState;
  import org.apache.cassandra.service.MigrationManager;
- import org.apache.cassandra.thrift.CqlResult;
 -import org.apache.cassandra.transport.messages.ResultMessage;
 +import org.apache.cassandra.transport.Event;
  import org.apache.cassandra.utils.ByteBufferUtil;
  
  /** A codeCREATE TABLE/code parsed from a CQL query statement. */

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

2014-11-04 Thread jmckenzie

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
src/java/org/apache/cassandra/db/AtomicSortedColumns.java
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
src/java/org/apache/cassandra/db/Memtable.java
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java


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

Branch: refs/heads/cassandra-2.1
Commit: f7f4ddbf6f0ab5b4aa741b10e39f5465b740ff37
Parents: c816a7a e019760
Author: Joshua McKenzie jmcken...@apache.org
Authored: Tue Nov 4 14:27:25 2014 -0600
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Tue Nov 4 14:27:25 2014 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7f4ddbf/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
--

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

2014-11-04 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: a446e80e08e20196c08aa488508c8440472c0623
Parents: 5acc7a9 11e6571
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Nov 4 16:43:17 2014 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Nov 4 16:43:17 2014 -0600

--
 CHANGES.txt |   1 +
 .../apache/cassandra/cql3/ColumnIdentifier.java |  61 +
 src/java/org/apache/cassandra/cql3/Cql.g| 125 ++-
 .../cassandra/cql3/MultiColumnRelation.java |  12 +-
 .../org/apache/cassandra/cql3/Operation.java|  15 +--
 .../cassandra/cql3/SingleColumnRelation.java|  12 +-
 .../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 ++--
 .../cassandra/cql3/statements/RawSelector.java  |   4 +-
 .../cql3/statements/SelectStatement.java|  26 ++--
 .../cassandra/cql3/statements/Selectable.java   |  62 +
 .../cassandra/cql3/statements/Selection.java|  38 +++---
 .../cql3/statements/UpdateStatement.java|  17 +--
 .../unit/org/apache/cassandra/SchemaLoader.java |   2 +-
 .../cassandra/cql3/ThriftCompatibilityTest.java |  57 +
 18 files changed, 385 insertions(+), 146 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a446e80e/CHANGES.txt
--
diff --cc CHANGES.txt
index 9dbb66b,d5f607f..ddbc810
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
 -2.0.12:
 +2.1.2
 + * Fix issues with CONTAINS (KEY) queries on secondary indexes
 +   (CASSANDRA-8147)
 + * Fix read-rate tracking of sstables for some queries (CASSANDRA-8239)
 + * Fix default timestamp in QueryOptions (CASSANDRA-8246)
 + * 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)
 + * Fix DESCRIBE TABLE with custom indexes (CASSANDRA-8031)
 + * Fix race in RecoveryManagerTest (CASSANDRA-8176)
 + * Avoid IllegalArgumentException while sorting sstables in
 +   IndexSummaryManager (CASSANDRA-8182)
 + * Shutdown JVM on file descriptor exhaustion (CASSANDRA-7579)
 + * Add 'die' policy for commit log and disk failure (CASSANDRA-7927)
 + * Fix installing as service on Windows (CASSANDRA-8115)
 + * Fix CREATE TABLE for CQL2 (CASSANDRA-8144)
 + * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109)
 +Merged from 2.0:
+  * Correctly handle non-text column names in cql3 (CASSANDRA-8178)
   * Fix deletion for indexes on primary key columns (CASSANDRA-8206)
   * Add 'nodetool statusgossip' (CASSANDRA-8125)
   * Improve client notification that nodes are ready for requests 
(CASSANDRA-7510)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a446e80e/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
--
diff --cc src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
index fa151d2,f284436..c1dcd87
--- a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
@@@ -20,12 -20,13 +20,16 @@@ package org.apache.cassandra.cql3
  import java.util.Locale;
  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.db.marshal.AbstractType;
+ 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;
  
  /**
   * Represents an identifer for a CQL column definition.
@@@ -82,23 -75,59 +86,80 @@@ public class ColumnIdentifier implement
  return text;
  }
  
 +public long unsharedHeapSize()
 +{
 +return EMPTY_SIZE
 + + ObjectSizes.sizeOnHeapOf(bytes)
 + + ObjectSizes.sizeOf(text);
 +}
 +
 +public long unsharedHeapSizeExcludingData()
 +{
 +return EMPTY_SIZE
 + +

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

2014-10-31 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: d2309227c2050f81a9eee43292f01356ad296fb0
Parents: a29ee07 ef14f51
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Oct 31 14:16:45 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Oct 31 14:16:45 2014 -0500

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


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

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

2014-10-29 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/UpdateParameters.java


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

Branch: refs/heads/trunk
Commit: 1d285eadadc14251da271cc03b4cf8a1f8f33516
Parents: c937657 748b01d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Oct 29 10:40:51 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Oct 29 10:40:51 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/statements/Selection.java|  4 +--
 .../apache/cassandra/cql3/TimestampTest.java| 36 
 6 files changed, 55 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d285ead/CHANGES.txt
--
diff --cc CHANGES.txt
index cdfd248,d2cb003..7afed1e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -2.0.12:
 +2.1.2
 + * Avoid IllegalArgumentException while sorting sstables in
 +   IndexSummaryManager (CASSANDRA-8182)
 + * Shutdown JVM on file descriptor exhaustion (CASSANDRA-7579)
 + * Add 'die' policy for commit log and disk failure (CASSANDRA-7927)
 + * Fix installing as service on Windows (CASSANDRA-8115)
 + * Fix CREATE TABLE for CQL2 (CASSANDRA-8144)
 + * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109)
 +Merged from 2.0:
+  * Handle negative timestamp in writetime method (CASSANDRA-8139)
   * Pig: Remove errant LIMIT clause in CqlNativeStorage (CASSANDRA-8166)
   * Throw ConfigurationException when hsha is used with the default
 rpc_max_threads setting of 'unlimited' (CASSANDRA-8116)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d285ead/doc/native_protocol_v3.spec
--
diff --cc doc/native_protocol_v3.spec
index 13b6ac6,000..89a99ad
mode 100644,00..100644
--- a/doc/native_protocol_v3.spec
+++ b/doc/native_protocol_v3.spec
@@@ -1,914 -1,0 +1,916 @@@
 +
 + CQL BINARY PROTOCOL v3
 +
 +
 +Table of Contents
 +
 +  1. Overview
 +  2. Frame header
 +2.1. version
 +2.2. flags
 +2.3. stream
 +2.4. opcode
 +2.5. length
 +  3. Notations
 +  4. Messages
 +4.1. Requests
 +  4.1.1. STARTUP
 +  4.1.2. AUTH_RESPONSE
 +  4.1.3. OPTIONS
 +  4.1.4. QUERY
 +  4.1.5. PREPARE
 +  4.1.6. EXECUTE
 +  4.1.7. BATCH
 +  4.1.8. REGISTER
 +4.2. Responses
 +  4.2.1. ERROR
 +  4.2.2. READY
 +  4.2.3. AUTHENTICATE
 +  4.2.4. SUPPORTED
 +  4.2.5. RESULT
 +4.2.5.1. Void
 +4.2.5.2. Rows
 +4.2.5.3. Set_keyspace
 +4.2.5.4. Prepared
 +4.2.5.5. Schema_change
 +  4.2.6. EVENT
 +  4.2.7. AUTH_CHALLENGE
 +  4.2.8. AUTH_SUCCESS
 +  5. Compression
 +  6. Collection types
 +  7. User Defined and tuple types
 +  8. Result paging
 +  9. Error codes
 +  10. Changes from v2
 +
 +
 +1. Overview
 +
 +  The CQL binary protocol is a frame based protocol. Frames are defined as:
 +
 +  0 8162432 40
 +  +-+-+-+-+-+
 +  | version |  flags  |  stream   | opcode  |
 +  +-+-+-+-+-+
 +  |length |
 +  +-+-+-+-+
 +  |   |
 +  ....  body ...  .
 +  .   .
 +  .   .
 +  +
 +
 +  The protocol is big-endian (network byte order).
 +
 +  Each frame contains a fixed size header (9 bytes) followed by a variable 
size
 +  body. The header is described in Section 2. The content of the body depends
 +  on the header opcode value (the body can in particular be empty for some
 +  opcode values). The list of allowed opcode is defined Section 2.3 and the
 +  details of each corresponding message is described Section 4.
 +
 +  The protocol distinguishes 2 types of frames: requests and responses. 
Requests
 +  are those frame sent by the clients to the server, response are the ones 
sent
 +  by the server. Note however that the protocol supports server pushes 
(events)
 +  so responses does not necessarily come right

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

2014-10-24 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 860cde74a65b781cdd7e501f87ac171b20f95d20
Parents: 658a65b 1b332bc
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Oct 24 12:04:40 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Oct 24 12:04:40 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/860cde74/CHANGES.txt
--
diff --cc CHANGES.txt
index d6827db,11f6517..c136c5e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,101 -1,10 +1,103 @@@
 -2.0.12:
 +2.1.2
 + * Fix installing as service on Windows (CASSANDRA-8115)
 + * Fix CREATE TABLE for CQL2 (CASSANDRA-8144)
 + * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109)
 +Merged from 2.0:
   * Pig: Remove errant LIMIT clause in CqlNativeStorage (CASSANDRA-8166)
+  * Throw ConfigurationException when hsha is used with the default
+rpc_max_threads setting of 'unlimited' (CASSANDRA-8116)
  
  
 -2.0.11:
 +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
 +   protocol (CASSANDRA-8062)
 + * 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)
 + * Send proper error response when there is an error during native
 +   protocol message decode (CASSANDRA-8118)
 + * Gossip should ignore generation numbers too far in the future 
(CASSANDRA-8113)
 + * Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104)
 + * Fix high memory use due to tracking reads on incrementally opened sstable
 +   readers (CASSANDRA-8066)
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * 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
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool

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

2014-10-20 Thread jake

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: ba681300beef455dd75318365f5acc32a374a35c
Parents: 6cca24f b353aa3
Author: T Jake Luciani j...@apache.org
Authored: Mon Oct 20 13:33:12 2014 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Mon Oct 20 13:33:12 2014 -0400

--

--

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

2014-10-17 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java


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

Branch: refs/heads/trunk
Commit: 24e4210a4f7e6d18346aed6114c39e85a115dc6c
Parents: 440824c 6cabd25
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Oct 17 11:34:03 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Oct 17 11:34:03 2014 +0200

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/cql3/SingleColumnRelation.java| 2 ++
 .../apache/cassandra/cql3/statements/ModificationStatement.java | 5 -
 3 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/24e4210a/CHANGES.txt
--
diff --cc CHANGES.txt
index d7a8904,8c4fc15..942236c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,89 -1,5 +1,90 @@@
 -2.0.11:
 +2.1.1
 + * 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
 +   protocol (CASSANDRA-8062)
 + * 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)
 + * Send proper error response when there is an error during native
 +   protocol message decode (CASSANDRA-8118)
 + * Gossip should ignore generation numbers too far in the future 
(CASSANDRA-8113)
 + * Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104)
 + * Fix high memory use due to tracking reads on incrementally opened sstable
 +   readers (CASSANDRA-8066)
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * 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
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
 + * (cqlsh) Support for query paging (CASSANDRA-7514)
 + * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
 + * Add

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

2014-10-16 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: ed7eed83daa2d3b765a27f826cf42cd0fcd57197
Parents: f6ea46e 19c2f54
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Oct 16 11:11:32 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Oct 16 11:11:32 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed7eed83/CHANGES.txt
--
diff --cc CHANGES.txt
index 0d39416,967b90c..67b25dc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,84 -1,6 +1,88 @@@
 -2.0.11:
 +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)
 + * Send proper error response when there is an error during native
 +   protocol message decode (CASSANDRA-8118)
 + * Gossip should ignore generation numbers too far in the future 
(CASSANDRA-8113)
 + * Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104)
 + * Fix high memory use due to tracking reads on incrementally opened sstable
 +   readers (CASSANDRA-8066)
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * 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
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
 + * (cqlsh) Don't

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

2014-10-16 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/HintedHandOffManager.java


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

Branch: refs/heads/trunk
Commit: 2966b61cf1a37c466b5cf8e6dcf59354252aa1af
Parents: ed7eed8 98bcf40
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Oct 16 19:16:12 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Oct 16 19:16:12 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/2966b61c/CHANGES.txt
--
diff --cc CHANGES.txt
index 67b25dc,158a48b..aa14be9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,86 -1,5 +1,87 @@@
 -2.0.11:
 +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)
 + * Send proper error response when there is an error during native
 +   protocol message decode (CASSANDRA-8118)
 + * Gossip should ignore generation numbers too far in the future 
(CASSANDRA-8113)
 + * Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104)
 + * Fix high memory use due to tracking reads on incrementally opened sstable
 +   readers (CASSANDRA-8066)
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * 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
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT]

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

2014-10-16 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
NEWS.txt


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

Branch: refs/heads/trunk
Commit: 1dea98396266a41f9bf64ade05dcf02f12f301d2
Parents: 1ef7d05 77dae50
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Oct 16 18:32:16 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Oct 16 18:33:24 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   | 242 +++
 7 files changed, 755 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dea9839/NEWS.txt
--
diff --cc NEWS.txt
index 74fe652,102a87b..50b9c7e
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,82 -13,13 +13,89 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +2.1.1
 +=
 +
 +New features
 +
 +   - Netty support for epoll on linux is now enabled.  If for some
 + reason you want to disable it pass, the following system property
 + -Dcassandra.native.epoll.enabled=false
 +
 +2.1
 +===
 +
 +New features
 +
 +   - Default data and log locations have changed.  If not set in
 + cassandra.yaml, the data file directory, commitlog directory,
 + and saved caches directory will default to $CASSANDRA_HOME/data/data,
 + $CASSANDRA_HOME/data/commitlog, and $CASSANDRA_HOME/data/saved_caches,
 + respectively.  The log directory now defaults to $CASSANDRA_HOME/logs.
 + If not set, $CASSANDRA_HOME, defaults to the top-level directory of
 + the installation.
 + Note that this should only affect source checkouts and tarballs.
 + Deb and RPM packages will continue to use /var/lib/cassandra and
 + /var/log/cassandra in cassandra.yaml.
 +   - SSTable data directory name is slightly changed. Each directory will
 + have hex string appended after CF name, e.g.
 + ks/cf-5be396077b811e3a3ab9dc4b9ac088d/
 + This hex string part represents unique ColumnFamily ID.
 + Note that existing directories are used as is, so only newly created
 + directories after upgrade have new directory name format.
 +   - Saved key cache files also have ColumnFamily ID in their file name.
 +   - It is now possible to do incremental repairs, sstables that have been
 + repaired are marked with a timestamp and not included in the next
 + repair session. Use nodetool repair -par -inc to use this feature.
 + A tool to manually mark/unmark sstables as repaired is available in
 + tools/bin/sstablerepairedset. This is particularly important when
 + using LCS, or any data not repaired in your first incremental repair
 + will be put back in L0.
 +   - Bootstrapping now ensures that range movements are consistent,
 + meaning the data for the new node is taken from the node that is no 
 + longer a responsible for that range of keys.
 + If you want the old behavior (due to a lost node perhaps)
 + you can set the following property 
(-Dcassandra.consistent.rangemovement=false)
 +   - It is now possible to use quoted identifiers in triggers' names. 
 + WARNING: if you previously used triggers with capital letters in their 
 + names, then you must quote them from now on.
 +   - Improved stress tool (http://goo.gl/OTNqiQ)
 +   - New incremental repair option (http://goo.gl/MjohJp, 
http://goo.gl/f8jSme)
 +   - Incremental replacement of compacted SSTables (http://goo.gl/JfDBGW)
 +   - The row cache can now cache only the head of partitions 
(http://goo.gl/6TJPH6)
 +   - Off-heap memtables (http://goo.gl/YT7znJ)
 +   - CQL improvements and additions: User-defined types, tuple types, 2ndary
 + indexing of collections, ... (http://goo.gl/kQl7GW)
 +
 +Upgrading
 +-
 +   - Rolling upgrades from anything pre-2.0.7 is not supported. Furthermore
 + pre-2.0 sstables are not supported. This means that before upgrading
 + a node on 2.1, this node must be started on 2.0 and
 + 'nodetool

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

2014-10-16 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/BatchlogManager.java


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

Branch: refs/heads/trunk
Commit: 440824c1a60a344bc3e8a5ad35ae2fac879bd61d
Parents: 014d328 e916dff
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Oct 17 03:40:17 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Oct 17 03:40:17 2014 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/440824c1/CHANGES.txt
--
diff --cc CHANGES.txt
index b40e14b,73aaab0..d7a8904
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,89 -1,5 +1,90 @@@
 -2.0.11:
 +2.1.1
 + * 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
 +   protocol (CASSANDRA-8062)
 + * 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)
 + * Send proper error response when there is an error during native
 +   protocol message decode (CASSANDRA-8118)
 + * Gossip should ignore generation numbers too far in the future 
(CASSANDRA-8113)
 + * Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104)
 + * Fix high memory use due to tracking reads on incrementally opened sstable
 +   readers (CASSANDRA-8066)
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * 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
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
 + * (cqlsh) Support for query paging (CASSANDRA-7514)
 + * (cqlsh) Show progress of COPY operations

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

2014-10-14 Thread jasobrown

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 4b7161da4aacb2ca9e56ef78258df114d217ccde
Parents: c5cbd58 d828643
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:33:54 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:33:54 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/4b7161da/CHANGES.txt
--
diff --cc CHANGES.txt
index b6b1953,2faea63..bbe6982
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,76 -1,5 +1,77 @@@
 -2.0.11:
 +2.1.1
 + * Fix high memory use due to tracking reads on incrementally opened sstable 
readers (CASSANDRA-8066)
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * 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
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport

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

2014-10-14 Thread jasobrown

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: b76dc9727403c6f9ef2eaaf9f990d784b4d2a722
Parents: 4b7161d cc8eeef
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 06:58:46 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 06:58:46 2014 -0700

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


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

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

2014-10-14 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/transport/CBUtil.java


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

Branch: refs/heads/trunk
Commit: 3a94b3379ec9efb012d227af684c61ca19291b99
Parents: e57d027 781018c
Author: Tyler Hobbs tylerho...@apache.org
Authored: Tue Oct 14 13:22:42 2014 -0500
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Tue Oct 14 13:22:42 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/3a94b337/CHANGES.txt
--
diff --cc CHANGES.txt
index 74647c8,432750a..47bea3a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,76 -1,5 +1,77 @@@
 -2.0.11:
 +2.1.1
 + * Fix high memory use due to tracking reads on incrementally opened sstable 
readers (CASSANDRA-8066)
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * 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
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (cqlsh) Error when

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

2014-10-11 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt

src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java


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

Branch: refs/heads/trunk
Commit: 11e8dc1c1cc2ab497a21384f0f3f0989a592bd75
Parents: 42582ec 7497399
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Oct 11 21:44:02 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Oct 11 21:44:02 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/11e8dc1c/CHANGES.txt
--
diff --cc CHANGES.txt
index 61dec54,84bbe75..891848e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,75 -1,5 +1,76 @@@
 -2.0.11:
 +2.1.1
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * 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
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError

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

2014-10-10 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/CounterUpdateColumn.java


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

Branch: refs/heads/trunk
Commit: e711929e74e70b669625c1dedc0406c3fcf45669
Parents: 1bae25a b7adf98
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Oct 10 16:57:08 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Oct 10 16:57:08 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/e711929e/CHANGES.txt
--
diff --cc CHANGES.txt
index 688dc32,bc12402..5666a9d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,75 -1,5 +1,76 @@@
 -2.0.11:
 +2.1.1
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * 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
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport uses correct validator to create string

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

2014-10-10 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/trunk
Commit: 42582ecd4bb69998ecd664222012cf5cfef377e0
Parents: e711929 0393c30
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Oct 10 20:02:30 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Oct 10 20:02:30 2014 +0300

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/db/DefsTables.java | 261 +--
 2 files changed, 119 insertions(+), 143 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/42582ecd/CHANGES.txt
--
diff --cc CHANGES.txt
index 5666a9d,b633e48..61dec54
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,75 -1,5 +1,76 @@@
 -2.0.11:
 +2.1.1
 + * Fix EXECUTE request with skipMetadata=false returning no metadata
 +   (CASSANDRA-8054)
 + * 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
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport uses correct validator to create string

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

2014-10-09 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 5a33a9ad23d2863b08f3ee5c3497cf96f0448d48
Parents: f92a457 cced4ba
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Oct 9 15:35:17 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Oct 9 15:35:17 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/5a33a9ad/CHANGES.txt
--
diff --cc CHANGES.txt
index f2fc9ae,1c2231d..054870b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,71 -1,5 +1,72 @@@
 -2.0.11:
 +2.1.1
 + * Upgrade netty version and enable epoll event loop (CASSANDRA-7761)
 + * Don't duplicate sstables smaller than split size when using
 +   the sstablesplitter tool (CASSANDRA-7616)
 + * Avoid re-parsing already prepared statements (CASSANDRA-7923)
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (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)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for

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

2014-10-07 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: ed1681a473be37e77aef351eaa0c57250a5a671d
Parents: ba50db4 87cbcc0
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Oct 8 01:22:40 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Oct 8 01:22:40 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/ed1681a4/CHANGES.txt
--
diff --cc CHANGES.txt
index 824fae6,1bef399..0595767
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,67 -1,5 +1,68 @@@
 -2.0.11:
 +2.1.1
 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE
 +   tables with some clustering columns omitted (CASSANDRA-7990)
 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (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)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 +

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

2014-10-06 Thread jasobrown

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 2601604695e421dd056601b1d84a35bf58809a1e
Parents: b760990 df046df
Author: Jason Brown jasobr...@apple.com
Authored: Mon Oct 6 14:54:25 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Mon Oct 6 14:54:25 2014 -0700

--
 CHANGES.txt |  1 +
 .../cli/transport/FramedTransportFactory.java   | 32 -
 .../cli/transport/SSLTransportFactory.java  | 47 
 .../cassandra/thrift/SSLTransportFactory.java   |  5 ++-
 4 files changed, 4 insertions(+), 81 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26016046/CHANGES.txt
--
diff --cc CHANGES.txt
index e9e9fce,c811ebf..f9523ed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,64 -1,5 +1,65 @@@
 -2.0.11:
 +2.1.1
 + * Properly track added size (CASSANDRA-7239)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
 + * Release references to overlapping sstables during compaction 
(CASSANDRA-7819)
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (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)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include

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

2014-10-02 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
src/java/org/apache/cassandra/db/ColumnFamily.java
src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
src/java/org/apache/cassandra/io/sstable/SSTableWriter.java


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

Branch: refs/heads/trunk
Commit: 97b1d9f6322067864146d0bb92afa1271c9cc4ac
Parents: b701dd5 7110d98
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Oct 2 10:39:31 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Oct 2 10:40:40 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/97b1d9f6/CHANGES.txt
--
diff --cc CHANGES.txt
index d83b86f,c9b4e59..d3a0ba2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,58 -1,6 +1,59 @@@
 -2.0.11:
 +2.1.1
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (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)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client

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

2014-10-02 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 4743811931bc813f3fd76889056f432badae48e9
Parents: 31235bc b93ca58
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Oct 2 11:21:47 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Oct 2 11:21:47 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/47438119/CHANGES.txt
--
diff --cc CHANGES.txt
index 306fdca,f3d5998..6b42b6a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,58 -1,6 +1,60 @@@
 -2.0.11:
 +2.1.1
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (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)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 + * Make repair -pr work with -local (CASSANDRA-7450)
 + * Fix error in sstableloader with -cph  1 (CASSANDRA-8007)
 +Merged from 2.0:
+  * Fix potential exception when using

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

2014-09-23 Thread jake

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-2.1
Commit: 3fd90ae6614a5619e44b2f615f49da2bdcee26d7
Parents: 192468f 62db20a
Author: Jake Luciani j...@apache.org
Authored: Tue Sep 23 12:39:34 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Tue Sep 23 12:39:34 2014 -0400

--
 CHANGES.txt|  2 ++
 .../cassandra/io/compress/CompressionParameters.java   | 13 -
 .../org/apache/cassandra/io/sstable/SSTableReader.java |  6 +-
 3 files changed, 19 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fd90ae6/CHANGES.txt
--
diff --cc CHANGES.txt
index 2f8a95b,00603f3..ce0e76a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,52 -1,6 +1,54 @@@
 -2.0.11:
 +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)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, 
CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (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)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 + * Make repair -pr work with -local (CASSANDRA-7450)
 +Merged from 2.0:
+  * CrcCheckChance should adjust based on live CFMetadata not 
+sstable metadata (CASSANDRA-7978)
   * token() should only accept columns in the partitioning
 key order (CASSANDRA-6075)
   * Add method to invalidate permission cache via JMX (CASSANDRA-7977)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fd90ae6/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
--

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

2014-09-23 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: c65ef9af6529086ef1793d24b3f387012bf59091
Parents: c2c9835 b1166c0
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Sep 23 18:59:00 2014 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Sep 23 18:59:00 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/c65ef9af/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 22c8468,aadd0bd..ccda356
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -1821,22 -1813,22 +1821,22 @@@ public class SelectStatement implement
  // index with filtering, we'll need to handle it though.
  throw new InvalidRequestException(Only EQ and IN 
relation are supported on the partition key (unless you use the token() 
function));
  }
 -previous = cname;
 +previous = cdef;
  }
  
- if (stmt.onToken  cfm.partitionKeyColumns().size()  0)
+ if (stmt.onToken)
 -checkTokenFunctionArgumentsOrder(cfDef);
 +checkTokenFunctionArgumentsOrder(cfm);
  }
  
  /**
   * Checks that the column identifiers used as argument for the token 
function have been specified in the
   * partition key order.
 - * @param cfDef the Column Family Definition
 + * @param cfm the Column Family MetaData
   * @throws InvalidRequestException if the arguments have not been 
provided in the proper order.
   */
 -private void checkTokenFunctionArgumentsOrder(CFDefinition cfDef) 
throws InvalidRequestException
 +private void checkTokenFunctionArgumentsOrder(CFMetaData cfm) throws 
InvalidRequestException
  {
- IteratorColumnDefinition iter = 
cfm.partitionKeyColumns().iterator();
 -IteratorName iter = Iterators.cycle(cfDef.partitionKeys());
++IteratorColumnDefinition iter = 
Iterators.cycle(cfm.partitionKeyColumns());
  for (Relation relation : whereClause)
  {
  SingleColumnRelation singleColumnRelation = 
(SingleColumnRelation) relation;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c65ef9af/test/unit/org/apache/cassandra/cql3/SelectWithTokenFunctionTest.java
--
diff --cc test/unit/org/apache/cassandra/cql3/SelectWithTokenFunctionTest.java
index 73a7209,9199862..6f9f5e2
--- a/test/unit/org/apache/cassandra/cql3/SelectWithTokenFunctionTest.java
+++ b/test/unit/org/apache/cassandra/cql3/SelectWithTokenFunctionTest.java
@@@ -17,39 -17,155 +17,50 @@@
   */
  package org.apache.cassandra.cql3;
  
 -import org.apache.cassandra.SchemaLoader;
 -import org.apache.cassandra.db.ConsistencyLevel;
 -import org.apache.cassandra.exceptions.InvalidRequestException;
 -import org.apache.cassandra.exceptions.SyntaxException;
 -import org.apache.cassandra.gms.Gossiper;
 -import org.apache.cassandra.service.ClientState;
 -import org.junit.AfterClass;
 -import org.junit.BeforeClass;
  import org.junit.Test;
 -import org.slf4j.Logger;
 -import org.slf4j.LoggerFactory;
  
 -import static org.apache.cassandra.cql3.QueryProcessor.process;
 -import static org.apache.cassandra.cql3.QueryProcessor.processInternal;
 -import static org.junit.Assert.assertEquals;
 -
 -public class SelectWithTokenFunctionTest
 +public class SelectWithTokenFunctionTest extends CQLTester
  {
 -private static final Logger logger = 
LoggerFactory.getLogger(SelectWithTokenFunctionTest.class);
 -static ClientState clientState;
 -static String keyspace = token_function_test;
 -
 -@BeforeClass
 -public static void setUpClass() throws Throwable
 -{
 -SchemaLoader.loadSchema();
 -executeSchemaChange(CREATE KEYSPACE IF NOT EXISTS %s WITH 
replication = {'class': 'SimpleStrategy', 'replication_factor': '1'});

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

2014-09-19 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 20eb8f0c6c670f88a2ad9f54508c7e06f01b74a5
Parents: 1949212 6198a75
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Sep 19 11:19:56 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Sep 19 11:19:56 2014 -0500

--

--

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

2014-09-18 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
src/java/org/apache/cassandra/transport/Message.java
src/java/org/apache/cassandra/transport/messages/ErrorMessage.java


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

Branch: refs/heads/trunk
Commit: 3dd2f0064f49aa543647be9882dfe8da5ab6899b
Parents: 74877bb cbc705d
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Sep 18 12:36:33 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Sep 18 12:36:33 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/3dd2f006/CHANGES.txt
--
diff --cc CHANGES.txt
index d25fee5,c9d507a..dfcd36d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,6 +1,50 @@@
 -2.0.11:
 +2.1.1
 + * Provide visibility into prepared statements churn (CASSANDRA-7921)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (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)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 + * Make repair -pr work with -local (CASSANDRA-7450)
 +Merged from 2.0:
- ===
- 2.0.11:
+  * Log exceptions related to unclean native protocol client disconnects
+at DEBUG or INFO (CASSANDRA-7849)
   * Allow permissions cache to be set via JMX (CASSANDRA-7698)
   * Include schema_triggers CF in readable system resources (CASSANDRA-7967)
   * Fix RowIndexEntry to report correct serializedSize (CASSANDRA-7948)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3dd2f006/src/java/org/apache/cassandra/transport/Message.java
--
diff --cc src/java/org/apache/cassandra/transport/Message.java
index 163fffb,eb38558..f4c6b31
--- a/src/java/org/apache/cassandra/transport/Message.java
+++

[2/3] git commit: Merge branch cassandra-2.0 into cassandra-2.1

2014-09-17 Thread xedin

Merge branch cassandra-2.0 into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 8026163decf3af2a0984b387acc01cfdfe44c926
Parents: ad89d44 85aa794
Author: Pavel Yaskevich xe...@apache.org
Authored: Wed Sep 17 22:34:19 2014 -0700
Committer: Pavel Yaskevich xe...@apache.org
Committed: Wed Sep 17 22:34:19 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/8026163d/CHANGES.txt
--
diff --cc CHANGES.txt
index cc8c691,58c6647..47d5591
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,96 -1,9 +1,97 @@@
 -2.0.11:
 +2.1.1
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (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)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 + * Make repair -pr work with -local (CASSANDRA-7450)
 +Merged from 2.0:
++ * Fix RowIndexEntry to report correct serializedSize (CASSANDRA-7948)
   * Make CQLSSTableWriter sync within partitions (CASSANDRA-7360)
   * Potentially use non-local replicas in CqlConfigHelper (CASSANDRA-7906)
 - * Explicitly disallowing mixing multi-column and single-column
 + * Explicitly disallow mixing multi-column and single-column
 relations on clustering columns (CASSANDRA-7711)
   * Better error message when condition is set on PK column (CASSANDRA-7804)
 + * Don't send schema change responses and events for no-op DDL
 +   statements (CASSANDRA-7600)
 + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
 + * Throw InvalidRequestException when queries contain relations on entire
 +   collection columns (CASSANDRA-7506)
 + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
 + * (Hadoop) allow ACFRW to limit nodes to local DC

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

2014-09-17 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/ClientState.java


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

Branch: refs/heads/trunk
Commit: dfe1f23511a43981af996f00e61997dc7d069241
Parents: 8026163 62db990
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Sep 17 22:46:25 2014 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Sep 17 22:46:25 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/dfe1f235/CHANGES.txt
--
diff --cc CHANGES.txt
index 47d5591,1eab20e..4619bee
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,47 -1,5 +1,48 @@@
 -2.0.11:
 +2.1.1
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (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)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 + * Make repair -pr work with -local (CASSANDRA-7450)
 +Merged from 2.0:
+  * Include schema_triggers CF in readable system resources (CASSANDRA-7967)
   * Fix RowIndexEntry to report correct serializedSize (CASSANDRA-7948)
   * Make CQLSSTableWriter sync within partitions (CASSANDRA-7360)
   * Potentially use non-local replicas in CqlConfigHelper (CASSANDRA-7906)

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

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

2014-09-16 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/QueryProcessor.java
src/java/org/apache/cassandra/metrics/CqlStatementMetrics.java


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

Branch: refs/heads/trunk
Commit: 681c380b5a9d0f57b85523a9c23c02e71417c799
Parents: e25d94e 19c6cc1
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Sep 16 13:21:36 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Sep 16 13:21:36 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/681c380b/CHANGES.txt
--
diff --cc CHANGES.txt
index f89cc6d,cf7112c..0abc66a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,92 -1,10 +1,93 @@@
 -2.0.11:
 +2.1.1
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (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)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
+  * Add metrics for prepared statement usage and eviction (CASSANDRA-7930)
   * Make CQLSSTableWriter sync within partitions (CASSANDRA-7360)
   * Potentially use non-local replicas in CqlConfigHelper (CASSANDRA-7906)
 - * Explicitly disallowing mixing multi-column and single-column
 + * Explicitly disallow mixing multi-column and single-column
 relations on clustering columns (CASSANDRA-7711)
   * Better error message when condition is set on PK column (CASSANDRA-7804)
 + * Don't send schema change responses and events for no-op DDL
 +   statements (CASSANDRA-7600)
 + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
 + * Throw InvalidRequestException when queries contain relations on entire
 +   collection columns (CASSANDRA-7506)
 + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
 + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 + * (cqlsh) cqlsh should automatically disable tracing when

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

2014-09-16 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/QueryProcessor.java


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

Branch: refs/heads/trunk
Commit: b319b406b9ff69fb64e696627f65b443431d1d64
Parents: 681c380 f19b4cb
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Sep 16 14:09:45 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Sep 16 14:09:45 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/b319b406/CHANGES.txt
--
diff --cc CHANGES.txt
index 0abc66a,3ee938a..f89cc6d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,93 -1,9 +1,92 @@@
 -2.0.11:
 +2.1.1
 + * 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)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report 
it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace 
(CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (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)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
-  * Add metrics for prepared statement usage and eviction (CASSANDRA-7930)
   * Make CQLSSTableWriter sync within partitions (CASSANDRA-7360)
   * Potentially use non-local replicas in CqlConfigHelper (CASSANDRA-7906)
 - * Explicitly disallowing mixing multi-column and single-column
 + * Explicitly disallow mixing multi-column and single-column
 relations on clustering columns (CASSANDRA-7711)
   * Better error message when condition is set on PK column (CASSANDRA-7804)
 + * Don't send schema change responses and events for no-op DDL
 +   statements (CASSANDRA-7600)
 + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
 + * Throw InvalidRequestException when queries contain relations on entire
 +   collection columns (CASSANDRA-7506)
 + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
 + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 + * (cqlsh) cqlsh should automatically disable tracing when selecting
 +   from system_traces (CASSANDRA-7641)
 + * (Hadoop) Add

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

2014-09-12 Thread brandonwilliams

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 23b957c5aa6ee45be86bf0f9d8737fc7c7c269cc
Parents: 73b2dcc 6c6c723
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Sep 12 13:14:57 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Sep 12 13:14:57 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/23b957c5/debian/init
--

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

2014-09-10 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 5fb32ba0c95be95eacc78ee11037b694e2a00ba5
Parents: 12ac7ea 72b25c7
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Sep 10 17:21:06 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Sep 10 17:21:06 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fb32ba0/test/cassandra.in.sh
--
diff --cc test/cassandra.in.sh
index 936f47d,1033512..000
deleted file mode 100644,100644
--- a/test/cassandra.in.sh
+++ /dev/null
@@@ -1,54 -1,54 +1,0 @@@
--# 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.
--
--cassandra_home=`dirname $0`/..
--
--# The directory where Cassandra's configs live (required)
--CASSANDRA_CONF=$cassandra_home/test/conf
--
--# This can be the path to a jar file, or a directory containing the 
--# compiled classes. NOTE: This isn't needed by the startup script,
--# it's just used here in constructing the classpath.
--cassandra_bin=$cassandra_home/build/classes/main
--cassandra_bin=$cassandra_bin:$cassandra_home/build/classes/thrift
--#cassandra_bin=$cassandra_home/build/cassandra.jar
--
--# The java classpath (required)
--CLASSPATH=$CASSANDRA_CONF:$cassandra_bin
--
--for jar in $cassandra_home/lib/*.jar $cassandra_home/build/lib/jars/*.jar; do
--CLASSPATH=$CLASSPATH:$jar
--done
--
--# Arguments to pass to the JVM
--JVM_OPTS= \
---ea \
---Xdebug \
---Xrunjdwp:transport=dt_socket,server=y,address=8898,suspend=n \
---Xms128M \
---Xmx1G \
- -Xss180k \
- -XX:SurvivorRatio=8 \
- -XX:TargetSurvivorRatio=90 \
- -XX:+AggressiveOpts \
- -XX:+UseParNewGC \
- -XX:+UseConcMarkSweepGC \
- -XX:CMSInitiatingOccupancyFraction=1 \
- -XX:+CMSParallelRemarkEnabled \
- -XX:+HeapDumpOnOutOfMemoryError \
- -Dcom.sun.management.jmxremote.port=8090 \
- -Dcom.sun.management.jmxremote.ssl=false \
- -Dcom.sun.management.jmxremote.authenticate=false \
- -Dcassandra.ring_delay_ms=1000
 --Xss256k \
 --XX:SurvivorRatio=8 \
 --XX:TargetSurvivorRatio=90 \
 --XX:+AggressiveOpts \
 --XX:+UseParNewGC \
 --XX:+UseConcMarkSweepGC \
 --XX:CMSInitiatingOccupancyFraction=1 \
 --XX:+CMSParallelRemarkEnabled \
 --XX:+HeapDumpOnOutOfMemoryError \
 --Dcom.sun.management.jmxremote.port=8090 \
 --Dcom.sun.management.jmxremote.ssl=false \
 --Dcom.sun.management.jmxremote.authenticate=false \
 --Dcassandra.ring_delay_ms=1000

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

2014-09-09 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 3ba392f2559e406b2906b991acea693402e01f92
Parents: 1fc8899 c1d2b86
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Sep 9 16:34:45 2014 -0700
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Sep 9 16:34:45 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ba392f2/CHANGES.txt
--
diff --cc CHANGES.txt
index 1706faf,2c0cae6..d4a17de
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,79 -1,8 +1,80 @@@
 -2.0.11:
 +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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (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)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
+  * Potentially use non-local replicas in CqlConfigHelper (CASSANDRA-7906)
 - * Explicitly disallowing mixing multi-column and single-column
 + * Explicitly disallow mixing multi-column and single-column
 relations on clustering columns (CASSANDRA-7711)
   * Better error message when condition is set on PK column (CASSANDRA-7804)
 + * Don't send schema change responses and events for no-op DDL
 +   statements (CASSANDRA-7600)
 + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
 + * Throw InvalidRequestException when queries contain relations on entire
 +   collection columns (CASSANDRA-7506)
 + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
 + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 + * (cqlsh) cqlsh should automatically disable tracing when selecting
 +   from system_traces (CASSANDRA-7641)
 + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
 + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 + * Catch errors when the JVM pulls the rug out from GCInspector 
(CASSANDRA-5345)
 + * cqlsh fails when version number parts are not int (CASSANDRA-7524)
 +Merged from 1.2:
 + * Don't index tombstones (CASSANDRA-7828)
 + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788)
 +
 +
 +2.1.0
 + * (cqlsh) Removed ALTER TYPE name RENAME TO name from tab-completion
 +   (CASSANDRA-7895)
 + * Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
 + * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
 + * Avoid exposing internal classes over JMX (CASSANDRA-7879)
 + * Add null check for

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

2014-09-09 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/TreeMapBackedSortedColumns.java

src/java/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.java
src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java

src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java


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

Branch: refs/heads/trunk
Commit: 9b9bf45b676916dc9c81a6328fafef6496d62fb9
Parents: 3ba392f 2170ac4
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Sep 9 18:39:29 2014 -0700
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Sep 9 18:39:29 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/9b9bf45b/CHANGES.txt
--
diff --cc CHANGES.txt
index d4a17de,3ee938a..60fd4c9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,80 -1,9 +1,81 @@@
 -2.0.11:
 +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)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (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)
 + * (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)
 + * Avoid NPEs when receiving type changes for an unknown keyspace 
(CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
+  * Make CQLSSTableWriter sync within partitions (CASSANDRA-7360)
   * Potentially use non-local replicas in CqlConfigHelper (CASSANDRA-7906)
 - * Explicitly disallowing mixing multi-column and single-column
 + * Explicitly disallow mixing multi-column and single-column
 relations on clustering columns (CASSANDRA-7711)
   * Better error message when condition is set on PK column (CASSANDRA-7804)
 + * Don't send schema change responses and events for no-op DDL
 +   statements (CASSANDRA-7600)
 + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
 + * Throw InvalidRequestException when queries contain relations on entire
 +   collection columns (CASSANDRA-7506)
 + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
 + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 + * (cqlsh) cqlsh should automatically disable tracing when selecting
 +   from system_traces (CASSANDRA-7641)
 + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
 + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 + *

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

2014-07-21 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: f9af6ab5874f4d33e32af1af8934bd7c0bed1724
Parents: 3d2da79 ff211a4
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Jul 22 01:46:11 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Jul 22 01:46:11 2014 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9af6ab5/CHANGES.txt
--
diff --cc CHANGES.txt
index f05c98e,9909760..028128d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,5 +1,31 @@@
 -2.0.10
 +2.1.1
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Fail to start if commit log replay detects a problem (CASSANDRA-7125)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 + * Fix native protocol drop user type notification (CASSANDRA-7571)
 + * Give read access to system.schema_usertypes to all authenticated users
 +   (CASSANDRA-7578)
++Merged from 2.0:
+  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 +
 +
 +2.1.0-rc4
 + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults 
 +   (CASSANDRA-7551)
 + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
 + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 + * Add missing table name to DROP INDEX responses and notifications 
(CASSANDRA-7539)
 + * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
 + * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
 + * Support conditional updates, tuple type, and the v3 protocol in cqlsh 
(CASSANDRA-7509)
 + * Handle queries on multiple secondary index types (CASSANDRA-7525)
 + * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
 + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
 +Merged from 2.0:
   * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
   * Fix range merging when DES scores are zero (CASSANDRA-7535)
   * Warn when SSL certificates have expired (CASSANDRA-7528)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9af6ab5/src/java/org/apache/cassandra/transport/DataType.java
--

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

2014-06-30 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: 73a07daf9dc17a6a94d9244a8e03f58d808c5f88
Parents: ef4a07b fc9eeb9
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Jun 30 08:45:41 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Jun 30 08:45:41 2014 +0200

--
 CHANGES.txt |  1 +
 .../db/compaction/LeveledManifest.java  | 86 +++-
 2 files changed, 84 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/73a07daf/CHANGES.txt
--
diff --cc CHANGES.txt
index b30e9a2,e88753f..6aa2e6a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -15,36 -4,29 +15,37 @@@ Merged from 2.0
 operations to incorrect become full QUORUM (CASSANDRA-7345)
   * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
   * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
+  * Make sure high level sstables get compacted (CASSANDRA-7414)
  
  
 -2.0.9
 - * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 +2.1.0-rc2
 + * Fix heap size calculation for CompoundSparseCellName and 
 +   CompoundSparseCellName.WithCollection (CASSANDRA-7421)
 + * Allow counter mutations in UNLOGGED batches (CASSANDRA-7351)
 + * Modify reconcile logic to always pick a tombstone over a counter cell
 +   (CASSANDRA-7346)
 + * Avoid incremental compaction on Windows (CASSANDRA-7365)
 + * Fix exception when querying a composite-keyed table with a collection index
 +   (CASSANDRA-7372)
 + * Use node's host id in place of counter ids (CASSANDRA-7366)
   * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
 + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
 + * Don't fail streams on failure detector downs (CASSANDRA-3569)
 + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
 + * Reduce run time for CQL tests (CASSANDRA-7327)
 + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
 + * RefCount native frames from netty (CASSANDRA-7245)
 + * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
 + * Remove rows_per_partition_to_cache keyword (CASSANDRA-7193)
 + * Fix schema change response in native protocol v3 (CASSANDRA-7413)
 +Merged from 2.0:
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
   * Add per-CF range read request latency metrics (CASSANDRA-7338)
   * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
   * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
   * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 - * Reference sstables before populating key cache (CASSANDRA-7234)
   * Account for range tombstones in min/max column names (CASSANDRA-7235)
   * Improve sub range repair validation (CASSANDRA-7317)
   * Accept subtypes for function results, type casts (CASSANDRA-6766)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/73a07daf/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
index a21924b,1118ddc..aac57c0
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
@@@ -34,8 -36,13 +34,9 @@@ import org.slf4j.LoggerFactory
  import

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

2014-06-27 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 9e3d13e70a23c3144c0f4de61c5666862011b996
Parents: 9da949b e324231
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Jun 27 09:29:29 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Jun 27 09:29:29 2014 -0500

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/transport/Frame.java   | 7 ---
 src/java/org/apache/cassandra/transport/Message.java | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e3d13e7/CHANGES.txt
--
diff --cc CHANGES.txt
index 64f2bee,d587a94..a04f76a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -7,36 -2,29 +7,37 @@@ Merged from 2.0
   * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
   * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
 operations to incorrect become full QUORUM (CASSANDRA-7345)
+  * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
  
  
 -2.0.9
 - * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 +2.1.0-rc2
 + * Fix heap size calculation for CompoundSparseCellName and 
 +   CompoundSparseCellName.WithCollection (CASSANDRA-7421)
 + * Allow counter mutations in UNLOGGED batches (CASSANDRA-7351)
 + * Modify reconcile logic to always pick a tombstone over a counter cell
 +   (CASSANDRA-7346)
 + * Avoid incremental compaction on Windows (CASSANDRA-7365)
 + * Fix exception when querying a composite-keyed table with a collection index
 +   (CASSANDRA-7372)
 + * Use node's host id in place of counter ids (CASSANDRA-7366)
   * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
 + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
 + * Don't fail streams on failure detector downs (CASSANDRA-3569)
 + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
 + * Reduce run time for CQL tests (CASSANDRA-7327)
 + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
 + * RefCount native frames from netty (CASSANDRA-7245)
 + * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
 + * Remove rows_per_partition_to_cache keyword (CASSANDRA-7193)
 + * Fix schema change response in native protocol v3 (CASSANDRA-7413)
 +Merged from 2.0:
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
   * Add per-CF range read request latency metrics (CASSANDRA-7338)
   * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
   * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
   * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 - * Reference sstables before populating key cache (CASSANDRA-7234)
   * Account for range tombstones in min/max column names (CASSANDRA-7235)
   * Improve sub range repair validation (CASSANDRA-7317)
   * Accept subtypes for function results, type casts (CASSANDRA-6766)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e3d13e7/src/java/org/apache/cassandra/transport/Frame.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e3d13e7/src/java/org/apache/cassandra/transport/Message.java
--

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

2014-06-25 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: d27cd394d8db5b713b159cf7b0bf5b40a9d2572c
Parents: 1569bd9 6ebee66
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Jun 25 16:01:26 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Jun 25 16:01:26 2014 +0200

--
 CHANGES.txt |  6 ++
 NEWS.txt|  9 ++-
 .../cql3/statements/SelectStatement.java| 68 +++-
 3 files changed, 50 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27cd394/CHANGES.txt
--
diff --cc CHANGES.txt
index 4b97875,7ec2501..0c92663
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,22 +1,37 @@@
 -2.0.9
 - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
++2.1.0
++Merged from 2.0:
++ * Support DISTINCT for static columns and fix behaviour when DISTINC is
++   not use (CASSANDRA-7305).
++
++
 +2.1.0-rc2
 + * Fix heap size calculation for CompoundSparseCellName and 
 +   CompoundSparseCellName.WithCollection (CASSANDRA-7421)
 + * Allow counter mutations in UNLOGGED batches (CASSANDRA-7351)
 + * Modify reconcile logic to always pick a tombstone over a counter cell
 +   (CASSANDRA-7346)
 + * Avoid incremental compaction on Windows (CASSANDRA-7365)
 + * Fix exception when querying a composite-keyed table with a collection index
 +   (CASSANDRA-7372)
 + * Use node's host id in place of counter ids (CASSANDRA-7366)
   * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
 + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
 + * Don't fail streams on failure detector downs (CASSANDRA-3569)
 + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
 + * Reduce run time for CQL tests (CASSANDRA-7327)
 + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
 + * RefCount native frames from netty (CASSANDRA-7245)
 + * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
 + * Remove rows_per_partition_to_cache keyword (CASSANDRA-7193)
 + * Fix schema change response in native protocol v3 (CASSANDRA-7413)
 +Merged from 2.0:
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
   * Add per-CF range read request latency metrics (CASSANDRA-7338)
   * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
   * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
   * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 - * Reference sstables before populating key cache (CASSANDRA-7234)
   * Account for range tombstones in min/max column names (CASSANDRA-7235)
   * Improve sub range repair validation (CASSANDRA-7317)
   * Accept subtypes for function results, type casts (CASSANDRA-6766)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27cd394/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 51390a3,f106402..1e1b03f
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -423,18 -427,35 +423,30 @@@ public class SelectStatement implement
  }
  }
  
+ private

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

2014-06-25 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/CollationController.java


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

Branch: refs/heads/trunk
Commit: e88b88891169dd8d6b768878ea99007cec65161c
Parents: 23893ea 77bbcc1
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Jun 25 14:31:47 2014 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Jun 25 14:31:47 2014 -0700

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/db/CollationController.java | 9 -
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e88b8889/CHANGES.txt
--
diff --cc CHANGES.txt
index fbcb8c0,84be96d..53d388a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,23 +1,38 @@@
 -2.0.9
 +2.1.0
 +Merged from 2.0:
+  * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 + * Support DISTINCT for static columns and fix behaviour when DISTINC is
 +   not use (CASSANDRA-7305).
 +
 +
 +2.1.0-rc2
 + * Fix heap size calculation for CompoundSparseCellName and 
 +   CompoundSparseCellName.WithCollection (CASSANDRA-7421)
 + * Allow counter mutations in UNLOGGED batches (CASSANDRA-7351)
 + * Modify reconcile logic to always pick a tombstone over a counter cell
 +   (CASSANDRA-7346)
 + * Avoid incremental compaction on Windows (CASSANDRA-7365)
 + * Fix exception when querying a composite-keyed table with a collection index
 +   (CASSANDRA-7372)
 + * Use node's host id in place of counter ids (CASSANDRA-7366)
   * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
 + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
 + * Don't fail streams on failure detector downs (CASSANDRA-3569)
 + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
 + * Reduce run time for CQL tests (CASSANDRA-7327)
 + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
 + * RefCount native frames from netty (CASSANDRA-7245)
 + * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
 + * Remove rows_per_partition_to_cache keyword (CASSANDRA-7193)
 + * Fix schema change response in native protocol v3 (CASSANDRA-7413)
 +Merged from 2.0:
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
   * Add per-CF range read request latency metrics (CASSANDRA-7338)
   * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
   * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
   * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 - * Reference sstables before populating key cache (CASSANDRA-7234)
   * Account for range tombstones in min/max column names (CASSANDRA-7235)
   * Improve sub range repair validation (CASSANDRA-7317)
   * Accept subtypes for function results, type casts (CASSANDRA-6766)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e88b8889/src/java/org/apache/cassandra/db/CollationController.java
--
diff --cc src/java/org/apache/cassandra/db/CollationController.java
index 1030ccf,4a08a26..061537b
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@@ -78,22 -77,21 +78,24 @@@ public class CollationControlle
  try
  {
  Tracing.trace(Merging memtable contents);
+ long mostRecentRowTombstone = Long.MIN_VALUE;
  for (Memtable memtable : view.memtables)

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

2014-06-20 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
src/java/org/apache/cassandra/cql3/TypeCast.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/9dcdb8b0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dcdb8b0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9dcdb8b0

Branch: refs/heads/trunk
Commit: 9dcdb8b0b5bb5c92986b16380d650373c7f819d6
Parents: 2fe6de6 9da742d
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Jun 20 12:00:20 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Jun 20 12:00:20 2014 -0500

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/cql3/TypeCast.java |  2 +-
 .../cassandra/cql3/functions/FunctionCall.java  |  2 +-
 .../cassandra/cql3/functions/Functions.java |  4 +-
 .../cassandra/cql3/statements/Selection.java|  2 +-
 .../cassandra/db/marshal/AbstractType.java  | 23 +++--
 .../apache/cassandra/db/marshal/BytesType.java  |  2 +-
 .../cassandra/db/marshal/CompositeType.java |  8 +--
 .../apache/cassandra/db/marshal/DateType.java   |  6 +++
 .../cassandra/db/marshal/IntegerType.java   |  6 +++
 .../apache/cassandra/db/marshal/LongType.java   |  6 +++
 .../cassandra/db/marshal/ReversedType.java  |  6 +++
 .../cassandra/db/marshal/TimestampType.java |  6 +++
 .../apache/cassandra/db/marshal/TupleType.java  |  6 +--
 .../apache/cassandra/db/marshal/UUIDType.java   |  6 +++
 .../org/apache/cassandra/cql3/TypeTest.java | 51 
 16 files changed, 119 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9dcdb8b0/CHANGES.txt
--
diff --cc CHANGES.txt
index 7288de6,dac254e..d7cb9ee
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,25 +1,31 @@@
 -2.0.9
 - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 +2.1.0-rc2
 + * Modify reconcile logic to always pick a tombstone over a counter cell
 +   (CASSANDRA-7346)
 + * Avoid incremental compaction on Windows (CASSANDRA-7365)
 + * Fix exception when querying a composite-keyed table with a collection index
 +   (CASSANDRA-7372)
 + * Use node's host id in place of counter ids (CASSANDRA-7366)
   * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
 + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
 + * Don't fail streams on failure detector downs (CASSANDRA-3569)
 + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
 + * Reduce run time for CQL tests (CASSANDRA-7327)
 + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
 + * RefCount native frames from netty (CASSANDRA-7245)
 + * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
 + * Remove rows_per_partition_to_cache keyword (CASSANDRA-7193)
 + * Fix schema change response in native protocol v3 (CASSANDRA-7413)
 +Merged from 2.0:
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
   * Add per-CF range read request latency metrics (CASSANDRA-7338)
   * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
   * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
   * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 - * Reference sstables before populating key cache (CASSANDRA-7234)
   * Account for range tombstones in min/max column names (CASSANDRA-7235)
   * Improve sub range repair validation (CASSANDRA-7317)
+  * Accept subtypes for function results, type casts (CASSANDRA-6766)
  Merged from 1.2:
   * Handle possible integer overflow in FastByteArrayOutputStream 
(CASSANDRA-7373)
   * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)

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

2014-06-19 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: 3ff7a776a76d5ca9c3ee569067896f6098075885
Parents: baf524f 303ff22
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Jun 19 09:51:28 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Jun 19 09:51:28 2014 +0200

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/db/ColumnFamily.java   |  21 ++--
 .../db/compaction/LazilyCompactedRow.java   |  10 +-
 .../cassandra/io/sstable/SSTableWriter.java |   3 +
 .../apache/cassandra/db/ColumnFamilyTest.java   |  12 +++
 .../db/compaction/CompactionsTest.java  | 100 ++-
 6 files changed, 132 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ff7a776/CHANGES.txt
--
diff --cc CHANGES.txt
index af6e8c0,65e3161..ad5fb1c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,23 +1,26 @@@
 -2.0.9
 - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 +2.1.0
 + * Avoid incremental compaction on Windows (CASSANDRA-7365)
 + * Fix exception when querying a composite-keyed table with a collection index
 +   (CASSANDRA-7372)
 + * Use node's host id in place of counter ids (CASSANDRA-7366)
   * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
 + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
 + * Don't fail streams on failure detector downs (CASSANDRA-3569)
 + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
 + * Reduce run time for CQL tests (CASSANDRA-7327)
 + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
 + * RefCount native frames from netty (CASSANDRA-7245)
 + * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
 + * Remove rows_per_partition_to_cache keyword (CASSANDRA-7193)
 +Merged from 2.0:
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
   * Add per-CF range read request latency metrics (CASSANDRA-7338)
   * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
   * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
   * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 - * Reference sstables before populating key cache (CASSANDRA-7234)
+  * Account for range tombstones in min/max column names (CASSANDRA-7235)
  Merged from 1.2:
   * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)
   * Errors in FlushRunnable may leave threads hung (CASSANDRA-7275)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ff7a776/src/java/org/apache/cassandra/db/ColumnFamily.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamily.java
index 45b8eff,638eacc..38e1591
--- a/src/java/org/apache/cassandra/db/ColumnFamily.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamily.java
@@@ -402,36 -418,31 +402,41 @@@ public abstract class ColumnFamily impl
  int maxLocalDeletionTime = Integer.MIN_VALUE;
  ListByteBuffer minColumnNamesSeen = Collections.emptyList();
  ListByteBuffer maxColumnNamesSeen = Collections.emptyList();
 +boolean hasLegacyCounterShards = false;
+ 
+ if (deletionInfo().getTopLevelDeletion().localDeletionTime  
Integer.MAX_VALUE)
+ 
tombstones.update(deletionInfo().getTopLevelDeletion().localDeletionTime);
+ IteratorRangeTombstone it =

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

2014-06-18 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: 43d248f913b5cc9a7a3f33ef133de1d9307e18f1
Parents: cf9b8c9 760441b
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Jun 18 12:57:32 2014 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Jun 18 12:57:32 2014 -0700

--
 test/unit/org/apache/cassandra/db/BatchlogManagerTest.java | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d248f9/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
--
diff --cc test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
index e0eae6b,0b6a908..57f6844
--- a/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
@@@ -62,20 -60,15 +62,21 @@@ public class BatchlogManagerTest extend
  
  // Generate 1000 mutations and put them all into the batchlog.
  // Half (500) ready to be replayed, half not.
 +CellNameType comparator = 
Keyspace.open(Keyspace1).getColumnFamilyStore(Standard1).metadata.comparator;
  for (int i = 0; i  1000; i++)
  {
 -RowMutation mutation = new RowMutation(Keyspace1, bytes(i));
 -mutation.add(Standard1, bytes(i), bytes(i), 
System.currentTimeMillis());
 +Mutation mutation = new Mutation(Keyspace1, bytes(i));
 +mutation.add(Standard1, comparator.makeCellName(bytes(i)), 
bytes(i), System.currentTimeMillis());
  
- long timestamp = System.currentTimeMillis();
- if (i  500)
- timestamp -= DatabaseDescriptor.getWriteRpcTimeout() * 2;
+ long timestamp = i  500
+? (System.currentTimeMillis() - 
DatabaseDescriptor.getWriteRpcTimeout() * 2) * 1000
+: Long.MAX_VALUE;
 -
BatchlogManager.getBatchlogMutationFor(Collections.singleton(mutation), 
UUIDGen.getTimeUUID(), timestamp).apply();
++
 +
BatchlogManager.getBatchlogMutationFor(Collections.singleton(mutation),
 +   UUIDGen.getTimeUUID(),
 +   
MessagingService.current_version,
-timestamp * 1000)
++   timestamp)
 +   .apply();
  }
  
  // Flush the batchlog to disk (see CASSANDRA-6822).

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

2014-06-18 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/StorageProxy.java


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

Branch: refs/heads/trunk
Commit: 423b62cd3521188acd7a5c051b56182eeddeafe5
Parents: 43d248f afa304e
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Jun 18 13:16:48 2014 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Jun 18 13:16:48 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/423b62cd/CHANGES.txt
--
diff --cc CHANGES.txt
index 329da9b,776d294..335192b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,22 +1,24 @@@
 -2.0.9
 - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 +2.1.0
 + * Avoid incremental compaction on Windows (CASSANDRA-7365)
 + * Fix exception when querying a composite-keyed table with a collection index
 +   (CASSANDRA-7372)
 + * Use node's host id in place of counter ids (CASSANDRA-7366)
   * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
 + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
 + * Don't fail streams on failure detector downs (CASSANDRA-3569)
 + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
 + * Reduce run time for CQL tests (CASSANDRA-7327)
 + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
 + * RefCount native frames from netty (CASSANDRA-7245)
 + * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
 +Merged from 2.0:
++ * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
   * Add per-CF range read request latency metrics (CASSANDRA-7338)
   * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
   * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
   * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 - * Reference sstables before populating key cache (CASSANDRA-7234)
  Merged from 1.2:
   * Fix problem truncating on a node that was previously in a dead state 
(CASSANDRA-7318)
   * Don't insert tombstones that hide indexed values into 2i (CASSANDRA-7268)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/423b62cd/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 890315a,3b10cff..2433457
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -492,7 -487,12 +492,12 @@@ public class StorageProxy implements St
  ListInetAddress naturalEndpoints = 
StorageService.instance.getNaturalEndpoints(mutation.getKeyspaceName(), tk);
  CollectionInetAddress pendingEndpoints = 
StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk, 
mutation.getKeyspaceName());
  for (InetAddress target : 
Iterables.concat(naturalEndpoints, pendingEndpoints))
- submitHint((Mutation) mutation, target, null);
+ {
+ // local writes can timeout, but cannot be dropped 
(see LocalMutationRunnable and
+ // CASSANDRA-6510), so there is no need to hint or 
retry
+ if (!target.equals(FBUtilities.getBroadcastAddress()) 
 shouldHint(target))
 -submitHint((RowMutation) mutation,

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

2014-06-17 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/Memtable.java


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

Branch: refs/heads/trunk
Commit: d38f677c007a46f6fa914e7a3535bb12feb6ec94
Parents: 5e90091 9afc209
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Jun 17 18:01:23 2014 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Jun 17 18:01:23 2014 -0700

--

--

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

2014-06-11 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 00628e70a52f4cfa0ca6abfd295ba03f77298293
Parents: 99594cd 2df27c0
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Jun 12 03:11:39 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Jun 12 03:11:39 2014 +0200

--

--

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

2014-06-09 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/QueryProcessor.java
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
src/java/org/apache/cassandra/transport/messages/BatchMessage.java


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

Branch: refs/heads/trunk
Commit: 6d1f05e34cbee738e8bbe2967481516abbd254d4
Parents: 9adb31c aa9894d
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Jun 10 00:42:30 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Jun 10 00:42:30 2014 +0300

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/cql3/QueryProcessor.java| 3 +--
 .../org/apache/cassandra/cql3/statements/BatchStatement.java  | 7 +--
 .../org/apache/cassandra/transport/messages/BatchMessage.java | 4 +++-
 4 files changed, 6 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d1f05e3/CHANGES.txt
--
diff --cc CHANGES.txt
index 784f9f9,97ac75e..b70782b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,17 +1,17 @@@
 -2.0.9
 +2.1.0
+  * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
 + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
 + * Don't fail streams on failure detector downs (CASSANDRA-3569)
 + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
 + * Reduce run time for CQL tests (CASSANDRA-7327)
 + * Fix heap size calculation on Windows (CASSANDRA-7352)
 + * RefCount native frames from netty (CASSANDRA-7245)
 + * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
 +Merged from 2.0:
   * Add per-CF range read request latency metrics (CASSANDRA-7338)
   * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
   * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
   * Fix infinite loop on exception while streaming (CASSANDRA-7330)
  Merged from 1.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d1f05e3/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --cc src/java/org/apache/cassandra/cql3/QueryProcessor.java
index f50bc81,a59fe9b..287a700
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@@ -419,8 -315,8 +419,7 @@@ public class QueryProcessor implements 
  ClientState clientState = queryState.getClientState();
  batch.checkAccess(clientState);
  batch.validate(clientState);
- batch.execute(queryState, options);
- return new ResultMessage.Void();
 -
 -return 
batch.executeWithPerStatementVariables(options.getConsistency(), queryState, 
options.getValues());
++return batch.execute(queryState, options);
  }
  
  public static ParsedStatement.Prepared getStatement(String queryStr, 
ClientState clientState)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d1f05e3/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
index 5b058f3,8fc1ecc..e513aef
--- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
@@@ -219,27 -226,30 +214,27 @@@ public class BatchStatement implements 
  
  public ResultMessage execute(QueryState queryState, QueryOptions options) 
throws RequestExecutionException, RequestValidationException
  {
 -if (options.getConsistency() == null)
 -

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

2014-06-04 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java


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

Branch: refs/heads/trunk
Commit: 2d76d9fc37328b8174009e414c2a2a21cb5e5245
Parents: 6a4144b 05ffa8f
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Jun 4 18:02:24 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Jun 4 18:02:24 2014 +0300

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java| 5 +
 src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 4 
 3 files changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d76d9fc/CHANGES.txt
--
diff --cc CHANGES.txt
index 98e3fc8,0d716a6..23f36c8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,16 +1,11 @@@
 -2.0.9
 +2.1.0
 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
 + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
 + * Don't fail streams on failure detector downs (CASSANDRA-3569)
 + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
 +Merged from 2.0:
+  * Add per-CF range read request latency metrics (CASSANDRA-7338)
   * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
   * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
   * Fix infinite loop on exception while streaming (CASSANDRA-7330)
  Merged from 1.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d76d9fc/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 4d334e7,c641f3a..e2d9248
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -2030,7 -1703,8 +2030,8 @@@ public class ColumnFamilyStore implemen
  
  public ListRow getRangeSlice(ExtendedFilter filter)
  {
+ long start = System.nanoTime();
 -try
 +try (OpOrder.Group op = readOrdering.start())
  {
  return filter(getSequentialIterator(filter.dataRange, 
filter.timestamp), filter);
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d76d9fc/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
--
diff --cc src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index f080fd0,50c80fc..f4682da
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@@ -233,7 -179,7 +235,8 @@@ public class ColumnFamilyMetric
  });
  readLatency = new LatencyMetrics(factory, Read);
  writeLatency = new LatencyMetrics(factory, Write);
+ rangeLatency = new LatencyMetrics(factory, Range);
 +pendingFlushes = 
Metrics.newCounter(factory.createMetricName(PendingFlushes));
  pendingCompactions = 
Metrics.newGauge(factory.createMetricName(PendingCompactions), new 
GaugeInteger()
  {
  public Integer value()

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

2014-06-02 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: e398c6bb89d4463e251434650e92f1c464fe9b40
Parents: 1c33ea3 709b9fc
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Jun 2 08:59:50 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Jun 2 08:59:50 2014 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/streaming/StreamSession.java  | 32 
 2 files changed, 20 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e398c6bb/CHANGES.txt
--
diff --cc CHANGES.txt
index af4da65,bc95a8d..c7c6877
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,18 +1,9 @@@
 -2.0.9
 +2.1.0
 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
 +Merged from 2.0:
   * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
+  * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
  Merged from 1.2:
 - * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
   * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
  
  

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

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

2014-06-02 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: a8995128374a077172eb8c57094da68ee9ff0366
Parents: e398c6b 62d9c43
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Mon Jun 2 23:36:55 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Mon Jun 2 23:36:55 2014 -0400

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


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

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

2014-05-30 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 90477c3107e6cc2e5ffd815c820af38c5e0539dc
Parents: 9141f7b 886d9fc
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri May 30 23:51:58 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri May 30 23:51:58 2014 +0300

--
 CHANGES.txt | 2 ++
 src/java/org/apache/cassandra/streaming/StreamTransferTask.java | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90477c31/CHANGES.txt
--
diff --cc CHANGES.txt
index 5293580,d1d1030..a849897
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,49 -1,21 +1,51 @@@
 -2.0.9
 +2.1.0
++Merged from 2.0:
+  * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
  Merged from 1.2:
 - * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
 - * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
 +* Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
  
  
 -2.0.8
 +2.1.0-rc1
 + * Revert flush directory (CASSANDRA-6357)
 + * More efficient executor service for fast operations (CASSANDRA-4718)
 + * Move less common tools into a new cassandra-tools package (CASSANDRA-7160)
 + * Support more concurrent requests in native protocol (CASSANDRA-7231)
 + * Add tab-completion to debian nodetool packaging (CASSANDRA-6421)
 + * Change concurrent_compactors defaults (CASSANDRA-7139)
 + * Add PowerShell Windows launch scripts (CASSANDRA-7001)
 + * Make commitlog archive+restore more robust (CASSANDRA-6974)
 + * Fix marking commitlogsegments clean (CASSANDRA-6959)
 + * Add snapshot manifest describing files included (CASSANDRA-6326)
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
 + * Upgrade NBHM lib (CASSANDRA-7128)
 + * Optimize netty server (CASSANDRA-6861)
 + * Fix repair hang when given CF does not exist (CASSANDRA-7189)
 + * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
 + * Add server side batching to native transport (CASSANDRA-5663)
 + * Make batchlog replay asynchronous (CASSANDRA-6134)
 + * remove unused classes (CASSANDRA-7197)
 + * Limit user types to the keyspace they are defined in (CASSANDRA-6643)
 + * Add validate method to CollectionType (CASSANDRA-7208)
 + * New serialization format for UDT values (CASSANDRA-7209, CASSANDRA-7261)
 + * Fix nodetool netstats (CASSANDRA-7270)
 + * Fix potential ClassCastException in HintedHandoffManager (CASSANDRA-7284)
 + * Use prepared statements internally (CASSANDRA-6975)
 + * Fix broken paging state with prepared statement (CASSANDRA-7120)
 + * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287)
 + * Allow nulls/non-existant fields in UDT (CASSANDRA-7206)
 + * Backport Thrift MultiSliceRequest (CASSANDRA-7027)
 + * Handle overlapping MultiSlices (CASSANDRA-7279)
 + * Fix DataOutputTest on Windows (CASSANDRA-7265)
 + * Embedded sets in user defined data-types are not updating (CASSANDRA-7267)
 + * Add tuple type to CQL/native protocol (CASSANDRA-7248)
 + * Fix CqlPagingRecordReader on tables with few rows (CASSANDRA-7322)
 +Merged from 2.0:
 + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
   * Always reallocate buffers in HSHA (CASSANDRA-6285)
   * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
   * (Hadoop) Close java driver Cluster in

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

2014-05-29 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: 743becb540b0ff0a8c3c686480e8732d635f7d99
Parents: a0ef84f d72777b
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu May 29 19:57:24 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu May 29 19:57:24 2014 +0300

--
 CHANGES.txt  |  3 ++-
 NEWS.txt | 12 
 src/java/org/apache/cassandra/config/CFMetaData.java |  4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/743becb5/CHANGES.txt
--
diff --cc CHANGES.txt
index 820740f,98a0a33..fbe5f70
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -77,9 -44,11 +77,10 @@@ Merged from 2.0
   * Fix 2ndary index queries with DESC clustering order (CASSANDRA-6950)
   * Invalid key cache entries on DROP (CASSANDRA-6525)
   * Fix flapping RecoveryManagerTest (CASSANDRA-7084)
-  * Add missing iso8601 patterns for date strings (6973)
++ * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 + * Add authentication support to shuffle (CASSANDRA-6484)
++ * Swap local and global default read repair chances (CASSANDRA-7320)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/743becb5/NEWS.txt
--
diff --cc NEWS.txt
index ab47576,422330c..c1b2b44
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,53 -13,16 +13,64 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +2.1
 +===
 +
 +New features
 +
 +   - SSTable data directory name is slightly changed. Each directory will
 + have hex string appended after CF name, e.g.
 + ks/cf-5be396077b811e3a3ab9dc4b9ac088d/
 + This hex string part represents unique ColumnFamily ID.
 + Note that existing directories are used as is, so only newly created
 + directories after upgrade have new directory name format.
 +   - Saved key cache files also have ColumnFamily ID in their file name.
 +   - It is now possible to do incremental repairs, sstables that have been
 + repaired are marked with a timestamp and not included in the next
 + repair session. Use nodetool repair -par -inc to use this feature.
 + A tool to manually mark/unmark sstables as repaired is available in
 + tools/bin/sstablerepairedset. This is particularly important when
 + using LCS, or any data not repaired in your first incremental repair
 + will be put back in L0.
 +   - Bootstrapping now ensures that range movements are consistent,
 + meaning the data for the new node is taken from the node that is no 
 + longer a responsible for that range of keys.  
 + If you want the old behavior (due to a lost node perhaps)
 + you can set the following property (-Dconsistent.rangemovement=false)
 +
 +Upgrading
 +-
 +   - Rolling upgrades from anything pre-2.0.7 is not supported. Furthermore
 + pre-2.0 sstables are not supported. This means that before upgrading
 + a node on 2.1, this node must be started on 2.0 and
 + 'nodetool upgdradesstables' must be run (and this even in the case
 + of not-rolling upgrades).
 +   - For size-tiered compaction users, Cassandra now defaults to ignoring
 + the coldest 5% of sstables.  This can be customized with the
 + cold_reads_to_omit compaction option; 0.0 omits nothing (the old
 + behavior) and 1.0 omits everything.
 +   - Multithreaded compaction has been removed.
 +   - Counters implementation has been changed, replaced by a safer one with
 + less caveats, but different performance characteristics. You might have
 + to change your data model to accomodate the new implementation.
 + (See https://issues.apache.org/jira/browse/CASSANDRA-6504 and the dev
 + blog post at http://www.datastax.com/dev/blog/PLACEHOLDER for details).
 +   - (per-table) index_interval parameter has been replaced with
 + min_index_interval and max_index_interval paratemeters. index_interval
 + has been deprecated.
 +

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

2014-05-29 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: a8d18c9c1968df1581881a0f82d1c8a3b3ed1e12
Parents: 77f06b8 7216639
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu May 29 23:00:03 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu May 29 23:00:03 2014 +0300

--
 CHANGES.txt |  1 +
 doc/cql3/CQL.textile|  1 +
 src/java/org/apache/cassandra/cql3/Cql.g| 12 +++-
 .../cassandra/cql3/statements/CreateUserStatement.java  | 10 --
 .../cassandra/cql3/statements/DropUserStatement.java| 10 --
 5 files changed, 25 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8d18c9c/CHANGES.txt
--
diff --cc CHANGES.txt
index fbe5f70,28c2ad6..f313278
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -77,10 -45,11 +77,11 @@@ Merged from 2.0
   * Fix 2ndary index queries with DESC clustering order (CASSANDRA-6950)
   * Invalid key cache entries on DROP (CASSANDRA-6525)
   * Fix flapping RecoveryManagerTest (CASSANDRA-7084)
 + * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 + * Add authentication support to shuffle (CASSANDRA-6484)
 + * Swap local and global default read repair chances (CASSANDRA-7320)
++ * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8d18c9c/doc/cql3/CQL.textile
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8d18c9c/src/java/org/apache/cassandra/cql3/Cql.g
--

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

2014-05-28 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 6d1500c5012d570a23ca754df1acd0f56aab1d5b
Parents: 3ac2614 0c96f99
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Wed May 28 06:45:39 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Wed May 28 06:45:39 2014 -0400

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


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

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

2014-05-28 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: ea02b690019e0fe9c7326e30e8dc1d3de18373ce
Parents: 5767757 d92a79f
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed May 28 17:00:28 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed May 28 17:00:28 2014 -0500

--
 src/java/org/apache/cassandra/cql3/Tuples.java | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea02b690/src/java/org/apache/cassandra/cql3/Tuples.java
--
diff --cc src/java/org/apache/cassandra/cql3/Tuples.java
index 3aabbd3,818e3e6..384633d
--- a/src/java/org/apache/cassandra/cql3/Tuples.java
+++ b/src/java/org/apache/cassandra/cql3/Tuples.java
@@@ -305,12 -305,9 +305,9 @@@ public class Tuple
  super(bindIndex, receiver);
  }
  
 -public Value bind(ListByteBuffer values) throws 
InvalidRequestException
 +public Value bind(QueryOptions options) throws InvalidRequestException
  {
 -ByteBuffer value = values.get(bindIndex);
 +ByteBuffer value = options.getValues().get(bindIndex);
- if (value == null)
- return null;
- 
  return value == null ? null : Value.fromSerialized(value, 
(TupleType)receiver.type);
  }
  }

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

2014-05-28 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 7a284ae93ac60ad456f3f1c11a1aa31e9a2b6c12
Parents: 3391b99 d31c29c
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed May 28 17:39:13 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed May 28 17:39:13 2014 -0500

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


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

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

2014-05-28 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: 01c5e346fb20814b554ace3ac331138b5780daaf
Parents: 7a284ae 50599d2
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed May 28 17:43:29 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed May 28 17:43:29 2014 -0500

--

--

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

2014-05-27 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 8602fe8ce85cf89319724cae84bc43912de1eb44
Parents: 7f930e0 9376fdd
Author: Marcus Eriksson marc...@apache.org
Authored: Tue May 27 10:29:03 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue May 27 10:29:03 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8602fe8c/CHANGES.txt
--
diff --cc CHANGES.txt
index 9bde1f3,42a1148..fcc1e73
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,10 +1,32 @@@
 -2.0.9
 - * Add missing iso8601 patterns for date strings (6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 +2.1.0-rc1
 + * Add tab-completion to debian nodetool packaging (CASSANDRA-6421)
 + * Change concurrent_compactors defaults (CASSANDRA-7139)
 + * Add PowerShell Windows launch scripts (CASSANDRA-7001)
 + * Make commitlog archive+restore more robust (CASSANDRA-6974)
 + * Fix marking commitlogsegments clean (CASSANDRA-6959)
 + * Add snapshot manifest describing files included (CASSANDRA-6326)
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
 + * Upgrade NBHM lib (CASSANDRA-7128)
 + * Optimize netty server (CASSANDRA-6861)
 + * Fix repair hang when given CF does not exist (CASSANDRA-7189)
 + * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
 + * Add server side batching to native transport (CASSANDRA-5663)
 + * Make batchlog replay asynchronous (CASSANDRA-6134)
 + * remove unused classes (CASSANDRA-7197)
 + * Limit user types to the keyspace they are defined in (CASSANDRA-6643)
 + * Add validate method to CollectionType (CASSANDRA-7208)
 + * New serialization format for UDT values (CASSANDRA-7209, CASSANDRA-7261)
 + * Fix nodetool netstats (CASSANDRA-7270)
 + * Fix potential ClassCastException in HintedHandoffManager (CASSANDRA-7284)
 + * Use prepared statements internally (CASSANDRA-6975)
 + * Fix broken paging state with prepared statement (CASSANDRA-7120)
 + * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287)
 + * Allow nulls/non-existant fields in UDT (CASSANDRA-7206)
 +Merged from 2.0:
+  * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 -
 -2.0.8
   * Always reallocate buffers in HSHA (CASSANDRA-6285)
   * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
   * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8602fe8c/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
--

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

2014-05-27 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java


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

Branch: refs/heads/trunk
Commit: 86b6ec529979ceeeb2ae15704b82f18beb1258b2
Parents: 8602fe8 367c741
Author: Marcus Eriksson marc...@apache.org
Authored: Tue May 27 10:43:50 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue May 27 10:43:50 2014 +0200

--
 CHANGES.txt |   1 +
 doc/cql3/CQL.textile|  21 ++--
 pylib/cqlshlib/cql3handling.py  |   2 +-
 .../compaction/AbstractCompactionStrategy.java  |  21 
 .../db/compaction/CompactionsTest.java  | 103 ---
 5 files changed, 124 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/86b6ec52/CHANGES.txt
--
diff --cc CHANGES.txt
index fcc1e73,6a16cae..6240e1e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,11 +1,33 @@@
 -2.0.9
 - * Add missing iso8601 patterns for date strings (6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 +2.1.0-rc1
 + * Add tab-completion to debian nodetool packaging (CASSANDRA-6421)
 + * Change concurrent_compactors defaults (CASSANDRA-7139)
 + * Add PowerShell Windows launch scripts (CASSANDRA-7001)
 + * Make commitlog archive+restore more robust (CASSANDRA-6974)
 + * Fix marking commitlogsegments clean (CASSANDRA-6959)
 + * Add snapshot manifest describing files included (CASSANDRA-6326)
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
 + * Upgrade NBHM lib (CASSANDRA-7128)
 + * Optimize netty server (CASSANDRA-6861)
 + * Fix repair hang when given CF does not exist (CASSANDRA-7189)
 + * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
 + * Add server side batching to native transport (CASSANDRA-5663)
 + * Make batchlog replay asynchronous (CASSANDRA-6134)
 + * remove unused classes (CASSANDRA-7197)
 + * Limit user types to the keyspace they are defined in (CASSANDRA-6643)
 + * Add validate method to CollectionType (CASSANDRA-7208)
 + * New serialization format for UDT values (CASSANDRA-7209, CASSANDRA-7261)
 + * Fix nodetool netstats (CASSANDRA-7270)
 + * Fix potential ClassCastException in HintedHandoffManager (CASSANDRA-7284)
 + * Use prepared statements internally (CASSANDRA-6975)
 + * Fix broken paging state with prepared statement (CASSANDRA-7120)
 + * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287)
 + * Allow nulls/non-existant fields in UDT (CASSANDRA-7206)
 +Merged from 2.0:
   * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
+  * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 -
 -2.0.8
   * Always reallocate buffers in HSHA (CASSANDRA-6285)
   * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
   * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/86b6ec52/doc/cql3/CQL.textile
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/86b6ec52/pylib/cqlshlib/cql3handling.py
--
diff --cc pylib/cqlshlib/cql3handling.py
index e4364a0,b2557fe..2710941
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -74,11 -79,9 +74,11 @@@ class Cql3ParsingRuleSet(CqlParsingRule
  # (CQL3 option name, schema_columnfamilies column name (or None if 
same),
  #  list of known map keys)
  ('compaction', 'compaction_strategy_options',
- ('class', 'max_threshold', 'tombstone_compaction_interval', 
'tombstone_threshold', 'enabled')),
+ ('class', 'max_threshold', 'tombstone_compaction_interval', 
'tombstone_threshold', 'enabled', 'unchecked_tombstone_compaction')),
  ('compression', 'compression_parameters',
  ('sstable_compression', 'chunk_length_kb', 'crc_check_chance')),
 +('caching', None,
 +('rows_per_partition', 'keys')),
  )
  
  obsolete_cf_options = ()

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

2014-05-27 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 5b3144905f08f47e114188647b570450631180a9
Parents: 8cb5058 54618a1
Author: Marcus Eriksson marc...@apache.org
Authored: Wed May 28 07:45:24 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed May 28 07:45:24 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b314490/CHANGES.txt
--
diff --cc CHANGES.txt
index 6240e1e,2b8ce60..a71867a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,12 +1,34 @@@
 -2.0.9
 - * Add missing iso8601 patterns for date strings (6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 +2.1.0-rc1
 + * Add tab-completion to debian nodetool packaging (CASSANDRA-6421)
 + * Change concurrent_compactors defaults (CASSANDRA-7139)
 + * Add PowerShell Windows launch scripts (CASSANDRA-7001)
 + * Make commitlog archive+restore more robust (CASSANDRA-6974)
 + * Fix marking commitlogsegments clean (CASSANDRA-6959)
 + * Add snapshot manifest describing files included (CASSANDRA-6326)
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
 + * Upgrade NBHM lib (CASSANDRA-7128)
 + * Optimize netty server (CASSANDRA-6861)
 + * Fix repair hang when given CF does not exist (CASSANDRA-7189)
 + * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
 + * Add server side batching to native transport (CASSANDRA-5663)
 + * Make batchlog replay asynchronous (CASSANDRA-6134)
 + * remove unused classes (CASSANDRA-7197)
 + * Limit user types to the keyspace they are defined in (CASSANDRA-6643)
 + * Add validate method to CollectionType (CASSANDRA-7208)
 + * New serialization format for UDT values (CASSANDRA-7209, CASSANDRA-7261)
 + * Fix nodetool netstats (CASSANDRA-7270)
 + * Fix potential ClassCastException in HintedHandoffManager (CASSANDRA-7284)
 + * Use prepared statements internally (CASSANDRA-6975)
 + * Fix broken paging state with prepared statement (CASSANDRA-7120)
 + * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287)
 + * Allow nulls/non-existant fields in UDT (CASSANDRA-7206)
 +Merged from 2.0:
   * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
   * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
+  * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 -
 -2.0.8
   * Always reallocate buffers in HSHA (CASSANDRA-6285)
   * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
   * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)

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

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

2014-05-26 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 7f930e02798af1ba2eb57124f606c0d904396736
Parents: 39c295d ea5b624
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Mon May 26 16:39:50 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Mon May 26 16:39:50 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f930e02/src/java/org/apache/cassandra/gms/Gossiper.java
--

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

2014-05-25 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
bin/cqlsh


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

Branch: refs/heads/trunk
Commit: a277eabe17998309b62adde07eaaddc0ee4c0c6a
Parents: 3aef07d 6faf80c
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sun May 25 18:16:32 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sun May 25 18:16:32 2014 +0300

--

--

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

2014-05-23 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 0b9b1fca0a4dba50df8f26415f9b7aeedd0c5d9b
Parents: dfcb734 926f639
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri May 23 11:21:01 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri May 23 11:21:01 2014 -0500

--
 doc/cql3/CQL.textile| 20 +++-
 .../apache/cassandra/cql3/QueryProcessor.java   |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b9b1fca/doc/cql3/CQL.textile
--

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

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

2014-05-19 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
src/java/org/apache/cassandra/cql3/ColumnCondition.java
src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
src/java/org/apache/cassandra/cql3/statements/Selection.java
src/java/org/apache/cassandra/db/marshal/CollectionType.java
src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
src/java/org/apache/cassandra/db/marshal/ListType.java
src/java/org/apache/cassandra/db/marshal/MapType.java
src/java/org/apache/cassandra/db/marshal/SetType.java
src/java/org/apache/cassandra/serializers/CollectionSerializer.java
src/java/org/apache/cassandra/serializers/ListSerializer.java
src/java/org/apache/cassandra/serializers/MapSerializer.java
src/java/org/apache/cassandra/serializers/SetSerializer.java
test/unit/org/apache/cassandra/db/marshal/CollectionTypeTest.java


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

Branch: refs/heads/trunk
Commit: 33bd8c207a2b59990019c2cbfcbeceb9b6f8456e
Parents: 07dc6b5 9d06ea6
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon May 19 12:26:32 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon May 19 12:26:32 2014 +0200

--
 .../apache/cassandra/cql3/ColumnCondition.java  | 277 +--
 src/java/org/apache/cassandra/cql3/Lists.java   |  13 +
 src/java/org/apache/cassandra/cql3/Maps.java|  20 ++
 src/java/org/apache/cassandra/cql3/Sets.java|  15 +
 .../cql3/statements/CQL3CasConditions.java  |  10 +-
 .../cql3/statements/ModificationStatement.java  |   4 +-
 .../cql3/statements/SelectStatement.java|  16 +-
 .../cassandra/cql3/statements/Selection.java|  39 +--
 8 files changed, 272 insertions(+), 122 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/33bd8c20/src/java/org/apache/cassandra/cql3/ColumnCondition.java
--
diff --cc src/java/org/apache/cassandra/cql3/ColumnCondition.java
index c2617fe,adc8e3a..ed2b6b4
--- a/src/java/org/apache/cassandra/cql3/ColumnCondition.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnCondition.java
@@@ -74,122 -73,209 +75,196 @@@ public class ColumnConditio
  value.collectMarkerSpecification(boundNames);
  }
  
- public ColumnCondition.WithOptions with(QueryOptions options)
 -public ColumnCondition.Bound bind(ListByteBuffer variables) throws 
InvalidRequestException
++public ColumnCondition.Bound bind(QueryOptions options) throws 
InvalidRequestException
  {
- return new WithOptions(options);
+ return column.type instanceof CollectionType
 - ? (collectionElement == null ? new CollectionBound(this, 
variables) : new ElementAccessBound(this, variables))
 - : new SimpleBound(this, variables);
++ ? (collectionElement == null ? new CollectionBound(this, 
options) : new ElementAccessBound(this, options))
++ : new SimpleBound(this, options);
  }
  
- public class WithOptions
+ public static abstract class Bound
  {
- private final QueryOptions options;
 -public final CFDefinition.Name column;
++public final ColumnDefinition column;
  
- private WithOptions(QueryOptions options)
 -protected Bound(CFDefinition.Name column)
++protected Bound(ColumnDefinition column)
  {
- this.options = options;
+ this.column = column;
  }
  
- public boolean equalsTo(WithOptions other) throws 
InvalidRequestException
+ /**
+  * Validates whether this condition applies to {@code current}.
+  */
 -public abstract boolean appliesTo(ColumnNameBuilder rowPrefix, 
ColumnFamily current, long now) throws InvalidRequestException;
++public abstract boolean appliesTo(Composite rowPrefix, ColumnFamily 
current, long now) throws InvalidRequestException;
+ 
+ public ByteBuffer getCollectionElementValue()
  {
- if (!column().equals(other.column()))
- return false;
+ return null;
+ }
  
- if ((collectionElement() == null) != (other.collectionElement() 
== null))
- return false;
 -protected ColumnNameBuilder copyOrUpdatePrefix(CFMetaData cfm, 
ColumnNameBuilder rowPrefix)
 -{
 -

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

2014-05-19 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 66a3da0e2fed7fd87f3af7bf73d821bcc21fad7a
Parents: 590b3b2 86632a1
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon May 19 12:33:06 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon May 19 12:33:06 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66a3da0e/CHANGES.txt
--
diff --cc CHANGES.txt
index 4efaa46,5c9b436..eda9fd8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,7 -28,9 +35,9 @@@ Merged from 2.0
   * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
   * Fix the InvertedIndex trigger example (CASSANDRA-7211)
   * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
 - * Fix duplicated error messages on directory creation error at startup 
(CASSANDRA-5818)
   * reduce garbage on codec flag deserialization (CASSANDRA-7244) 
++ * Fix duplicated error messages on directory creation error at startup 
(CASSANDRA-5818)
+  * Proper null handle for IF with map element access (CASSANDRA-7155)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

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

2014-05-19 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java


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

Branch: refs/heads/trunk
Commit: 518c3cf61679654545d7dd07fd6ca8efd8428389
Parents: 66a3da0 e3a88b9
Author: Marcus Eriksson marc...@apache.org
Authored: Mon May 19 14:32:54 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon May 19 14:32:54 2014 +0200

--
 CHANGES.txt | 1 +
 .../apache/cassandra/db/compaction/CompactionManager.java   | 6 +++---
 .../org/apache/cassandra/metrics/ColumnFamilyMetrics.java   | 9 +
 3 files changed, 13 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/518c3cf6/CHANGES.txt
--
diff --cc CHANGES.txt
index eda9fd8,ed818db..860e8e2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,9 -28,10 +35,10 @@@ Merged from 2.0
   * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
   * Fix the InvertedIndex trigger example (CASSANDRA-7211)
   * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
 - * Fix duplicated error messages on directory creation error at startup 
(CASSANDRA-5818)
   * reduce garbage on codec flag deserialization (CASSANDRA-7244) 
 + * Fix duplicated error messages on directory creation error at startup 
(CASSANDRA-5818)
   * Proper null handle for IF with map element access (CASSANDRA-7155)
+  * Improve compaction visibility (CASSANDRA-7242)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/518c3cf6/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
--
diff --cc src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index efbf60e,8880485..f080fd0
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@@ -62,7 -55,9 +62,9 @@@ public class ColumnFamilyMetric
  /** (Local) write metrics */
  public final LatencyMetrics writeLatency;
  /** Estimated number of tasks pending for this column family */
 -public final GaugeInteger pendingTasks;
 +public final Counter pendingFlushes;
+ /** Estimate of number of pending compactios for this CF */
+ public final GaugeInteger pendingCompactions;
  /** Number of SSTables on disk for this CF */
  public final GaugeInteger liveSSTableCount;
  /** Disk space used by SSTables belonging to this CF */
@@@ -231,7 -177,21 +233,14 @@@
  });
  readLatency = new LatencyMetrics(factory, Read);
  writeLatency = new LatencyMetrics(factory, Write);
 +pendingFlushes = 
Metrics.newCounter(factory.createMetricName(PendingFlushes));
+ pendingCompactions = 
Metrics.newGauge(factory.createMetricName(PendingCompactions), new 
GaugeInteger()
+ {
+ public Integer value()
+ {
+ return 
cfs.getCompactionStrategy().getEstimatedRemainingTasks();
+ }
+ });
 -pendingTasks = 
Metrics.newGauge(factory.createMetricName(PendingTasks), new GaugeInteger()
 -{
 -public Integer value()
 -{
 -// TODO this actually isn't a good measure of pending tasks
 -return Keyspace.switchLock.getQueueLength();
 -}
 -});
  liveSSTableCount = 
Metrics.newGauge(factory.createMetricName(LiveSSTableCount), new 
GaugeInteger()
  {
  public Integer value()

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

2014-05-19 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 8465a91b4d0909f2b48b45845c4b78bf1cd8c849
Parents: ba08eb3 76139e4
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Tue May 20 00:10:14 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue May 20 00:10:14 2014 -0400

--

--

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

2014-05-17 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 3b8482a0163597e47c14a71b8eea8e5fb332ab26
Parents: c045690 7eefbf8
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat May 17 12:48:58 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat May 17 12:48:58 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b8482a0/CHANGES.txt
--
diff --cc CHANGES.txt
index d12acc9,4f84af1..3a9eb2b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -34,6 -13,26 +34,7 @@@ Merged from 2.0
   * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
   * Fix the InvertedIndex trigger example (CASSANDRA-7211)
   * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
 - * Fix duplicated error messages on directory creation error at startup 
(CASSANDRA-5818)
+  * reduce garbage on codec flag deserialization (CASSANDRA-7244) 
 -
 -
 -2.0.8
 - * Correctly delete scheduled range xfers (CASSANDRA-7143)
 - * Make batchlog replica selection rack-aware (CASSANDRA-6551)
 - * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 - * Set JMX RMI port to 7199 (CASSANDRA-7087)
 - * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 - * Log a warning for large batches (CASSANDRA-6487)
 - * Queries on compact tables can return more rows that requested 
(CASSANDRA-7052)
 - * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 - * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 - * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 - * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
 - * Plug holes in resource release when wiring up StreamSession 
(CASSANDRA-7073)
 - * Re-add parameter columns to tracing session (CASSANDRA-6942)
 - * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
 - * Suggest CTRL-C or semicolon after three blank lines in cqlsh 
(CASSANDRA-7142)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b8482a0/src/java/org/apache/cassandra/cql3/QueryOptions.java
--
diff --cc src/java/org/apache/cassandra/cql3/QueryOptions.java
index 5801d55,0f3e11b..9c28762
--- a/src/java/org/apache/cassandra/cql3/QueryOptions.java
+++ b/src/java/org/apache/cassandra/cql3/QueryOptions.java
@@@ -274,10 -152,10 +274,12 @@@ public abstract class QueryOption
  SKIP_METADATA,
  PAGE_SIZE,
  PAGING_STATE,
 -SERIAL_CONSISTENCY;
 +SERIAL_CONSISTENCY,
 +TIMESTAMP,
 +NAMES_FOR_VALUES;
  
+ private static final Flag[] ALL_VALUES = values();
+ 
  public static EnumSetFlag deserialize(int flags)
  {
  EnumSetFlag set = EnumSet.noneOf(Flag.class);

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

2014-05-17 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 4ad6db380ac3f7a2a26fbf0aafe2364981c0912e
Parents: 3b8482a eaa78e0
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat May 17 17:03:05 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat May 17 17:03:05 2014 -0400

--
 src/java/org/apache/cassandra/db/index/keys/KeysIndex.java | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ad6db38/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
--

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

2014-05-17 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 07dc6b5cc945c6e59e90782c28ae6ae7cd6a82ed
Parents: 4ad6db3 58dc488
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat May 17 20:43:50 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat May 17 20:43:50 2014 -0400

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


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

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

2014-05-16 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 1b1f0b0790cf4f36fddd6815634261ace6cb588e
Parents: 773b95e 16fd1a4
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Thu May 8 00:39:13 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Thu May 8 00:39:13 2014 -0400

--
 CHANGES.txt   | 3 ++-
 conf/cassandra-env.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b1f0b07/CHANGES.txt
--
diff --cc CHANGES.txt
index 4a0548a,05cc193..f57b649
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,25 +1,18 @@@
 -2.0.9
 - * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
 - * Starting threads in OutboundTcpConnectionPool constructor causes race 
conditions (CASSANDRA-7177)
 - * return all cpu values from BackgroundActivityMonitor.readAndCompute 
(CASSANDRA-7183)
 - * fix c* launch issues on Russian os's due to output of linux 'free' cmd 
(CASSANDRA-6162)
 -
 -2.0.8
 +2.1.0-rc1
 + * Add snapshot manifest describing files included (CASSANDRA-6326)
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
 + * Upgrade NBHM lib (CASSANDRA-7128)
 + * Optimize netty server (CASSANDRA-6861)
 +Merged from 2.0:
   * Correctly delete scheduled range xfers (CASSANDRA-7143)
   * Make batchlog replica selection rack-aware (CASSANDRA-6551)
 - * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 - * Set JMX RMI port to 7199 (CASSANDRA-7087)
 - * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 - * Log a warning for large batches (CASSANDRA-6487)
 - * Queries on compact tables can return more rows that requested 
(CASSANDRA-7052)
 - * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 - * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 - * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 - * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
 - * Plug holes in resource release when wiring up StreamSession 
(CASSANDRA-7073)
 - * Re-add parameter columns to tracing session (CASSANDRA-6942)
 - * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
   * Suggest CTRL-C or semicolon after three blank lines in cqlsh 
(CASSANDRA-7142)
-  * return all cpu values from BackgroundActivityMonitor.readAndCompute 
(CASSANDRA-7183)
++ * return all cpu values from BackgroundActivityMonitor.readAndCompute 
(CASSANDRA-7183)  
 + * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
++ * fix c* launch issues on Russian os's due to output of linux 'free' cmd 
(CASSANDRA-6162)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b1f0b07/conf/cassandra-env.sh
--

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

2014-05-14 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java


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

Branch: refs/heads/trunk
Commit: c6bed827020831dba31d30ba32cee1f358473b38
Parents: 09feef3 820f0eb
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue May 13 17:51:34 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue May 13 17:51:34 2014 +0300

--
 CHANGES.txt|  1 +
 .../apache/cassandra/triggers/InvertedIndex.java   | 17 -
 2 files changed, 13 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6bed827/CHANGES.txt
--
diff --cc CHANGES.txt
index 4abb285,58cebbd..6e0c9e3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -22,6 -9,25 +22,7 @@@ Merged from 2.0
   * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
   * cqlsh: Accept and execute CQL statement(s) from command-line parameter 
(CASSANDRA-7172)
   * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
+  * Fix the InvertedIndex trigger example (CASSANDRA-7211)
 -
 -
 -2.0.8
 - * Correctly delete scheduled range xfers (CASSANDRA-7143)
 - * Make batchlog replica selection rack-aware (CASSANDRA-6551)
 - * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 - * Set JMX RMI port to 7199 (CASSANDRA-7087)
 - * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 - * Log a warning for large batches (CASSANDRA-6487)
 - * Queries on compact tables can return more rows that requested 
(CASSANDRA-7052)
 - * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 - * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 - * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 - * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
 - * Plug holes in resource release when wiring up StreamSession 
(CASSANDRA-7073)
 - * Re-add parameter columns to tracing session (CASSANDRA-6942)
 - * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
 - * Suggest CTRL-C or semicolon after three blank lines in cqlsh 
(CASSANDRA-7142)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6bed827/examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java
--
diff --cc examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java
index 8ebc46e,ae58b33..11e98b5
--- a/examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java
+++ b/examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java
@@@ -37,15 -37,21 +37,21 @@@ public class InvertedIndex implements I
  private static final Logger logger = 
LoggerFactory.getLogger(InvertedIndex.class);
  private Properties properties = loadProperties();
  
 -public CollectionRowMutation augment(ByteBuffer key, ColumnFamily 
update)
 +public CollectionMutation augment(ByteBuffer key, ColumnFamily update)
  {
- ListMutation mutations = new ArrayList();
 -ListRowMutation mutations = new ArrayList();
++ListMutation mutations = new ArrayList(update.getColumnCount());
+ 
 -for (Column cell : update)
 +for (Cell cell : update)
  {
- Mutation mutation = new 
Mutation(properties.getProperty(keyspace), cell.value());
- mutation.add(properties.getProperty(columnfamily), cell.name(), 
key, System.currentTimeMillis());
- mutations.add(mutation);
+ // Skip the row marker and other empty values, since they lead to 
an empty key.
+ if (cell.value().remaining()  0)
+ {
 -RowMutation mutation = new 
RowMutation(properties.getProperty(keyspace), cell.value());
++Mutation mutation = new 
Mutation(properties.getProperty(keyspace), cell.value());
+ mutation.add(properties.getProperty(columnfamily), 
cell.name(), key, System.currentTimeMillis());
+ mutations.add(mutation);
+ }
  }
+ 
  return mutations;
  }

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

2014-05-12 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: a89fd4d1d6387e284d7f12da9102322aee4c31d6
Parents: 355e69b 46f7f84
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu May 8 15:59:03 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu May 8 15:59:03 2014 -0500

--
 doc/cql3/CQL.textile | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a89fd4d1/doc/cql3/CQL.textile
--

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

2014-05-11 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 8dab582c2421b21f8d87a26f55941f1ee1f8b516
Parents: 3b299c4 d6f32e4
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu May 8 18:05:13 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu May 8 18:05:13 2014 +0200

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/db/marshal/AbstractType.java | 3 +--
 .../apache/cassandra/serializers/InetAddressSerializer.java| 2 +-
 .../org/apache/cassandra/serializers/IntegerSerializer.java| 6 +++---
 src/java/org/apache/cassandra/serializers/LongSerializer.java  | 2 +-
 .../org/apache/cassandra/serializers/TimestampSerializer.java  | 2 +-
 src/java/org/apache/cassandra/serializers/UUIDSerializer.java  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8dab582c/CHANGES.txt
--
diff --cc CHANGES.txt
index 5afe800,a6cbc18..057fd34
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,27 +1,21 @@@
 -2.0.9
 - * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
 - * Starting threads in OutboundTcpConnectionPool constructor causes race 
conditions (CASSANDRA-7177)
 - * return all cpu values from BackgroundActivityMonitor.readAndCompute 
(CASSANDRA-7183)
 - * fix c* launch issues on Russian os's due to output of linux 'free' cmd 
(CASSANDRA-6162)
 - * Fix disabling autocompaction (CASSANDRA-7187)
 - * Fix potential NumberFormatException when deserializing IntegerType 
(CASSANDRA-7088)
 -
 -2.0.8
 +2.1.0-rc1
 + * Fix marking commitlogsegments clean (CASSANDRA-6959)
 + * Add snapshot manifest describing files included (CASSANDRA-6326)
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
 + * Upgrade NBHM lib (CASSANDRA-7128)
 + * Optimize netty server (CASSANDRA-6861)
 +Merged from 2.0:
   * Correctly delete scheduled range xfers (CASSANDRA-7143)
   * Make batchlog replica selection rack-aware (CASSANDRA-6551)
 - * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 - * Set JMX RMI port to 7199 (CASSANDRA-7087)
 - * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 - * Log a warning for large batches (CASSANDRA-6487)
 - * Queries on compact tables can return more rows that requested 
(CASSANDRA-7052)
 - * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 - * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 - * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 - * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
 - * Plug holes in resource release when wiring up StreamSession 
(CASSANDRA-7073)
 - * Re-add parameter columns to tracing session (CASSANDRA-6942)
 - * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
   * Suggest CTRL-C or semicolon after three blank lines in cqlsh 
(CASSANDRA-7142)
 + * return all cpu values from BackgroundActivityMonitor.readAndCompute 
(CASSANDRA-7183)  
 + * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
 + * fix c* launch issues on Russian os's due to output of linux 'free' cmd 
(CASSANDRA-6162)
 + * Fix disabling autocompaction (CASSANDRA-7187)
++ * Fix potential NumberFormatException when deserializing IntegerType 
(CASSANDRA-7088)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8dab582c/src/java/org/apache/cassandra/db/marshal/AbstractType.java
--

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

2014-05-10 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 7b398c52d52577c7d5c9537e862655b369098a84
Parents: e3dd88a 453a074
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri May 9 19:51:25 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri May 9 19:51:25 2014 -0400

--
 CHANGES.txt |  1 +
 .../cassandra/hadoop/cql3/CqlPagingRecordReader.java| 12 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b398c52/CHANGES.txt
--
diff --cc CHANGES.txt
index 622d381,32bd539..e307843
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -19,6 -8,25 +19,7 @@@ Merged from 2.0
   * Fix potential NumberFormatException when deserializing IntegerType 
(CASSANDRA-7088)
   * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
   * cqlsh: Accept and execute CQL statement(s) from command-line parameter 
(CASSANDRA-7172)
+  * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
 -
 -
 -2.0.8
 - * Correctly delete scheduled range xfers (CASSANDRA-7143)
 - * Make batchlog replica selection rack-aware (CASSANDRA-6551)
 - * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 - * Set JMX RMI port to 7199 (CASSANDRA-7087)
 - * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 - * Log a warning for large batches (CASSANDRA-6487)
 - * Queries on compact tables can return more rows that requested 
(CASSANDRA-7052)
 - * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 - * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 - * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 - * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
 - * Plug holes in resource release when wiring up StreamSession 
(CASSANDRA-7073)
 - * Re-add parameter columns to tracing session (CASSANDRA-6942)
 - * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
 - * Suggest CTRL-C or semicolon after three blank lines in cqlsh 
(CASSANDRA-7142)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b398c52/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
--

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

2014-05-10 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: af802014d6e054b7bbb264b701f5a7f5545ec10d
Parents: 1b1f0b0 0490abf
Author: Marcus Eriksson marc...@apache.org
Authored: Thu May 8 08:18:25 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu May 8 08:18:25 2014 +0200

--
 CHANGES.txt |  1 +
 .../db/compaction/AbstractCompactionStrategy.java   | 16 +---
 .../apache/cassandra/service/CassandraDaemon.java   |  3 ++-
 3 files changed, 12 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/af802014/CHANGES.txt
--
diff --cc CHANGES.txt
index f57b649,0acf740..714a475
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,26 +1,19 @@@
 -2.0.9
 - * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
 - * Starting threads in OutboundTcpConnectionPool constructor causes race 
conditions (CASSANDRA-7177)
 - * return all cpu values from BackgroundActivityMonitor.readAndCompute 
(CASSANDRA-7183)
 - * fix c* launch issues on Russian os's due to output of linux 'free' cmd 
(CASSANDRA-6162)
 - * Fix disabling autocompaction (CASSANDRA-7187)
 -
 -2.0.8
 +2.1.0-rc1
 + * Add snapshot manifest describing files included (CASSANDRA-6326)
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
 + * Upgrade NBHM lib (CASSANDRA-7128)
 + * Optimize netty server (CASSANDRA-6861)
 +Merged from 2.0:
   * Correctly delete scheduled range xfers (CASSANDRA-7143)
   * Make batchlog replica selection rack-aware (CASSANDRA-6551)
 - * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 - * Set JMX RMI port to 7199 (CASSANDRA-7087)
 - * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 - * Log a warning for large batches (CASSANDRA-6487)
 - * Queries on compact tables can return more rows that requested 
(CASSANDRA-7052)
 - * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 - * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 - * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 - * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
 - * Plug holes in resource release when wiring up StreamSession 
(CASSANDRA-7073)
 - * Re-add parameter columns to tracing session (CASSANDRA-6942)
 - * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
   * Suggest CTRL-C or semicolon after three blank lines in cqlsh 
(CASSANDRA-7142)
 + * return all cpu values from BackgroundActivityMonitor.readAndCompute 
(CASSANDRA-7183)  
 + * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
 + * fix c* launch issues on Russian os's due to output of linux 'free' cmd 
(CASSANDRA-6162)
++ * Fix disabling autocompaction (CASSANDRA-7187)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

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

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

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

2014-05-05 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: ac63e180a50071bed398c82713452ccfe5c4237d
Parents: f0575f1 4791d98
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Mon May 5 23:45:53 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Mon May 5 23:45:53 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac63e180/src/java/org/apache/cassandra/db/BatchlogManager.java
--
diff --cc src/java/org/apache/cassandra/db/BatchlogManager.java
index de51c8d,b92c217..3ffc7a7
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@@ -271,14 -278,14 +271,14 @@@ public class BatchlogManager implement
  if (ttl = 0)
  return; // this batchlog entry has 'expired'
  
+ ListInetAddress liveEndpoints = new ArrayList();
+ ListInetAddress hintEndpoints = new ArrayList();
+ 
 -for (RowMutation mutation : mutations)
 +for (Mutation mutation : mutations)
  {
- ListInetAddress liveEndpoints = new ArrayList();
- ListInetAddress hintEndpoints = new ArrayList();
- 
  String ks = mutation.getKeyspaceName();
  Token tk = 
StorageService.getPartitioner().getToken(mutation.key());
 -int mutationSize = (int) 
RowMutation.serializer.serializedSize(mutation, version);
 +int mutationSize = (int) 
Mutation.serializer.serializedSize(mutation, version);
  
  for (InetAddress endpoint : 
Iterables.concat(StorageService.instance.getNaturalEndpoints(ks, tk),
   
StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk, ks)))

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

2014-05-05 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 8f5c16c499e51efd0d1f26480beb944ed1ed6c70
Parents: ac63e18 69e65be
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Tue May 6 00:15:37 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue May 6 00:15:37 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f5c16c4/src/java/org/apache/cassandra/locator/SnitchProperties.java
--

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

2014-05-03 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 38a48b1238fb57278b87215ff7046daf7f49920d
Parents: b53442b 3fb2dcd
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat May 3 16:40:14 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat May 3 16:40:14 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/38a48b12/src/java/org/apache/cassandra/locator/SnitchProperties.java
--

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

2014-05-03 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: f12a8a32e4ae72959b01931289231395d8949fc7
Parents: 38a48b1 65cd825
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat May 3 16:54:36 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat May 3 16:54:36 2014 -0400

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

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

2014-05-02 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: a811dd0e9a51b72d166d892e9940fa9c258b9da6
Parents: 18d3b52 2e9ac19
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri May 2 11:30:48 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri May 2 11:30:48 2014 +0200

--

--

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

2014-05-01 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 1491f75dd6313b2f17450e31184947d447ef6808
Parents: e786101 427fdd4
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu May 1 13:05:52 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu May 1 13:05:52 2014 -0500

--
 doc/cql3/CQL.textile | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1491f75d/doc/cql3/CQL.textile
--

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

2014-04-29 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: bcd14110bcf2ae9b1fbe4b3307eca154fa654614
Parents: 04884eb 90d086a
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Tue Apr 29 20:24:00 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue Apr 29 20:24:00 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcd14110/CHANGES.txt
--
diff --cc CHANGES.txt
index 73e39cc,428f8fc..b60feb8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -111,14 -80,7 +111,15 @@@ Merged from 2.0
 (CASSANDRA-6906)
   * Fix SSTable not released if stream session fails (CASSANDRA-6818)
   * Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
 + * Queries on compact tables can return more rows that requested 
(CASSANDRA-7052)
 + * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 + * Ensure that batchlog and hint timeouts do not produce hints 
(CASSANDRA-7058)
 + * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 + * Plug holes in resource release when wiring up StreamSession 
(CASSANDRA-7073)
++ * Re-add parameter columns to tracing session (CASSANDRA-6942)
  Merged from 1.2:
 + * Fix nodetool display with vnodes (CASSANDRA-7082)
   * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
   * add extra SSL cipher suites (CASSANDRA-6613)
   * fix nodetool getsstables for blob PK (CASSANDRA-6803)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcd14110/src/java/org/apache/cassandra/tracing/Tracing.java
--
diff --cc src/java/org/apache/cassandra/tracing/Tracing.java
index 6c68b29,88239be..31cc1ab
--- a/src/java/org/apache/cassandra/tracing/Tracing.java
+++ b/src/java/org/apache/cassandra/tracing/Tracing.java
@@@ -203,12 -206,13 +203,19 @@@ public class Tracin
  public void run()
  {
  CFMetaData cfMeta = CFMetaData.TraceSessionsCf;
 -ColumnFamily cf = 
TreeMapBackedSortedColumns.factory.create(cfMeta);
 -addColumn(cf, buildName(cfMeta, bytes(coordinator)), 
FBUtilities.getBroadcastAddress());
 +ColumnFamily cf = 
ArrayBackedSortedColumns.factory.create(cfMeta);
 +addColumn(cf, buildName(cfMeta, coordinator), 
FBUtilities.getBroadcastAddress());
  addParameterColumns(cf, parameters);
++ HEAD
 +addColumn(cf, buildName(cfMeta, request), request);
 +addColumn(cf, buildName(cfMeta, started_at), started_at);
 +mutateWithCatch(new Mutation(TRACE_KS, sessionIdBytes, cf));
++===
+ addColumn(cf, buildName(cfMeta, bytes(request)), request);
+ addColumn(cf, buildName(cfMeta, bytes(started_at)), 
started_at);
+ addParameterColumns(cf, parameters);
+ mutateWithCatch(new RowMutation(TRACE_KS, sessionIdBytes, 
cf));
++ cassandra-2.0
  }
  });
  }

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

2014-04-28 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 24eeeb91d2246b5e397a9728798a65445cb847da
Parents: 7316bb3 daf54c5
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Mon Apr 28 22:51:23 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Mon Apr 28 22:51:23 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/24eeeb91/src/java/org/apache/cassandra/cql3/statements/CreateTriggerStatement.java
--

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

2014-04-24 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 159e6dabbbec4850fe23d54923b3ffc12d75ef58
Parents: f5fd02f 86382f6
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Thu Apr 24 23:26:30 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Thu Apr 24 23:26:30 2014 -0400

--
 src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 --
 1 file changed, 2 deletions(-)
--


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

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

2014-04-23 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/StorageProxy.java
src/java/org/apache/cassandra/triggers/TriggerExecutor.java
test/unit/org/apache/cassandra/triggers/TriggersTest.java


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

Branch: refs/heads/trunk
Commit: 1f5212278378bda5623c48eaef39f4a54aef2e49
Parents: 4e95953 c1eb74c
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Apr 23 22:06:48 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Apr 23 22:06:48 2014 +0300

--
 CHANGES.txt |   1 +
 src/java/org/apache/cassandra/db/Mutation.java  |   5 +
 .../apache/cassandra/service/StorageProxy.java  |  23 +-
 .../cassandra/triggers/TriggerExecutor.java |  71 ++--
 .../cassandra/triggers/TriggerExecutorTest.java | 336 +++
 .../apache/cassandra/triggers/TriggersTest.java |  22 +-
 6 files changed, 410 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f521227/CHANGES.txt
--
diff --cc CHANGES.txt
index d32a107,68c335d..295eb78
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -107,10 -64,6 +107,11 @@@ Merged from 2.0
 (CASSANDRA-6906)
   * Fix SSTable not released if stream session fails (CASSANDRA-6818)
   * Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
 + * Queries on compact tables can return more rows that requested 
(CASSANDRA-7052)
 + * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 + * Ensure that batchlog and hint timeouts do not produce hints 
(CASSANDRA-7058)
++ * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
  Merged from 1.2:
   * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
   * add extra SSL cipher suites (CASSANDRA-6613)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f521227/src/java/org/apache/cassandra/db/Mutation.java
--
diff --cc src/java/org/apache/cassandra/db/Mutation.java
index 47c990f,000..6fae9b0
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/db/Mutation.java
+++ b/src/java/org/apache/cassandra/db/Mutation.java
@@@ -1,342 -1,0 +1,347 @@@
 +/*
 + * 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;
 +
 +import java.io.DataInput;
 +import java.io.IOException;
 +import java.nio.ByteBuffer;
 +import java.util.*;
 +
 +import org.apache.commons.lang3.StringUtils;
 +
 +import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.config.Schema;
 +import org.apache.cassandra.db.composites.CellName;
 +import org.apache.cassandra.db.composites.Composite;
 +import org.apache.cassandra.io.IVersionedSerializer;
 +import org.apache.cassandra.io.util.DataOutputPlus;
 +import org.apache.cassandra.net.MessageOut;
 +import org.apache.cassandra.net.MessagingService;
 +import org.apache.cassandra.utils.ByteBufferUtil;
 +
 +// TODO convert this to a Builder pattern instead of encouraging M.add 
directly,
 +// which is less-efficient since we have to keep a mutable HashMap around
 +public class Mutation implements IMutation
 +{
 +public static final MutationSerializer serializer = new 
MutationSerializer();
 +
 +public static final String FORWARD_TO = FWD_TO;
 +public static final String FORWARD_FROM = FWD_FRM;
 +
 +// todo this is redundant
 +// when we remove it, also restore SerializationsTest.testMutationRead to 
not regenerate new Mutations each test
 +private final String keyspaceName;
 +
 +private final ByteBuffer key;
 +// map

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

2014-04-23 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: 6acbb33fa4191e60d5e9cdd58f815dea7c2ff616
Parents: 072b488 c3550fe
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Apr 24 02:03:16 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Apr 24 02:03:16 2014 +0300

--

--

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

2014-04-22 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 3e6b29925686dac0275c2db64e3a3b69203b1747
Parents: 30e2bff 48d7e40
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Apr 22 10:12:47 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Apr 22 10:12:47 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e6b2992/doc/cql3/CQL.textile
--

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

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

2014-04-22 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/AtomicSortedColumns.java
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/32369eb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32369eb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32369eb6

Branch: refs/heads/trunk
Commit: 32369eb6d91a6af9ad798a67ad44d3b1e4182c83
Parents: c320cb3 93edb12
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Apr 22 18:50:46 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Apr 22 18:50:46 2014 +0300

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/AtomicBTreeColumns.java | 15 ---
 .../apache/cassandra/db/RangeTombstoneTest.java | 46 
 3 files changed, 1 insertion(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/32369eb6/CHANGES.txt
--
diff --cc CHANGES.txt
index ab3278e,89a8725..f7e3e97
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -102,8 -61,6 +102,9 @@@ Merged from 2.0
 (CASSANDRA-6906)
   * Fix SSTable not released if stream session fails (CASSANDRA-6818)
   * Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
 + * Queries on compact tables can return more rows that requested 
(CASSANDRA-7052)
 + * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
++ * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
  Merged from 1.2:
   * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
   * add extra SSL cipher suites (CASSANDRA-6613)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/32369eb6/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
--
diff --cc src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
index 8cbeb83,000..72038b6
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
+++ b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
@@@ -1,458 -1,0 +1,443 @@@
 +/*
 + * 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;
 +
 +import java.util.AbstractCollection;
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.Collection;
 +import java.util.Comparator;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 +
 +import com.google.common.base.Function;
 +import com.google.common.base.Functions;
 +import com.google.common.collect.*;
 +
 +import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.db.composites.CellName;
 +import org.apache.cassandra.db.composites.Composite;
 +import org.apache.cassandra.db.index.SecondaryIndexManager;
 +import org.apache.cassandra.db.filter.ColumnSlice;
 +import org.apache.cassandra.utils.ObjectSizes;
 +import org.apache.cassandra.utils.btree.BTree;
 +import org.apache.cassandra.utils.btree.BTreeSet;
 +import org.apache.cassandra.utils.btree.UpdateFunction;
 +
 +import static org.apache.cassandra.db.index.SecondaryIndexManager.Updater;
 +
 +/**
 + * A thread-safe and atomic ISortedColumns implementation.
 + * Operations (in particular addAll) on this implemenation are atomic and
 + * isolated (in the sense of ACID). Typically a addAll is guaranteed that no
 + * other thread can see the state where only parts but not all columns have
 + * been added.
 + * p/
 + * WARNING: removing element through getSortedColumns().iterator() is *not* 
supported
 + */
 +public class AtomicBTreeColumns extends ColumnFamily
 +{
 +static final long HEAP_SIZE = ObjectSizes.measure(new 
AtomicBTreeColumns(CFMetaData.IndexCf, null))
 ++ ObjectSizes.measure(new Holder(null, null));
 +
 +private static final FunctionCell, CellName NAME = new FunctionCell,

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

2014-04-22 Thread vijay

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: ad57cb010231a89d8795a0944bd99eb6e72079cc
Parents: 2c7622a 4e4d7bb
Author: Vijay vijay2...@gmail.com
Authored: Tue Apr 22 21:34:22 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Tue Apr 22 21:34:22 2014 -0700

--
 .../org/apache/cassandra/locator/DynamicEndpointSnitch.java   | 2 +-
 src/java/org/apache/cassandra/service/StorageService.java | 5 +
 .../org/apache/cassandra/utils/BackgroundActivityMonitor.java | 7 +++
 3 files changed, 13 insertions(+), 1 deletion(-)
--


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

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

2014-04-21 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 5c364016ab9e3fdb4c31a7ef4f030c15d8065af1
Parents: cde7809 54bf92f
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Apr 21 12:03:24 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Apr 21 12:03:24 2014 +0200

--
 CHANGES.txt |  1 +
 .../cql3/statements/SelectStatement.java| 34 
 .../cassandra/service/pager/QueryPager.java |  2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c364016/CHANGES.txt
--
diff --cc CHANGES.txt
index b0e8e0d,b976d64..d6d13c5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -98,6 -56,6 +98,7 @@@ Merged from 2.0
 (CASSANDRA-6906)
   * Fix SSTable not released if stream session fails (CASSANDRA-6818)
   * Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
++ * Queries on compact tables can return more rows that requested 
(CASSANDRA-7052)
  Merged from 1.2:
   * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
   * add extra SSL cipher suites (CASSANDRA-6613)

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

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

2014-04-18 Thread dbrosius

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 22d86eb2d280093dde206809fb48ca8c0dc7f0e6
Parents: 66af6fe ba95a68
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri Apr 18 19:51:47 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri Apr 18 19:51:47 2014 -0400

--
 CHANGES.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


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

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

2014-04-11 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 7232783bc5ab7134c1698d866ceb9cca330d0441
Parents: 3f00662 294c011
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Apr 11 16:43:41 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Apr 11 16:43:41 2014 -0500

--
 CHANGES.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


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

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

2014-04-08 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 0fa5cba35b9c97ad34dedbbd89a933f5b9d156e9
Parents: 2e916f9 84daab5
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Apr 8 12:26:09 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Apr 8 12:26:09 2014 -0500

--
 CHANGES.txt | 1 +
 build.xml   | 2 ++
 2 files changed, 3 insertions(+)
--


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

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

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

2014-04-02 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: ef08e62589f9a27c76f610058373780ce36a7d89
Parents: 8afe109 e1a9093
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Apr 2 14:28:54 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Apr 2 14:28:54 2014 +0200

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef08e625/src/java/org/apache/cassandra/db/SuperColumns.java
--
diff --cc src/java/org/apache/cassandra/db/SuperColumns.java
index 46c5577,0f74587..bab46eb
--- a/src/java/org/apache/cassandra/db/SuperColumns.java
+++ b/src/java/org/apache/cassandra/db/SuperColumns.java
@@@ -124,52 -205,155 +124,51 @@@ public class SuperColumn
  }
  }
  
 -public static AbstractType? getComparatorFor(CFMetaData metadata, 
ByteBuffer superColumn)
 -{
 -return getComparatorFor(metadata, superColumn != null);
 -}
 -
 -public static AbstractType? getComparatorFor(CFMetaData metadata, 
boolean subColumn)
 +private static CellNameType subType(CellNameType type)
  {
 -return metadata.isSuper()
 - ? ((CompositeType)metadata.comparator).types.get(subColumn ? 1 : 
0)
 - : metadata.comparator;
 +return new SimpleDenseCellNameType(type.subtype(1));
  }
  
 -// Extract the first component of a columnName, i.e. the super column name
 -public static ByteBuffer scName(ByteBuffer columnName)
 +public static CellNameType scNameType(CellNameType type)
  {
 -return CompositeType.extractComponent(columnName, 0);
 +return new SimpleDenseCellNameType(type.subtype(0));
  }
  
 -// Extract the 2nd component of a columnName, i.e. the sub-column name
 -public static ByteBuffer subName(ByteBuffer columnName)
 +public static AbstractType? getComparatorFor(CFMetaData metadata, 
ByteBuffer superColumn)
  {
 -return CompositeType.extractComponent(columnName, 1);
 +return getComparatorFor(metadata, superColumn != null);
  }
  
 -// We don't use CompositeType.Builder mostly because we want to avoid 
having to provide the comparator.
 -public static ByteBuffer startOf(ByteBuffer scName)
 +public static AbstractType? getComparatorFor(CFMetaData metadata, 
boolean subColumn)
  {
 -int length = scName.remaining();
 -ByteBuffer bb = ByteBuffer.allocate(2 + length + 1);
 -
 -bb.put((byte) ((length  8)  0xFF));
 -bb.put((byte) (length  0xFF));
 -bb.put(scName.duplicate());
 -bb.put((byte) 0);
 -bb.flip();
 -return bb;
 +return metadata.isSuper()
 + ? metadata.comparator.subtype(subColumn ? 1 : 0)
 + : metadata.comparator.asAbstractType();
  }
  
 -public static ByteBuffer endOf(ByteBuffer scName)
 +// Extract the first component of a columnName, i.e. the super column name
 +public static ByteBuffer scName(Composite columnName)
  {
 -ByteBuffer bb = startOf(scName);
 -bb.put(bb.remaining() - 1, (byte)1);
 -return bb;
 +return columnName.get(0);
  }
  
 -public static SCFilter filterToSC(CompositeType type, IDiskAtomFilter 
filter)
 +// Extract the 2nd component of a columnName, i.e. the sub-column name
 +public static ByteBuffer subName(Composite columnName)
  {
 -if (filter instanceof NamesQueryFilter)
 -return namesFilterToSC(type, (NamesQueryFilter)filter);
 -else
 -return sliceFilterToSC(type, (SliceQueryFilter)filter);
 +return columnName.get(1);
  }
  
 -public static SCFilter namesFilterToSC(CompositeType type, 
NamesQueryFilter filter)
 +public static Composite startOf(ByteBuffer scName)
  {
 -SortedSetByteBuffer newColumns = new TreeSet(type.types.get(1));
 -ByteBuffer scName = scName(filter.columns.first());
 -for (ByteBuffer name : filter.columns)
 -{
 -// If we're selecting column across multiple SC, it's not 
something we can translate for an old node
 -if

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

2014-04-02 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
src/java/org/apache/cassandra/db/marshal/CompositeType.java
test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java


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

Branch: refs/heads/trunk
Commit: ab1a02cfa69e0c57579b312202b477e43bb90b45
Parents: 486cc4c b218536
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Apr 2 13:17:18 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Apr 2 13:17:18 2014 -0500

--
 CHANGES.txt |   1 +
 .../cql3/statements/SelectStatement.java|   7 +-
 .../apache/cassandra/db/filter/ColumnSlice.java |  32 +-
 .../service/pager/AbstractQueryPager.java   |  11 +
 .../service/pager/SliceQueryPager.java  |   5 +
 .../cassandra/db/filter/ColumnSliceTest.java| 290 +++
 6 files changed, 342 insertions(+), 4 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab1a02cf/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index edc7f5c,56e87e8..7ca7d93
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -22,9 -22,8 +22,10 @@@ import java.util.*
  
  import com.google.common.base.Objects;
  import com.google.common.base.Predicate;
 +import com.google.common.collect.AbstractIterator;
  import com.google.common.collect.Iterables;
 +import com.google.common.collect.Iterators;
+ 
  import org.github.jamm.MemoryMeter;
  
  import org.apache.cassandra.auth.Permission;
@@@ -38,7 -37,7 +39,6 @@@ import org.apache.cassandra.db.filter.*
  import org.apache.cassandra.db.marshal.*;
  import org.apache.cassandra.dht.*;
  import org.apache.cassandra.exceptions.*;
--import org.apache.cassandra.net.MessagingService;
  import org.apache.cassandra.service.ClientState;
  import org.apache.cassandra.service.QueryState;
  import org.apache.cassandra.service.StorageProxy;
@@@ -49,6 -50,9 +49,8 @@@ import org.apache.cassandra.thrift.Thri
  import org.apache.cassandra.serializers.MarshalException;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.FBUtilities;
 -import org.apache.cassandra.utils.Pair;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
  
  /**
   * Encapsulates a completely parsed SELECT query, including the target

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab1a02cf/src/java/org/apache/cassandra/db/filter/ColumnSlice.java
--
diff --cc src/java/org/apache/cassandra/db/filter/ColumnSlice.java
index 262ebae,9eff12a..3838ee5
--- a/src/java/org/apache/cassandra/db/filter/ColumnSlice.java
+++ b/src/java/org/apache/cassandra/db/filter/ColumnSlice.java
@@@ -52,39 -47,22 +52,65 @@@ public class ColumnSlic
  this.finish = finish;
  }
  
 -public boolean isAlwaysEmpty(AbstractType? comparator, boolean reversed)
 +public boolean isAlwaysEmpty(CellNameType comparator, boolean reversed)
  {
 -ComparatorByteBuffer orderedComparator = reversed ? 
comparator.reverseComparator : comparator;
 -return (start.remaining()  0  finish.remaining()  0  
orderedComparator.compare(start, finish)  0);
 +ComparatorComposite orderedComparator = reversed ? 
comparator.reverseComparator() : comparator;
 +return !start.isEmpty()  !finish.isEmpty()  
orderedComparator.compare(start, finish)  0;
  }
  
 -public boolean includes(ComparatorByteBuffer cmp, ByteBuffer name)
 +public boolean includes(ComparatorComposite cmp, Composite name)
  {
 -return cmp.compare(start, name) = 0  
(finish.equals(ByteBufferUtil.EMPTY_BYTE_BUFFER) || cmp.compare(finish, name) 
= 0);
 +return cmp.compare(start, name) = 0  (finish.isEmpty() || 
cmp.compare(finish, name) = 0);
 +}
 +
 +public boolean isBefore(ComparatorComposite cmp, Composite name)
 +{
 +return !finish.isEmpty()  cmp.compare(finish, name)  0;
 +}
 +
 +public boolean intersects(ListByteBuffer minCellNames, ListByteBuffer 
maxCellNames, CellNameType comparator, boolean reversed)
 +{
 +assert minCellNames.size() ==

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

2014-04-02 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: 13510d414fbb0da489ecd062054aa49d059ba79d
Parents: 8234bc1 5aafa98
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Apr 2 21:38:03 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Apr 2 21:38:03 2014 +0200

--
 CHANGES.txt |   1 +
 .../apache/cassandra/cql3/ColumnCondition.java  | 126 +--
 src/java/org/apache/cassandra/cql3/Cql.g|   4 +-
 .../cql3/statements/CQL3CasConditions.java  |   5 +-
 4 files changed, 123 insertions(+), 13 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/13510d41/src/java/org/apache/cassandra/cql3/ColumnCondition.java
--
diff --cc src/java/org/apache/cassandra/cql3/ColumnCondition.java
index 64c2032,9fb3390..67e7174
--- a/src/java/org/apache/cassandra/cql3/ColumnCondition.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnCondition.java
@@@ -36,19 -35,28 +37,28 @@@ import org.apache.cassandra.utils.ByteB
   */
  public class ColumnCondition
  {
 -public final CFDefinition.Name column;
 +public final ColumnDefinition column;
+ 
+ // For collection, when testing the equality of a specific element, null 
otherwise.
+ private final Term collectionElement;
+ 
  private final Term value;
  
- private ColumnCondition(ColumnDefinition column, Term value)
 -private ColumnCondition(CFDefinition.Name column, Term collectionElement, 
Term value)
++private ColumnCondition(ColumnDefinition column, Term collectionElement, 
Term value)
  {
  this.column = column;
+ this.collectionElement = collectionElement;
  this.value = value;
  }
  
- // The only ones we support so far
 -public static ColumnCondition equal(CFDefinition.Name column, Term value)
 +public static ColumnCondition equal(ColumnDefinition column, Term value)
  {
- return new ColumnCondition(column, value);
+ return new ColumnCondition(column, null, value);
+ }
+ 
 -public static ColumnCondition equal(CFDefinition.Name column, Term 
collectionElement, Term value)
++public static ColumnCondition equal(ColumnDefinition column, Term 
collectionElement, Term value)
+ {
+ return new ColumnCondition(column, collectionElement, value);
  }
  
  /**
@@@ -76,15 -86,29 +88,29 @@@
  this.variables = variables;
  }
  
- // Not overriding equals() because we need the variables to have been 
attached when this is
- // called and so having a non standard method name might help avoid 
mistakes
  public boolean equalsTo(WithVariables other) throws 
InvalidRequestException
  {
- return column.equals(other.column())
-  
value.bindAndGet(variables).equals(other.value().bindAndGet(other.variables));
+ if (!column().equals(other.column()))
+ return false;
+ 
+ if ((collectionElement() == null) != (other.collectionElement() 
== null))
+ return false;
+ 
+ if (collectionElement() != null)
+ {
+ assert column.type instanceof ListType || column.type 
instanceof MapType;
+ AbstractType? comparator = column.type instanceof ListType
+? Int32Type.instance
+: ((MapType)column.type).keys;
+ 
+ if 
(comparator.compare(collectionElement().bindAndGet(variables), 
other.collectionElement().bindAndGet(variables)) != 0)
+ return false;
+ }
+ 
+ return 
value().bindAndGet(variables).equals(other.value().bindAndGet(other.variables));
  }
  
 -private CFDefinition.Name column()
 +private ColumnDefinition column()
  {
  return column;
  }
@@@ -94,6 -123,16 +125,11 @@@
  return value;
  }
  
+ public ByteBuffer getCollectionElementValue() throws 
InvalidRequestException
+ {
+ return collectionElement == null ? null : 
collectionElement.bindAndGet(variables);
+ }
+ 
 -private ColumnNameBuilder

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

2014-04-02 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
src/java/org/apache/cassandra/db/marshal/CompositeType.java
test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java


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

Branch: refs/heads/trunk
Commit: e66e523e6ee788fd6ed26a0605ee63cdf51d383b
Parents: c6dbba1 0e98f5b
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Apr 2 15:22:09 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Apr 2 15:22:09 2014 -0500

--

--

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

2014-04-02 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: 2d607324b3a31aa71a15c2cf9f8a4ad62deba08e
Parents: e66e523 133cfd3
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Apr 2 15:36:25 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Apr 2 15:36:25 2014 -0500

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d607324/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 932ae25,5a8dc8d..a9d061a
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -1450,21 -1413,16 +1451,28 @@@ public class StorageProxy implements St
  try
  {
  int cql3RowCount = 0;
- rows = new ArrayListRow();
- ListAbstractBoundsRowPosition ranges = 
getRestrictedRanges(command.keyRange);
+ rows = new ArrayList();
+ 
+ // when dealing with LocalStrategy keyspaces, we can skip the 
range splitting and merging (which can be
+ // expensive in clusters with vnodes)
+ List? extends AbstractBoundsRowPosition ranges;
+ if (keyspace.getReplicationStrategy() instanceof LocalStrategy)
+ ranges = command.keyRange.unwrap();
+ else
+ ranges = getRestrictedRanges(command.keyRange);
  
 +// our estimate of how many result rows there will be per-range
 +float resultRowsPerRange = estimateResultRowsPerRange(command, 
keyspace);
 +// underestimate how many rows we will get per-range in order to 
increase the likelihood that we'll
 +// fetch enough rows in the first round
 +resultRowsPerRange -= resultRowsPerRange * 
CONCURRENT_SUBREQUESTS_MARGIN;
 +int concurrencyFactor = resultRowsPerRange == 0.0
 +  ? 1
 +  : Math.max(1, Math.min(ranges.size(), (int) 
Math.ceil(command.limit() / resultRowsPerRange)));
 +logger.debug(Estimated result rows per range: {}; requested 
rows: {}, ranges.size(): {}; concurrent range requests: {},
 + resultRowsPerRange, command.limit(), ranges.size(), 
concurrencyFactor);
 +
 +boolean haveSufficientRows = false;
  int i = 0;
  AbstractBoundsRowPosition nextRange = null;
  ListInetAddress nextEndpoints = null;

1 2 >

1 - 100 of 136 matches

Mail list logo