[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/streaming/StreamManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6cf15b2b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cf15b2b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cf15b2b
Branch: refs/heads/trunk
Commit: 6cf15b2b438b25cabacbad3c1a557061d3aa80e9
Parents: 97859b0 ea28d36
Author: Vijay vijay2...@gmail.com
Authored: Sun Feb 16 13:43:29 2014 -0800
Committer: Vijay vijay2...@gmail.com
Committed: Sun Feb 16 13:43:29 2014 -0800
--
src/java/org/apache/cassandra/streaming/StreamManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cf15b2b/src/java/org/apache/cassandra/streaming/StreamManager.java
--
diff --cc src/java/org/apache/cassandra/streaming/StreamManager.java
index c82e45c,3fe6179..872e524
--- a/src/java/org/apache/cassandra/streaming/StreamManager.java
+++ b/src/java/org/apache/cassandra/streaming/StreamManager.java
@@@ -54,47 -55,17 +54,47 @@@ public class StreamManager implements S
* with the rate of Double.MAX_VALUE bytes per second.
* Rate unit is bytes per sec.
*
- * @return RateLimiter with rate limit set
+ * @return StreamRateLimiter with rate limit set based on peer location.
*/
-public static RateLimiter getRateLimiter()
+public static StreamRateLimiter getRateLimiter(InetAddress peer)
+{
+return new StreamRateLimiter(peer);
+}
+
+public static class StreamRateLimiter
{
- private static final double ONE_MEGA_BITS = 1024 * 1024 * 8;
-double currentThroughput = (((double)
DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec()) * 1024 * 1024 )
/ 8;
-// if throughput is set to 0, throttling is disabled
-if (currentThroughput == 0)
-currentThroughput = Double.MAX_VALUE;
-if (limiter.getRate() != currentThroughput)
-limiter.setRate(currentThroughput);
-return limiter;
++private static final double ONE_MEGA_BYTE = (1024 * 1024) / 8; //
from bits
+private static final RateLimiter limiter =
RateLimiter.create(Double.MAX_VALUE);
+private static final RateLimiter interDCLimiter =
RateLimiter.create(Double.MAX_VALUE);
+private final boolean isLocalDC;
+
+public StreamRateLimiter(InetAddress peer)
+{
- double throughput = ((double)
DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec()) * ONE_MEGA_BITS;
++double throughput = ((double)
DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec()) * ONE_MEGA_BYTE;
+mayUpdateThroughput(throughput, limiter);
+
- double interDCThroughput = ((double)
DatabaseDescriptor.getInterDCStreamThroughputOutboundMegabitsPerSec()) *
ONE_MEGA_BITS;
++double interDCThroughput = ((double)
DatabaseDescriptor.getInterDCStreamThroughputOutboundMegabitsPerSec()) *
ONE_MEGA_BYTE;
+mayUpdateThroughput(interDCThroughput, interDCLimiter);
+
+isLocalDC = DatabaseDescriptor.getLocalDataCenter().equals(
+
DatabaseDescriptor.getEndpointSnitch().getDatacenter(peer));
+}
+
+private void mayUpdateThroughput(double limit, RateLimiter
rateLimiter)
+{
+// if throughput is set to 0, throttling is disabled
+if (limit == 0)
+limit = Double.MAX_VALUE;
+if (rateLimiter.getRate() != limit)
+rateLimiter.setRate(limit);
+}
+
+public void acquire(int toTransfer)
+{
+limiter.acquire(toTransfer);
+if (!isLocalDC)
+interDCLimiter.acquire(toTransfer);
+}
}
private final StreamEventJMXNotifier notifier = new
StreamEventJMXNotifier();
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/streaming/StreamManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9d27781 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9d27781 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9d27781 Branch: refs/heads/trunk Commit: e9d27781c58251d5a59c542116aa8f41e0feda80 Parents: 94bda1f b041a93 Author: vparthasarathy vijay2...@gmail.com Authored: Sat Feb 15 13:58:11 2014 -0800 Committer: vparthasarathy vijay2...@gmail.com Committed: Sat Feb 15 13:58:11 2014 -0800 -- --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41433073 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41433073 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41433073 Branch: refs/heads/trunk Commit: 41433073f696738f17696a0cf395c44c007847f5 Parents: b0954a0 bbc56eb Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Feb 15 04:07:12 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Feb 15 04:07:12 2014 +0300 -- bin/cqlsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/41433073/bin/cqlsh --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b4a8dd4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b4a8dd4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b4a8dd4
Branch: refs/heads/trunk
Commit: 4b4a8dd4f04cef4dcd4943cf0ac9a5b3c58c5272
Parents: 10b6173 5f60fcc
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Wed Feb 12 20:57:51 2014 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Wed Feb 12 20:57:51 2014 -0500
--
src/java/org/apache/cassandra/service/ReadCallback.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b4a8dd4/src/java/org/apache/cassandra/service/ReadCallback.java
--
diff --cc src/java/org/apache/cassandra/service/ReadCallback.java
index 0c0d50c,777ef90..c43feaa
--- a/src/java/org/apache/cassandra/service/ReadCallback.java
+++ b/src/java/org/apache/cassandra/service/ReadCallback.java
@@@ -98,10 -96,7 +98,8 @@@ public class ReadCallbackTMessage, TRe
if (!await(command.getTimeout(), TimeUnit.MILLISECONDS))
{
// Same as for writes, see AbstractWriteResponseHandler
- int acks = received;
- if (resolver.isDataPresent() acks = blockfor)
- acks = blockfor - 1;
-ReadTimeoutException ex = new
ReadTimeoutException(consistencyLevel, received.get(), blockfor,
resolver.isDataPresent());
+ReadTimeoutException ex = new
ReadTimeoutException(consistencyLevel, received, blockfor,
resolver.isDataPresent());
++
if (logger.isDebugEnabled())
logger.debug(Read timeout: {}, ex.toString());
throw ex;
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Conflicts:
CHANGES.txt
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/3aaa0295
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3aaa0295
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3aaa0295
Branch: refs/heads/trunk
Commit: 3aaa0295c884b3c8d8e6ab5e3cd90e26cc77d1a3
Parents: 4334f99 15ee948
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Feb 13 08:46:59 2014 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Feb 13 08:46:59 2014 +0100
--
CHANGES.txt | 4 +++-
.../db/compaction/LeveledManifest.java | 23
2 files changed, 7 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3aaa0295/CHANGES.txt
--
diff --cc CHANGES.txt
index a45df89,9509a76..139eb06
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,3 +1,36 @@@
+2.1
+ * add listsnapshots command to nodetool (CASSANDRA-5742)
+ * Introduce AtomicBTreeColumns (CASSANDRA-6271)
+ * Multithreaded commitlog (CASSANDRA-3578)
+ * allocate fixed index summary memory pool and resample cold index summaries
+ to use less memory (CASSANDRA-5519)
+ * Removed multithreaded compaction (CASSANDRA-6142)
+ * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+ * Remove CFDefinition (CASSANDRA-6253)
+ * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
+ * User-defined types for CQL3 (CASSANDRA-5590)
+ * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
+ * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
+ * Secondary index support for collections (CASSANDRA-4511, 6383)
+ * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
+ * Push composites support in the storage engine
+ (CASSANDRA-5417, CASSANDRA-6520)
+ * Add snapshot space used to cfstats (CASSANDRA-6231)
+ * Add cardinality estimator for key count estimation (CASSANDRA-5906)
+ * CF id is changed to be non-deterministic. Data dir/key cache are created
+ uniquely for CF id (CASSANDRA-5202)
+ * New counters implementation (CASSANDRA-6504)
+ * Replace UnsortedColumns, EmptyColumns, TreeMapBackedSortedColumns with new
+ ArrayBackedSortedColumns (CASSANDRA-6630, CASSANDRA-6662, CASSANDRA-6690)
+ * Add option to use row cache with a given amount of rows (CASSANDRA-5357)
+ * Avoid repairing already repaired data (CASSANDRA-5351)
+ * Reject counter updates with USING TTL/TIMESTAMP (CASSANDRA-6649)
+
-
2.0.6
* Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
* Fix EstimatedHistogram races (CASSANDRA-6682)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3aaa0295/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
index cab726d,a78a867..05b838d
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
@@@ -103,93 -105,14 +103,76 @@@ public class LeveledManifes
public synchronized void add(SSTableReader reader)
{
+if (!hasRepairedData reader.isRepaired())
+{
+// this is the first repaired sstable we get - we need to
+// rebuild the entire manifest, unrepaired data should be
+// in unrepairedL0. Note that we keep the sstable level in
+// the sstable metadata since we are likely to be able to
+// re-add it at a good level later (during anticompaction
+// for example).
+hasRepairedData = true;
+rebuildManifestAfterFirstRepair();
+}
+
int level = reader.getSSTableLevel();
-assert level generations.length : Invalid level + level + out
of + (generations.length - 1);
-logDistribution();
+if (hasRepairedData !reader.isRepaired())
+{
+logger.debug(Adding unrepaired {} to unrepaired L0, reader);
+unrepairedL0.add(reader);
+}
+else
+{
+assert level generations.length : Invalid level + level +
out of + (generations.length - 1);
+
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7604935e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7604935e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7604935e Branch: refs/heads/trunk Commit: 7604935efe871e9bd458389c4116c492e9cbc7d7 Parents: f05870e 55b5605 Author: Marcus Eriksson marc...@apache.org Authored: Tue Feb 11 09:23:08 2014 +0100 Committer: Marcus Eriksson marc...@apache.org Committed: Tue Feb 11 09:23:08 2014 +0100 -- --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6e7d140 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6e7d140 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6e7d140 Branch: refs/heads/trunk Commit: a6e7d1405ad34127948538a866ef6fd027bf940d Parents: 7604935 9381b8d Author: Marcus Eriksson marc...@apache.org Authored: Tue Feb 11 13:14:28 2014 +0100 Committer: Marcus Eriksson marc...@apache.org Committed: Tue Feb 11 13:14:28 2014 +0100 -- --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f05870ee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f05870ee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f05870ee Branch: refs/heads/trunk Commit: f05870ee8cefec3bd9a1af051b2c7098c1f82933 Parents: 503a8a8 87aca60 Author: Mikhail Stepura mish...@apache.org Authored: Mon Feb 10 21:00:39 2014 -0800 Committer: Mikhail Stepura mish...@apache.org Committed: Mon Feb 10 21:00:39 2014 -0800 -- .../cassandra/cql3/statements/DropTableStatement.java | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca00f622 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca00f622 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca00f622 Branch: refs/heads/trunk Commit: ca00f622a5dcf899271d80076066ace3949a7e73 Parents: 300b026 2103646 Author: Marcus Eriksson marc...@apache.org Authored: Thu Feb 6 18:05:46 2014 +0100 Committer: Marcus Eriksson marc...@apache.org Committed: Thu Feb 6 18:05:46 2014 +0100 -- CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca00f622/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3670e4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3670e4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3670e4f Branch: refs/heads/trunk Commit: c3670e4f8dc58067deb31ca4a0bb741cc8781b60 Parents: 88bef0c 6e0ce7a Author: Dave Brosius dbros...@mebigfatguy.com Authored: Thu Feb 6 23:42:00 2014 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Thu Feb 6 23:42:00 2014 -0500 -- src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java | 3 --- 1 file changed, 3 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
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/7ce5e062
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ce5e062
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ce5e062
Branch: refs/heads/trunk
Commit: 7ce5e062ed602dd1c9593a03b554c11ff3cc52d5
Parents: fc01759 e59ef16
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Feb 6 08:50:34 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Feb 6 08:50:34 2014 +0100
--
CHANGES.txt | 1 +
.../cql3/statements/ModificationStatement.java | 109 +++
.../apache/cassandra/service/CASConditions.java | 38 +++
.../apache/cassandra/service/StorageProxy.java | 76 ++---
.../cassandra/thrift/CassandraServer.java | 65 ++-
5 files changed, 200 insertions(+), 89 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ce5e062/CHANGES.txt
--
diff --cc CHANGES.txt
index a139fdc,7ba8044..657bf9e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,35 @@@
+2.1
+ * add listsnapshots command to nodetool (CASSANDRA-5742)
+ * Introduce AtomicBTreeColumns (CASSANDRA-6271)
+ * Multithreaded commitlog (CASSANDRA-3578)
+ * allocate fixed index summary memory pool and resample cold index summaries
+ to use less memory (CASSANDRA-5519)
+ * Removed multithreaded compaction (CASSANDRA-6142)
+ * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+ * Remove CFDefinition (CASSANDRA-6253)
+ * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
+ * User-defined types for CQL3 (CASSANDRA-5590)
+ * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
+ * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
+ * Secondary index support for collections (CASSANDRA-4511, 6383)
+ * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
+ * Push composites support in the storage engine
+ (CASSANDRA-5417, CASSANDRA-6520)
+ * Add snapshot space used to cfstats (CASSANDRA-6231)
+ * Add cardinality estimator for key count estimation (CASSANDRA-5906)
+ * CF id is changed to be non-deterministic. Data dir/key cache are created
+ uniquely for CF id (CASSANDRA-5202)
+ * New counters implementation (CASSANDRA-6504)
+ * Replace UnsortedColumns usage with ArrayBackedSortedColumns
(CASSANDRA-6630)
+
+
2.0.6
+ * Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
Merged from 1.2:
* Fix partition and range deletes not triggering flush (CASSANDRA-6655)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ce5e062/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
diff --cc
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index e551187,2567043..f35690b
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@@ -24,13 -24,13 +24,14 @@@ import org.github.jamm.MemoryMeter
import org.apache.cassandra.auth.Permission;
import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.config.ColumnDefinition;
import org.apache.cassandra.cql3.*;
import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.composites.CBuilder;
+import org.apache.cassandra.db.composites.Composite;
import org.apache.cassandra.db.filter.ColumnSlice;
+ import org.apache.cassandra.db.filter.IDiskAtomFilter;
import org.apache.cassandra.db.filter.SliceQueryFilter;
-import org.apache.cassandra.db.marshal.CompositeType;
-import org.apache.cassandra.db.marshal.UTF8Type;
import org.apache.cassandra.db.marshal.ListType;
import org.apache.cassandra.db.marshal.BooleanType;
import org.apache.cassandra.exceptions.*;
@@@ -533,29 -539,96 +535,96 @@@ public abstract class ModificationState
}
else
{
-rm = new RowMutation(cfm.ksName, key, cf);
+mutation = new Mutation(cfm.ksName, key, cf);
}
-return isCounter() ? new CounterMutation(rm, cl) : rm;
+return
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/db/ColumnFamily.java
src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98e6b08c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98e6b08c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98e6b08c
Branch: refs/heads/trunk
Commit: 98e6b08c71871666c5d7a206aedaa416ef1cf765
Parents: 7ce5e06 9fb44ee
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Feb 6 08:57:46 2014 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Feb 6 08:57:46 2014 +0100
--
.../org/apache/cassandra/db/ColumnFamily.java | 8 +++
.../db/compaction/LazilyCompactedRow.java | 11
.../cassandra/io/sstable/SSTableWriter.java | 10
.../cassandra/tools/SSTableMetadataViewer.java | 60
4 files changed, 66 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98e6b08c/src/java/org/apache/cassandra/db/ColumnFamily.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamily.java
index 2df3fbf,ec6a395..00f0e35
--- a/src/java/org/apache/cassandra/db/ColumnFamily.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamily.java
@@@ -423,16 -418,26 +423,24 @@@ public abstract class ColumnFamily impl
int maxLocalDeletionTime = Integer.MIN_VALUE;
ListByteBuffer minColumnNamesSeen = Collections.emptyList();
ListByteBuffer maxColumnNamesSeen = Collections.emptyList();
-
-if (deletionInfo().getTopLevelDeletion().localDeletionTime
Integer.MAX_VALUE)
-
tombstones.update(deletionInfo().getTopLevelDeletion().localDeletionTime);
-IteratorRangeTombstone it = deletionInfo().rangeIterator();
-while (it.hasNext())
+for (Cell cell : this)
{
-RangeTombstone rangeTombstone = it.next();
-tombstones.update(rangeTombstone.getLocalDeletionTime());
-}
-
-for (Column column : this)
-{
-minTimestampSeen = Math.min(minTimestampSeen,
column.minTimestamp());
-maxTimestampSeen = Math.max(maxTimestampSeen,
column.maxTimestamp());
-maxLocalDeletionTime = Math.max(maxLocalDeletionTime,
column.getLocalDeletionTime());
-int deletionTime = column.getLocalDeletionTime();
++if (deletionInfo().getTopLevelDeletion().localDeletionTime
Integer.MAX_VALUE)
++
tombstones.update(deletionInfo().getTopLevelDeletion().localDeletionTime);
++IteratorRangeTombstone it = deletionInfo().rangeIterator();
++while (it.hasNext())
++{
++RangeTombstone rangeTombstone = it.next();
++tombstones.update(rangeTombstone.getLocalDeletionTime());
++}
+minTimestampSeen = Math.min(minTimestampSeen,
cell.minTimestamp());
+maxTimestampSeen = Math.max(maxTimestampSeen,
cell.maxTimestamp());
+maxLocalDeletionTime = Math.max(maxLocalDeletionTime,
cell.getLocalDeletionTime());
+int deletionTime = cell.getLocalDeletionTime();
if (deletionTime Integer.MAX_VALUE)
tombstones.update(deletionTime);
-minColumnNamesSeen =
ColumnNameHelper.minComponents(minColumnNamesSeen, column.name,
metadata.comparator);
-maxColumnNamesSeen =
ColumnNameHelper.maxComponents(maxColumnNamesSeen, column.name,
metadata.comparator);
+minColumnNamesSeen =
ColumnNameHelper.minComponents(minColumnNamesSeen, cell.name,
metadata.comparator);
+maxColumnNamesSeen =
ColumnNameHelper.maxComponents(maxColumnNamesSeen, cell.name,
metadata.comparator);
}
return new ColumnStats(getColumnCount(), minTimestampSeen,
maxTimestampSeen, maxLocalDeletionTime, tombstones, minColumnNamesSeen,
maxColumnNamesSeen);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/98e6b08c/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
index 02901a3,e10fb2c..89181e6
--- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
@@@ -261,17 -265,25 +261,28 @@@ public class LazilyCompactedRow extend
container.clear();
return null;
}
-Column reduced = purged.iterator().next();
-container.clear();
+
-
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c004f9f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c004f9f8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c004f9f8 Branch: refs/heads/trunk Commit: c004f9f83ddc30fff2e691c8120f40cca723ad01 Parents: 45c7015 41de0bd Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Feb 5 05:39:59 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Feb 5 05:39:59 2014 +0300 -- --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/025b84ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/025b84ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/025b84ef Branch: refs/heads/trunk Commit: 025b84efd6c79504893c69e8f3860d8ad512f6ca Parents: 341d6c4 55211bc Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Jan 29 10:10:34 2014 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Jan 29 10:10:34 2014 +0100 -- CHANGES.txt | 1 + .../service/pager/AbstractQueryPager.java | 43 +++-- .../service/pager/AbstractQueryPagerTest.java | 184 +++ 3 files changed, 216 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/025b84ef/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/025b84ef/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a620464 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a620464 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a620464 Branch: refs/heads/trunk Commit: 8a62046453511661ddc1a506dccf21337ae8242c Parents: 8257154 cc708b9 Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Jan 29 16:24:52 2014 -0600 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Jan 29 16:24:52 2014 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 ++ .../db/compaction/AbstractCompactionStrategy.java | 10 +- 3 files changed, 12 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a620464/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a620464/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a620464/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7dec15ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dec15ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7dec15ba Branch: refs/heads/trunk Commit: 7dec15bab99c674d8fed41025cb81bb4961376b0 Parents: 8a62046 b44683c Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Jan 29 16:31:12 2014 -0600 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Jan 29 16:31:12 2014 -0600 -- .../db/compaction/LeveledCompactionStrategy.java | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dec15ba/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/service/ReadCallback.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1ecb124 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1ecb124 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1ecb124 Branch: refs/heads/trunk Commit: a1ecb1246e2fcc1e79d1bd51cdcf238948857883 Parents: 9189366 09ab439 Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Jan 28 21:55:11 2014 -0600 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Jan 28 21:55:11 2014 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/ReadCallback.java | 8 2 files changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1ecb124/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1ecb124/src/java/org/apache/cassandra/service/ReadCallback.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7faff8db Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7faff8db Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7faff8db Branch: refs/heads/trunk Commit: 7faff8db777063b6fb5f206607e6bbe07c020d63 Parents: d3a9e8f 1d4caf4 Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu Jan 16 16:39:34 2014 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu Jan 16 16:39:34 2014 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7faff8db/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7faff8db/src/java/org/apache/cassandra/service/StorageProxy.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/AtomicSortedColumns.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9691e82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9691e82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9691e82 Branch: refs/heads/trunk Commit: d9691e823930982d120c2a237c7087245b003f0d Parents: 2fd2d89 0e55e9f Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Jan 14 15:37:40 2014 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Jan 14 15:37:40 2014 +0100 -- --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25d2893d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25d2893d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25d2893d Branch: refs/heads/trunk Commit: 25d2893dd0d012e22e16231230ac6fc9dcd60f93 Parents: 8ebeee1 c543215 Author: Pavel Yaskevich xe...@apache.org Authored: Fri Jan 10 17:25:40 2014 -0800 Committer: Pavel Yaskevich xe...@apache.org Committed: Fri Jan 10 17:25:40 2014 -0800 -- build.xml | 4 ++-- lib/thrift-server-0.3.2.jar | Bin 123920 - 0 bytes lib/thrift-server-0.3.3.jar | Bin 0 - 124160 bytes 3 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25d2893d/build.xml -- diff --cc build.xml index 2e4719e,96a5d5e..04cc08f --- a/build.xml +++ b/build.xml @@@ -358,9 -355,7 +358,9 @@@ dependency groupId=com.googlecode.json-simple artifactId=json-simple version=1.1/ dependency groupId=com.github.stephenc.high-scale-lib artifactId=high-scale-lib version=1.1.2/ dependency groupId=com.github.stephenc artifactId=jamm version=0.2.5/ - dependency groupId=com.thinkaurelius.thrift artifactId=thrift-server version=0.3.2 - dependency groupId=com.thinkaurelius.thrift artifactId=thrift-server version=0.3.3/ ++ dependency groupId=com.thinkaurelius.thrift artifactId=thrift-server version=0.3.3 + exclusion groupId=org.slf4j artifactId=slf4j-log4j12/ + /dependency dependency groupId=org.yaml artifactId=snakeyaml version=1.11/ dependency groupId=org.apache.thrift artifactId=libthrift version=0.9.1/ @@@ -471,11 -457,11 +471,11 @@@ dependency groupId=org.mindrot artifactId=jbcrypt/ dependency groupId=com.yammer.metrics artifactId=metrics-core/ dependency groupId=com.addthis.metrics artifactId=reporter-config/ - dependency groupId=com.thinkaurelius.thrift artifactId=thrift-server version=0.3.2/ + dependency groupId=com.thinkaurelius.thrift artifactId=thrift-server version=0.3.3/ +dependency groupId=com.clearspring.analytics artifactId=stream version=2.5.1 / -dependency groupId=log4j artifactId=log4j/ -!-- cassandra has a hard dependency on log4j, so force slf4j's log4j provider at runtime -- -dependency groupId=org.slf4j artifactId=slf4j-log4j12 scope=runtime/ +dependency groupId=ch.qos.logback artifactId=logback-core/ +dependency groupId=ch.qos.logback artifactId=logback-classic/ dependency groupId=org.apache.thrift artifactId=libthrift/ dependency groupId=org.apache.cassandra artifactId=cassandra-thrift/
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7263584c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7263584c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7263584c Branch: refs/heads/trunk Commit: 7263584c44f4af9044b875fa549abc08e6e6bc21 Parents: 25d2893 9d837e5 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Fri Jan 10 20:37:51 2014 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Fri Jan 10 20:37:51 2014 -0500 -- src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7263584c/src/java/org/apache/cassandra/service/CassandraDaemon.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/458bcf23 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/458bcf23 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/458bcf23 Branch: refs/heads/trunk Commit: 458bcf238d3a5ad8f3b756e8806ca63bf0057aeb Parents: 7263584 5c86f36 Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Jan 11 07:47:56 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Jan 11 07:47:56 2014 +0300 -- src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/458bcf23/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e304eb7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e304eb7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e304eb7 Branch: refs/heads/trunk Commit: 5e304eb78a3e9227260998c335ee0e01ebab07d7 Parents: 1dc43bd 5fa6055 Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Jan 7 18:11:26 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Jan 7 18:11:26 2014 +0300 -- CHANGES.txt | 3 +- bin/cqlsh | 2 +- doc/cql3/CQL.textile| 9 ++- pylib/cqlshlib/cql3handling.py | 2 +- src/java/org/apache/cassandra/cql3/Cql.g| 9 +-- .../apache/cassandra/cql3/QueryProcessor.java | 2 +- .../cql3/statements/CreateIndexStatement.java | 30 - .../cql3/statements/IndexPropDefs.java | 70 8 files changed, 100 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e304eb7/CHANGES.txt -- diff --cc CHANGES.txt index 11c2814,faf52a4..45a3eb6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,6 +1,31 @@@ +2.1 + * Introduce AtomicBTreeColumns (CASSANDRA-6271) + * Multithreaded commitlog (CASSANDRA-3578) + * allocate fixed index summary memory pool and resample cold index summaries + to use less memory (CASSANDRA-5519) + * Removed multithreaded compaction (CASSANDRA-6142) + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + * Remove CFDefinition (CASSANDRA-6253) + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278) + * User-defined types for CQL3 (CASSANDRA-5590) + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406) + * Batch read from OTC's queue and cleanup (CASSANDRA-1632) + * Secondary index support for collections (CASSANDRA-4511) + * SSTable metadata(Stats.db) format change (CASSANDRA-6356) + * Push composites support in the storage engine + (CASSANDRA-5417, CASSANDRA-6520) + * Add snapshot space used to cfstats (CASSANDRA-6231) + * Add cardinality estimator for key count estimation (CASSANDRA-5906) + + 2.0.5 - * Delete unfinished compaction incrementally (CASSANDRA-6086) + * Delete unfinished compaction incrementally (CASSANDRA-6086) + * Allow specifying custom secondary index options in CQL3 (CASSANDRA-6480) Merged from 1.2: * fsync compression metadata (CASSANDRA-6531) * Validate CF existence on execution for prepared statement (CASSANDRA-6535) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e304eb7/src/java/org/apache/cassandra/cql3/Cql.g -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e304eb7/src/java/org/apache/cassandra/cql3/QueryProcessor.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e304eb7/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java -- diff --cc src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java index e0e2693,3ef6f5a..56b465e --- a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java @@@ -18,19 -18,14 +18,17 @@@ package org.apache.cassandra.cql3.statements; import java.util.Collections; +import java.util.Map; ++import com.google.common.collect.ImmutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.auth.Permission; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; +import org.apache.cassandra.config.IndexType; import org.apache.cassandra.config.Schema; - import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.exceptions.*; import org.apache.cassandra.cql3.*; import org.apache.cassandra.service.ClientState; @@@ -83,17 -81,16 +83,13 @@@ public class CreateIndexStatement exten throw new InvalidRequestException(Index already exists); }
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dc43bda Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dc43bda Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dc43bda Branch: refs/heads/trunk Commit: 1dc43bdad2beb52793253c4aacb737c8de74cd4a Parents: 6949880 ae0a1e0 Author: Marcus Eriksson marc...@apache.org Authored: Tue Jan 7 06:50:43 2014 +0100 Committer: Marcus Eriksson marc...@apache.org Committed: Tue Jan 7 06:50:43 2014 +0100 -- .../apache/cassandra/service/StorageService.java | 3 +++ .../org/apache/cassandra/tools/BulkLoader.java | 17 - 2 files changed, 19 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dc43bda/src/java/org/apache/cassandra/service/StorageService.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dc43bda/src/java/org/apache/cassandra/tools/BulkLoader.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb603774 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb603774 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb603774 Branch: refs/heads/trunk Commit: fb60377442b893590a663d1decd079d7dcb1f055 Parents: 1f7a5d1 4d36bbf Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Dec 20 09:44:58 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Dec 20 09:44:58 2013 +0100 -- .../org/apache/cassandra/service/pager/AbstractQueryPager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb603774/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49c5ed27 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49c5ed27 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49c5ed27 Branch: refs/heads/trunk Commit: 49c5ed271b1c2f4924a31306af49c30876698f4c Parents: 486f079 142e13f Author: Jonathan Ellis jbel...@apache.org Authored: Fri Dec 20 15:24:24 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Dec 20 15:24:24 2013 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 9 + .../org/apache/cassandra/service/StorageServiceMBean.java | 3 +++ src/java/org/apache/cassandra/tools/NodeCmd.java| 7 +++ src/java/org/apache/cassandra/tools/NodeProbe.java | 5 + 5 files changed, 25 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/49c5ed27/CHANGES.txt -- diff --cc CHANGES.txt index 384e32d,916ed7d..c9dcc18 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,27 -1,5 +1,28 @@@ +2.1 + * Multithreaded commitlog (CASSANDRA-3578) + * allocate fixed index summary memory pool and resample cold index summaries + to use less memory (CASSANDRA-5519) + * Removed multithreaded compaction (CASSANDRA-6142) + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + * Remove CFDefinition (CASSANDRA-6253) + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278) + * User-defined types for CQL3 (CASSANDRA-5590) + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406) + * Batch read from OTC's queue and cleanup (CASSANDRA-1632) + * Secondary index support for collections (CASSANDRA-4511) + * SSTable metadata(Stats.db) format change (CASSANDRA-6356) + * Push composites support in the storage engine (CASSANDRA-5417) + * Add snapshot space used to cfstats (CASSANDRA-6231) + * Add cardinality estimator for key count estimation (CASSANDRA-5906) + + 2.0.4 + * add StorageService.stopDaemon() (CASSANDRA-4268) * add IRE for invalid CF supplied to get_count (CASSANDRA-5701) * add client encryption support to sstableloader (CASSANDRA-6378) * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468) http://git-wip-us.apache.org/repos/asf/cassandra/blob/49c5ed27/src/java/org/apache/cassandra/service/StorageService.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/49c5ed27/src/java/org/apache/cassandra/service/StorageServiceMBean.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/49c5ed27/src/java/org/apache/cassandra/tools/NodeCmd.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/49c5ed27/src/java/org/apache/cassandra/tools/NodeProbe.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1f7a5d19 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f7a5d19 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f7a5d19 Branch: refs/heads/trunk Commit: 1f7a5d194ab0e78bdd761ba525fc74967e0ff3bf Parents: e6719db a462083 Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Dec 20 08:41:45 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Dec 20 08:41:45 2013 +0100 -- CHANGES.txt | 1 + .../service/pager/AbstractQueryPager.java | 56 ++-- 2 files changed, 41 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f7a5d19/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f7a5d19/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1152e4b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1152e4b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1152e4b3 Branch: refs/heads/trunk Commit: 1152e4b3924603106313130ca396e9d0027a6b5e Parents: d365faa 21bb531 Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Dec 18 22:10:39 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Dec 18 22:10:39 2013 +0300 -- CHANGES.txt| 4 ++-- doc/cql3/CQL.textile | 10 +- src/java/org/apache/cassandra/cql3/QueryProcessor.java | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1152e4b3/CHANGES.txt -- diff --cc CHANGES.txt index 08e96fb,b876204..7074d2a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,3 +1,25 @@@ +2.1 + * Multithreaded commitlog (CASSANDRA-3578) + * allocate fixed index summary memory pool and resample cold index summaries + to use less memory (CASSANDRA-5519) + * Removed multithreaded compaction (CASSANDRA-6142) + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + * Remove CFDefinition (CASSANDRA-6253) + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278) + * User-defined types for CQL3 (CASSANDRA-5590) + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406) + * Batch read from OTC's queue and cleanup (CASSANDRA-1632) + * Secondary index support for collections (CASSANDRA-4511) + * SSTable metadata(Stats.db) format change (CASSANDRA-6356) + * Push composites support in the storage engine (CASSANDRA-5417) ++ * Add snapshot space used to cfstats (CASSANDRA-6231) + + 2.0.4 * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468) * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1152e4b3/src/java/org/apache/cassandra/cql3/QueryProcessor.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c00e05b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c00e05b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c00e05b6 Branch: refs/heads/trunk Commit: c00e05b65eda9d2e784663f13e83583bc4944d3b Parents: e978034 f54f4e2 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Dec 6 18:28:22 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Dec 6 18:28:22 2013 +0300 -- CHANGES.txt | 3 +- .../apache/cassandra/service/StorageProxy.java | 39 +--- 2 files changed, 3 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c00e05b6/CHANGES.txt -- diff --cc CHANGES.txt index f8a12c9,43d0e9d..4568186 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -23,9 -4,9 +23,10 @@@ * Fix divide-by-zero in PCI (CASSANDRA-6403) * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284) * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395) + * Add snapshot space used to cfstats (CASSANDRA-6231) * Expose a total memtable size metric for a CF (CASSANDRA-6391) - * cqlsh: hanlde symlinks properly (CASSANDRA-6425) + * cqlsh: handle symlinks properly (CASSANDRA-6425) + * Don't resubmit counter mutation runnables internally (CASSANDRA-6427) Merged from 1.2: * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345) * cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c00e05b6/src/java/org/apache/cassandra/service/StorageProxy.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/24bdd00d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24bdd00d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/24bdd00d Branch: refs/heads/trunk Commit: 24bdd00dacab22ee1abaefef873e9039ca0b1f5d Parents: 2042bc3 36f54f9 Author: Aleksey Yeschenko alek...@apache.org Authored: Sun Dec 1 18:59:48 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sun Dec 1 18:59:48 2013 +0300 -- .../apache/cassandra/net/MessagingService.java | 29 .../cassandra/service/StorageService.java | 2 -- 2 files changed, 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/24bdd00d/src/java/org/apache/cassandra/net/MessagingService.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/24bdd00d/src/java/org/apache/cassandra/service/StorageService.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d854911 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d854911 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d854911 Branch: refs/heads/trunk Commit: 3d854911c64a28e9c3bc46be493bc54f3ec1ebec Parents: 24bdd00 b687195 Author: Aleksey Yeschenko alek...@apache.org Authored: Sun Dec 1 20:18:43 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sun Dec 1 20:18:43 2013 +0300 -- CHANGES.txt | 1 + bin/cqlsh | 6 -- 2 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d854911/CHANGES.txt -- diff --cc CHANGES.txt index 81ba65a,4e77faa..6d5b5d1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -20,8 -3,8 +20,9 @@@ * Fix divide-by-zero in PCI (CASSANDRA-6403) * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284) * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395) + * Add snapshot space used to cfstats (CASSANDRA-6231) * Expose a total memtable size metric for a CF (CASSANDRA-6391) + * cqlsh: hanlde symlinks properly (CASSANDRA-6425) Merged from 1.2: * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345) * cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ddf2cdc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ddf2cdc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ddf2cdc Branch: refs/heads/trunk Commit: 2ddf2cdc68226cab90df0e9e492908d11f699590 Parents: 58bcdd4 d41a746 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Nov 29 05:27:35 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Nov 29 05:27:35 2013 +0300 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 12 .../apache/cassandra/metrics/ColumnFamilyMetrics.java | 9 + 3 files changed, 22 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ddf2cdc/CHANGES.txt -- diff --cc CHANGES.txt index a8ddb87,644c6b3..8d11a0a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,8 +1,25 @@@ +2.1 + * allocate fixed index summary memory pool and resample cold index summaries + to use less memory (CASSANDRA-5519) + * Removed multithreaded compaction (CASSANDRA-6142) + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + * Remove CFDefinition (CASSANDRA-6253) + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278) + * User-defined types for CQL3 (CASSANDRA-5590) + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406) + * Batch read from OTC's queue and cleanup (CASSANDRA-1632) + + 2.0.4 - * Fix divide-by-zero in PCI (CASSANDRA-6403) * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284) * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395) + * Add snapshot space used to cfstats (CASSANDRA-6231) + * Expose a total memtable size metric for a CF (CASSANDRA-6391) Merged from 1.2: * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345) * cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ddf2cdc/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ddf2cdc/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1a67a06 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1a67a06 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1a67a06 Branch: refs/heads/trunk Commit: f1a67a06a8fa3358b7ee4059f35e515f913cf197 Parents: ed0c91e 4fae76c Author: Marcus Eriksson marc...@spotify.com Authored: Wed Nov 27 18:58:55 2013 +0100 Committer: Marcus Eriksson marc...@spotify.com Committed: Wed Nov 27 18:58:55 2013 +0100 -- .../org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc956751 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc956751 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc956751 Branch: refs/heads/trunk Commit: dc956751f8338acd049cfc85c7d67032fdba136e Parents: 5bbcaa4 9aebf9d Author: Aleksey Yeschenko alek...@apache.org Authored: Sun Nov 24 21:23:47 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sun Nov 24 21:23:47 2013 +0300 -- CHANGES.txt | 1 + .../org/apache/cassandra/serializers/TimestampSerializer.java| 4 2 files changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc956751/CHANGES.txt -- diff --cc CHANGES.txt index 3fdb8e7,46f592e..eb0bc91 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,7 +1,23 @@@ +2.1 + * allocate fixed index summary memory pool and resample cold index summaries + to use less memory (CASSANDRA-5519) + * Removed multithreaded compaction (CASSANDRA-6142) + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + * Remove CFDefinition (CASSANDRA-6253) + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278) + * User-defined types for CQL3 (CASSANDRA-5590) + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871) + * Batch read from OTC's queue and cleanup (CASSANDRA-1632) + + 2.0.4 - * Fix divide-by-zero in PCI (CASSANDRA-6403) * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284) + * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395) 2.0.3
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5bbcaa4d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5bbcaa4d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5bbcaa4d Branch: refs/heads/trunk Commit: 5bbcaa4da8f3ce675d760d7f9274ac89736e3909 Parents: 8732fe9 9ebb091 Author: Aleksey Yeschenko alek...@apache.org Authored: Sun Nov 24 08:33:12 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sun Nov 24 08:33:12 2013 +0300 -- .../cassandra/triggers/InvertedIndex.java | 27 +--- 1 file changed, 18 insertions(+), 9 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac926233 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac926233 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac926233 Branch: refs/heads/trunk Commit: ac926233ffd69338818c606f4e703c8fc3331792 Parents: fdbddc1 3c9760b Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Nov 22 09:56:33 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Nov 22 09:56:33 2013 +0100 -- CHANGES.txt | 8 +- .../service/pager/AbstractQueryPager.java | 80 +--- 2 files changed, 56 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac926233/CHANGES.txt -- diff --cc CHANGES.txt index 06628a0,8163c94..79e5880 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,3 +1,18 @@@ +2.1 + * Removed multithreaded compaction (CASSANDRA-6142) + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + * Remove CFDefinition (CASSANDRA-6253) + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278) + * User-defined types for CQL3 (CASSANDRA-5590) + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871) + * Batch read from OTC's queue and cleanup (CASSANDRA-1632) + + - 2.0.4 - * remove RF from nodetool ring output (CASSANDRA-6289) - * fix attempting to flush empty rows (CASSANDRA-6374) - - 2.0.3 * Fix FD leak on slice read path (CASSANDRA-6275) * Cancel read meter task when closing SSTR (CASSANDRA-6358)
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23e77445 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23e77445 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23e77445 Branch: refs/heads/trunk Commit: 23e7744598a00b4650b8d34575a3216e8bfd0d7a Parents: ac92623 dbc7978 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Nov 22 19:12:56 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Nov 22 19:12:56 2013 +0300 -- src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 3 --- 1 file changed, 3 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e239ea61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e239ea61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e239ea61 Branch: refs/heads/trunk Commit: e239ea61e45bb4bba2e82583687f0e8461f1a884 Parents: c04d74f 08f2e97 Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu Nov 21 09:53:59 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu Nov 21 09:53:59 2013 +0100 -- CHANGES.txt| 1 + NEWS.txt | 4 doc/cql3/CQL.textile | 8 ++-- pylib/cqlshlib/formatting.py | 8 +++- src/java/org/apache/cassandra/cql3/Cql.g | 3 +++ src/java/org/apache/cassandra/cql3/QueryProcessor.java | 2 +- 6 files changed, 22 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e239ea61/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e239ea61/NEWS.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e239ea61/src/java/org/apache/cassandra/cql3/Cql.g -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e239ea61/src/java/org/apache/cassandra/cql3/QueryProcessor.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb871ba9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb871ba9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb871ba9 Branch: refs/heads/trunk Commit: cb871ba908dac0e8773a50dc805b272ac2c794d1 Parents: 0619da2 5008507 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Nov 13 18:01:51 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Nov 13 18:01:51 2013 +0100 -- CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnFamily.java | 5 ++ .../service/pager/AbstractQueryPager.java | 49 ++-- .../service/pager/RangeNamesQueryPager.java | 5 ++ .../service/pager/RangeSliceQueryPager.java | 9 +++- .../service/pager/SliceQueryPager.java | 9 +++- .../cassandra/service/QueryPagerTest.java | 32 - 7 files changed, 92 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb871ba9/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b92c55e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b92c55e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b92c55e6 Branch: refs/heads/trunk Commit: b92c55e68c005fe5581b50f585d9bc47dbdfaedb Parents: cb871ba e02341b Author: Marcus Eriksson marc...@spotify.com Authored: Wed Nov 13 20:16:59 2013 +0100 Committer: Marcus Eriksson marc...@spotify.com Committed: Wed Nov 13 20:16:59 2013 +0100 -- CHANGES.txt| 1 + .../org/apache/cassandra/db/compaction/CompactionController.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b92c55e6/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b92c55e6/src/java/org/apache/cassandra/db/compaction/CompactionController.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed1fabb3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed1fabb3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed1fabb3 Branch: refs/heads/trunk Commit: ed1fabb395d02849e06e7b54713e9d099571b4df Parents: bfd0144 7fb2d24 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Nov 12 19:25:38 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Nov 12 19:25:38 2013 +0100 -- --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/db/PagedRangeCommand.java
src/java/org/apache/cassandra/db/RangeSliceCommand.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f8138a3c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f8138a3c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f8138a3c
Branch: refs/heads/trunk
Commit: f8138a3c2e93d4dbc92aee6455892c6acc8a010c
Parents: 1475d92 20793b0
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Nov 5 16:35:19 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Nov 5 16:35:19 2013 +0100
--
CHANGES.txt| 1 +
.../org/apache/cassandra/db/PagedRangeCommand.java | 13 +++--
.../org/apache/cassandra/db/RangeSliceCommand.java | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8138a3c/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8138a3c/src/java/org/apache/cassandra/db/PagedRangeCommand.java
--
diff --cc src/java/org/apache/cassandra/db/PagedRangeCommand.java
index d813036,e152f43..0e24859
--- a/src/java/org/apache/cassandra/db/PagedRangeCommand.java
+++ b/src/java/org/apache/cassandra/db/PagedRangeCommand.java
@@@ -130,9 -138,9 +136,9 @@@ public class PagedRangeCommand extends
out.writeInt(cmd.rowFilter.size());
for (IndexExpression expr : cmd.rowFilter)
{
-ByteBufferUtil.writeWithShortLength(expr.column_name, out);
-out.writeInt(expr.op.getValue());
+ByteBufferUtil.writeWithShortLength(expr.column, out);
+out.writeInt(expr.operator.ordinal());
- ByteBufferUtil.writeWithLength(expr.value, out);
+ ByteBufferUtil.writeWithShortLength(expr.value, out);
}
out.writeInt(cmd.limit);
@@@ -180,9 -191,9 +189,9 @@@
size += TypeSizes.NATIVE.sizeof(cmd.rowFilter.size());
for (IndexExpression expr : cmd.rowFilter)
{
-size +=
TypeSizes.NATIVE.sizeofWithShortLength(expr.column_name);
-size += TypeSizes.NATIVE.sizeof(expr.op.getValue());
+size += TypeSizes.NATIVE.sizeofWithShortLength(expr.column);
+size += TypeSizes.NATIVE.sizeof(expr.operator.ordinal());
- size += TypeSizes.NATIVE.sizeofWithLength(expr.value);
+ size += TypeSizes.NATIVE.sizeofWithShortLength(expr.value);
}
size += TypeSizes.NATIVE.sizeof(cmd.limit);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8138a3c/src/java/org/apache/cassandra/db/RangeSliceCommand.java
--
diff --cc src/java/org/apache/cassandra/db/RangeSliceCommand.java
index 28b86f8,4aa1595..a9a48a0
--- a/src/java/org/apache/cassandra/db/RangeSliceCommand.java
+++ b/src/java/org/apache/cassandra/db/RangeSliceCommand.java
@@@ -227,9 -308,9 +227,9 @@@ class RangeSliceCommandSerializer imple
size += TypeSizes.NATIVE.sizeof(rsc.rowFilter.size());
for (IndexExpression expr : rsc.rowFilter)
{
-size +=
TypeSizes.NATIVE.sizeofWithShortLength(expr.column_name);
-size += TypeSizes.NATIVE.sizeof(expr.op.getValue());
+size += TypeSizes.NATIVE.sizeofWithShortLength(expr.column);
+size += TypeSizes.NATIVE.sizeof(expr.operator.ordinal());
- size += TypeSizes.NATIVE.sizeofWithLength(expr.value);
+ size += TypeSizes.NATIVE.sizeofWithShortLength(expr.value);
}
}
size += AbstractBounds.serializer.serializedSize(rsc.keyRange,
version);
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/thrift/ThriftValidation.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/470e3fe2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/470e3fe2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/470e3fe2
Branch: refs/heads/trunk
Commit: 470e3fe2d0d40d70bee2f3f8c5cabce0e4a58052
Parents: f8138a3 91a81b7
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Nov 5 19:28:12 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Nov 5 19:28:12 2013 +0100
--
CHANGES.txt| 1 +
src/java/org/apache/cassandra/thrift/ThriftValidation.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/470e3fe2/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/470e3fe2/src/java/org/apache/cassandra/thrift/ThriftValidation.java
--
diff --cc src/java/org/apache/cassandra/thrift/ThriftValidation.java
index beef7c6,3a831f4..e68b070
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@@ -210,7 -211,8 +210,7 @@@ public class ThriftValidatio
throw new
org.apache.cassandra.exceptions.InvalidRequestException(supercolumn specified
to ColumnFamily + metadata.cfName + containing normal columns);
}
AbstractType? comparator = SuperColumns.getComparatorFor(metadata,
superColumnName);
- boolean isCQL3Table = metadata.hasCompositeComparator()
!metadata.isDense() !metadata.isSuper();
-CFDefinition cfDef = metadata.getCfDef();
+ boolean isCQL3Table = !metadata.isThriftCompatible();
for (ByteBuffer name : column_names)
{
if (name.remaining() maxNameLength)
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2bbabe15 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bbabe15 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bbabe15 Branch: refs/heads/trunk Commit: 2bbabe154e350d4b1b69cb8d8bb2290d620db81d Parents: a552b30 4a439d2 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Nov 4 16:13:06 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Nov 4 16:13:06 2013 +0100 -- CHANGES.txt | 1 + NEWS.txt| 6 + conf/cassandra.yaml | 4 + .../org/apache/cassandra/config/Config.java | 1 + .../cassandra/config/DatabaseDescriptor.java| 8 + .../org/apache/cassandra/transport/Frame.java | 150 +++ 6 files changed, 111 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bbabe15/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bbabe15/NEWS.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bbabe15/conf/cassandra.yaml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bbabe15/src/java/org/apache/cassandra/config/Config.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bbabe15/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45bb9246 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45bb9246 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45bb9246 Branch: refs/heads/trunk Commit: 45bb924673df3867c43e16d19974ea5427c323b5 Parents: 5f5905d 4169aa3 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Oct 30 17:22:32 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Oct 30 17:22:32 2013 +0100 -- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/QueryOptions.java | 27 +--- .../cql3/statements/ModificationStatement.java | 3 +++ .../cassandra/transport/SimpleClient.java | 5 ++-- .../transport/messages/ExecuteMessage.java | 7 + .../transport/messages/QueryMessage.java| 7 + 6 files changed, 31 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45bb9246/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45bb9246/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb2c4fe3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb2c4fe3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb2c4fe3 Branch: refs/heads/trunk Commit: eb2c4fe381e906a92ca7044e84cbfae753813e9a Parents: e6b4fcf f1c0524 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Oct 28 13:39:28 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Oct 28 13:39:28 2013 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/cql/QueryProcessor.java| 52 ++- .../cassandra/cql/hooks/ExecutionContext.java | 48 ++ .../cql/hooks/PostPreparationHook.java | 38 .../cassandra/cql/hooks/PreExecutionHook.java | 46 ++ .../cassandra/cql/hooks/PreparationContext.java | 39 .../apache/cassandra/cql3/QueryProcessor.java | 97 ++-- .../cql3/hooks/BatchExecutionContext.java | 52 +++ .../cassandra/cql3/hooks/ExecutionContext.java | 47 ++ .../cassandra/cql3/hooks/PostExecutionHook.java | 52 +++ .../cql3/hooks/PostPreparationHook.java | 38 .../cassandra/cql3/hooks/PreExecutionHook.java | 62 + .../cql3/hooks/PreparationContext.java | 41 + .../transport/messages/BatchMessage.java| 2 +- 14 files changed, 603 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb2c4fe3/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb2c4fe3/src/java/org/apache/cassandra/cql/QueryProcessor.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a301a9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a301a9c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a301a9c Branch: refs/heads/trunk Commit: 1a301a9cada13c8cff4aedc6f2e25a4199d2d178 Parents: eb2c4fe 46f7186 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Oct 28 15:53:05 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Oct 28 15:53:05 2013 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/statements/ModificationStatement.java | 4 src/java/org/apache/cassandra/thrift/CassandraServer.java| 2 ++ 3 files changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a301a9c/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a301a9c/src/java/org/apache/cassandra/thrift/CassandraServer.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e5ed3a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e5ed3a6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e5ed3a6 Branch: refs/heads/trunk Commit: 4e5ed3a64c4fbce090f73f9653eb08277d64b6e0 Parents: 7950dc3 b5d563e Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Oct 28 20:25:09 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Oct 28 20:25:09 2013 +0300 -- src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e5ed3a6/src/java/org/apache/cassandra/service/StorageProxy.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55a77487 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55a77487 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55a77487 Branch: refs/heads/trunk Commit: 55a7748752b5aa0445659d7227db459cda5eb1c0 Parents: db5c95c 18260c5 Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Oct 26 15:33:08 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Oct 26 15:33:08 2013 +0300 -- CHANGES.txt | 1 + bin/cqlsh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/55a77487/CHANGES.txt -- diff --cc CHANGES.txt index 549f318,62c3f52..b66534f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,6 +1,15 @@@ +2.1 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + + 2.0.3 * Fix modifying column_metadata from thrift (CASSANDRA-6182) + * cqlsh: fix LIST USERS output (CASSANDRA-6242) 2.0.2
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c56a5ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c56a5ec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c56a5ec Branch: refs/heads/trunk Commit: 0c56a5ecedc8f0f1d60879b043650402168a14f8 Parents: 0dccea4 2c4b043 Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Oct 25 19:11:22 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Oct 25 19:11:22 2013 +0200 -- CHANGES.txt| 4 src/java/org/apache/cassandra/config/CFMetaData.java | 4 ++-- src/java/org/apache/cassandra/config/ColumnDefinition.java | 6 -- 3 files changed, 10 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c56a5ec/CHANGES.txt -- diff --cc CHANGES.txt index a7671c7,3c96770..549f318 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,7 +1,16 @@@ +2.1 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + + + 2.0.3 + * Fix modifying column_metadata from thrift (CASSANDRA-6182) + + 2.0.2 * Update FailureDetector to use nanontime (CASSANDRA-4925) * Fix FileCacheService regressions (CASSANDRA-6149) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c56a5ec/src/java/org/apache/cassandra/config/CFMetaData.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c56a5ec/src/java/org/apache/cassandra/config/ColumnDefinition.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Conflicts:
build.xml
lib/lz4-1.1.2.jar
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bf5b45d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bf5b45d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bf5b45d
Branch: refs/heads/trunk
Commit: 9bf5b45d889482757419bfb84a9d448de84dd500
Parents: f895ad4 93da683
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Oct 23 11:25:12 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Oct 23 11:25:12 2013 +0200
--
build.xml | 2 +-
lib/lz4-1.1.2.jar | Bin 134344 - 0 bytes
lib/lz4-1.2.0.jar | Bin 0 - 165505 bytes
.../cassandra/net/IncomingTcpConnection.java | 4 ++--
4 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bf5b45d/build.xml
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bf5b45d/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
--
diff --cc src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index ddc1853,f0449c4..469f9a2
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@@ -25,11 -24,6 +25,11 @@@ import java.util.zip.Checksum
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import net.jpountz.lz4.LZ4BlockInputStream;
- import net.jpountz.lz4.LZ4Decompressor;
++import net.jpountz.lz4.LZ4FastDecompressor;
+import net.jpountz.lz4.LZ4Factory;
+import net.jpountz.xxhash.XXHashFactory;
import org.xerial.snappy.SnappyInputStream;
import org.apache.cassandra.config.DatabaseDescriptor;
@@@ -113,16 -105,7 +113,16 @@@ public class IncomingTcpConnection exte
if (compressed)
{
logger.debug(Upgrading incoming connection to be compressed);
-in = new DataInputStream(new
SnappyInputStream(socket.getInputStream()));
+if (version MessagingService.VERSION_21)
+in = new DataInputStream(new
SnappyInputStream(socket.getInputStream()));
+else
+{
- LZ4Decompressor decompressor =
LZ4Factory.fastestInstance().decompressor();
++LZ4FastDecompressor decompressor =
LZ4Factory.fastestInstance().fastDecompressor();
+Checksum checksum =
XXHashFactory.fastestInstance().newStreamingHash32(OutboundTcpConnection.LZ4_HASH_SEED).asChecksum();
+in = new DataInputStream(new
LZ4BlockInputStream(socket.getInputStream(),
+ decompressor,
+ checksum));
+}
}
else
{
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5942afa8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5942afa8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5942afa8 Branch: refs/heads/trunk Commit: 5942afa89e0a78cec673f6ed2cf2e52bd0dcc66a Parents: 9bf5b45 1240c9b Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Oct 23 14:30:22 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Oct 23 14:30:22 2013 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/SystemKeyspace.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5942afa8/CHANGES.txt -- diff --cc CHANGES.txt index 5bb11b7,1df6ade..88531ad --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,6 +1,15 @@@ +2.1 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + + 2.0.3 * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571) + * Fix NPE while loading paxos state (CASSANDRA-6211) Merged from 1.2: * Fix altering column types (CASSANDRA-6185) * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5942afa8/src/java/org/apache/cassandra/db/SystemKeyspace.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31a84ac0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31a84ac0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31a84ac0 Branch: refs/heads/trunk Commit: 31a84ac02e49a47aba384de2242991004c22f6c8 Parents: cfcc575 941cd45 Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Oct 23 22:39:11 2013 +0800 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Oct 23 22:39:11 2013 +0800 -- CHANGES.txt| 1 + bin/cqlsh | 14 -- pylib/cqlshlib/cql3handling.py | 2 +- pylib/cqlshlib/tracing.py | 8 +++- 4 files changed, 21 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/31a84ac0/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ac8c664 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ac8c664 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ac8c664 Branch: refs/heads/trunk Commit: 0ac8c66400c6399e8dfed616a164818da1579652 Parents: 51b6667 01370bb Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Oct 23 23:46:14 2013 +0800 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Oct 23 23:46:14 2013 +0800 -- CHANGES.txt | 2 +- .../cassandra/service/AbstractReadExecutor.java | 9 +++--- .../cassandra/service/AbstractRowResolver.java | 20 +--- .../cassandra/service/IResponseResolver.java| 2 +- .../service/RangeSliceResponseResolver.java | 3 +- .../apache/cassandra/service/ReadCallback.java | 11 ++- .../cassandra/service/RowDigestResolver.java| 32 ++-- .../apache/cassandra/service/StorageProxy.java | 7 - 8 files changed, 27 insertions(+), 59 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ac8c664/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ac8c664/src/java/org/apache/cassandra/service/RowDigestResolver.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ac8c664/src/java/org/apache/cassandra/service/StorageProxy.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e79cd74d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e79cd74d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e79cd74d Branch: refs/heads/trunk Commit: e79cd74d711043204f07d9395408f6d35aaaf4cf Parents: 0ac8c66 4adfd5c Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Oct 23 23:50:17 2013 +0800 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Oct 23 23:50:17 2013 +0800 -- NEWS.txt | 2 ++ src/java/org/apache/cassandra/config/CFMetaData.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e79cd74d/NEWS.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e79cd74d/src/java/org/apache/cassandra/config/CFMetaData.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dfabeb52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfabeb52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfabeb52 Branch: refs/heads/trunk Commit: dfabeb52d4233837bdbd0b68875ddcfa9f472634 Parents: 460fc03 a2b224a Author: Dave Brosius dbros...@mebigfatguy.com Authored: Wed Oct 23 23:50:29 2013 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Wed Oct 23 23:50:29 2013 -0400 -- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfabeb52/src/java/org/apache/cassandra/service/StorageService.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c747874a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c747874a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c747874a Branch: refs/heads/trunk Commit: c747874a5306cde9628d9e2c93679a84e22644c7 Parents: 2d46a2b 28caff5 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Oct 21 15:17:46 2013 +0800 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Oct 21 15:17:46 2013 +0800 -- src/java/org/apache/cassandra/db/marshal/TimestampType.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/46681108 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46681108 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46681108 Branch: refs/heads/trunk Commit: 46681108e60cfa2afc229cf15157620b7ea0852f Parents: c747874 146f813 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Oct 21 15:20:18 2013 +0800 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Oct 21 15:20:18 2013 +0800 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46681108/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1f8c6f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1f8c6f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1f8c6f7 Branch: refs/heads/trunk Commit: d1f8c6f7a8492a32efa8a2dd29a6061d0c618550 Parents: 4668110 edd1226 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Oct 21 15:40:30 2013 +0800 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Oct 21 15:40:30 2013 +0800 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- src/java/org/apache/cassandra/service/StorageProxyMBean.java | 2 +- src/java/org/apache/cassandra/tools/NodeCmd.java | 7 ++- src/java/org/apache/cassandra/tools/NodeProbe.java | 5 + src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 3 +++ 6 files changed, 17 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1f8c6f7/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1f8c6f7/src/java/org/apache/cassandra/service/StorageProxy.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9957ed66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9957ed66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9957ed66 Branch: refs/heads/trunk Commit: 9957ed667505fc4be39007714b3be646b42b9549 Parents: 66957ec 20f1b81 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Oct 21 23:15:27 2013 +0800 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Oct 21 23:15:27 2013 +0800 -- CHANGES.txt| 1 + bin/cqlsh | 2 +- pylib/cqlshlib/cql3handling.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9957ed66/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/20693928 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20693928 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20693928 Branch: refs/heads/trunk Commit: 20693928ae848676e1f859ecf4a473c9818707c9 Parents: 35cbc19 c4c8bca Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Oct 22 03:15:22 2013 +0800 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Oct 22 03:15:22 2013 +0800 -- CHANGES.txt| 1 + pylib/cqlshlib/cql3handling.py | 68 + 2 files changed, 2 insertions(+), 67 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/20693928/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/656d3240 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/656d3240 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/656d3240 Branch: refs/heads/trunk Commit: 656d3240f7488be7cbc05fab7e9dd45616c5cd27 Parents: 3020555 232906d Author: Marcus Eriksson marc...@spotify.com Authored: Sat Oct 19 08:51:54 2013 +0200 Committer: Marcus Eriksson marc...@spotify.com Committed: Sat Oct 19 08:51:54 2013 +0200 -- .../io/compress/CompressedSequentialWriter.java | 12 1 file changed, 12 insertions(+) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f8a90aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f8a90aa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f8a90aa Branch: refs/heads/trunk Commit: 3f8a90aa41709eb9070002a9b2e8ebd2306c4d26 Parents: 6bcf28e 91bd207 Author: Marcus Eriksson marc...@spotify.com Authored: Fri Oct 18 16:08:25 2013 +0200 Committer: Marcus Eriksson marc...@spotify.com Committed: Fri Oct 18 16:08:25 2013 +0200 -- --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99c93158 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99c93158 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99c93158 Branch: refs/heads/trunk Commit: 99c93158db7c580e2a84865a02602f6f63e8691d Parents: 78cad84 f19610c Author: Dave Brosius dbros...@mebigfatguy.com Authored: Thu Oct 17 21:53:58 2013 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Thu Oct 17 21:53:58 2013 -0400 -- .../compaction/LeveledCompactionStrategy.java | 33 ++-- 1 file changed, 10 insertions(+), 23 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ccbf9219 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccbf9219 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ccbf9219 Branch: refs/heads/trunk Commit: ccbf92198f5f7338fcaa2f1aa7e5ff0488b63600 Parents: dfa7c58 b1c60a0 Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Oct 15 02:37:58 2013 +0700 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Oct 15 02:37:58 2013 +0700 -- src/java/org/apache/cassandra/cql/AbstractModification.java | 5 + src/java/org/apache/cassandra/cql/BatchStatement.java | 5 + src/java/org/apache/cassandra/cql/SelectStatement.java | 5 + src/java/org/apache/cassandra/cql/WhereClause.java | 5 + .../org/apache/cassandra/cql3/statements/BatchStatement.java| 5 + .../org/apache/cassandra/cql3/statements/DeleteStatement.java | 2 +- .../apache/cassandra/cql3/statements/ModificationStatement.java | 4 ++-- .../org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +- .../org/apache/cassandra/cql3/statements/UpdateStatement.java | 2 +- 9 files changed, 30 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccbf9219/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8530d735 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8530d735 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8530d735 Branch: refs/heads/trunk Commit: 8530d735806de9d69109f469841e9ff6001b801d Parents: 228e67e 9644f09 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Wed Oct 9 17:25:14 2013 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Wed Oct 9 17:25:14 2013 -0400 -- .../io/compress/CompressedSequentialWriter.java| 13 - 1 file changed, 13 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9f9c147 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9f9c147 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9f9c147 Branch: refs/heads/trunk Commit: e9f9c14799714317f9b533de2eda469ad666d578 Parents: a50c4fa 4901352 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Wed Oct 9 19:32:31 2013 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Wed Oct 9 19:32:31 2013 -0400 -- src/java/org/apache/cassandra/tools/NodeCmd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e070e1c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e070e1c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e070e1c Branch: refs/heads/trunk Commit: 6e070e1ce05dfb3a914d091875ef878037b7f840 Parents: e9f9c14 8a506e6 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Wed Oct 9 21:52:52 2013 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Wed Oct 9 21:52:52 2013 -0400 -- src/java/org/apache/cassandra/tracing/TraceState.java | 1 - 1 file changed, 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/152da3cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/152da3cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/152da3cb Branch: refs/heads/trunk Commit: 152da3cb5eeacaf1b799a6e8443c2d821943bb9b Parents: 1612ad1 c198b76 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Tue Oct 8 20:43:25 2013 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Tue Oct 8 20:43:25 2013 -0400 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 4 ++-- .../apache/cassandra/service/StorageServiceServerTest.java| 7 +++ 3 files changed, 10 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/152da3cb/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/152da3cb/src/java/org/apache/cassandra/service/StorageService.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bbf3cc51 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbf3cc51 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbf3cc51 Branch: refs/heads/trunk Commit: bbf3cc5166a8279db851090e64997ffc00cb8f15 Parents: 6dda6f2 8dfd75d Author: Marcus Eriksson marc...@spotify.com Authored: Fri Oct 4 09:42:13 2013 +0200 Committer: Marcus Eriksson marc...@spotify.com Committed: Fri Oct 4 09:42:13 2013 +0200 -- CHANGES.txt | 1 + .../db/compaction/LeveledManifest.java | 4 ++ .../org/apache/cassandra/io/util/FileUtils.java | 57 .../utils/BackgroundActivityMonitor.java| 10 +--- .../org/apache/cassandra/utils/CLibrary.java| 2 - .../org/apache/cassandra/utils/FBUtilities.java | 7 +++ 6 files changed, 62 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbf3cc51/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbf3cc51/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec308e66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec308e66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec308e66 Branch: refs/heads/trunk Commit: ec308e66b34fc6946aa6c1c1b8967ba3aa963a74 Parents: 12c4734 b3647d9 Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu Oct 3 11:21:32 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu Oct 3 11:21:32 2013 +0200 -- test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec308e66/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5f66507 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5f66507 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5f66507 Branch: refs/heads/trunk Commit: e5f66507ee5b47b4ea90e465a0ac5de717afd9b0 Parents: 17c7e94 58eebc9 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Oct 1 09:02:05 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Oct 1 09:02:05 2013 +0200 -- CHANGES.txt | 1 + .../CompositesIndexOnClusteringKey.java | 3 +- .../CompositesIndexOnPartitionKey.java | 4 +- .../db/index/composites/CompositesSearcher.java | 2 +- .../unit/org/apache/cassandra/SchemaLoader.java | 3 +- .../cassandra/db/ColumnFamilyStoreTest.java | 48 6 files changed, 54 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5f66507/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5f66507/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5f66507/test/unit/org/apache/cassandra/SchemaLoader.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5f66507/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7ebc851 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7ebc851 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7ebc851 Branch: refs/heads/trunk Commit: c7ebc85161425649f669db591f4c0585a608a13b Parents: e5f6650 8f88670 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Oct 1 17:39:15 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Oct 1 17:39:15 2013 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/UnsortedColumns.java | 1 + 2 files changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7ebc851/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cff47b9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cff47b9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cff47b9 Branch: refs/heads/trunk Commit: 0cff47b923dc99ae23753c06fbd0a470d81f6753 Parents: e9cfc64 65773b1 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Sep 30 01:29:58 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Sep 30 01:29:58 2013 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 36 .../org/apache/cassandra/db/DataTracker.java| 14 +--- .../org/apache/cassandra/db/MeteredFlusher.java | 18 +- .../compaction/AbstractCompactionStrategy.java | 30 .../MemtableRenewedNotification.java| 30 6 files changed, 95 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cff47b9/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cff47b9/src/java/org/apache/cassandra/db/ColumnFamilyStore.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d31d358 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d31d358 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d31d358 Branch: refs/heads/trunk Commit: 1d31d358d2931492c34067612bdf0383934001f2 Parents: 0cff47b dc7e2fd Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Sep 30 02:20:47 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Sep 30 02:20:47 2013 +0300 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Memtable.java | 6 +- .../apache/cassandra/db/compaction/CompactionManager.java| 4 ++-- .../org/apache/cassandra/db/index/SecondaryIndexManager.java | 8 4 files changed, 16 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d31d358/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d31d358/src/java/org/apache/cassandra/db/Memtable.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d31d358/src/java/org/apache/cassandra/db/compaction/CompactionManager.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d31d358/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe54388b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe54388b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe54388b Branch: refs/heads/trunk Commit: fe54388ba3576b4ef28e591e847fbb58f27ecfca Parents: bce594f 3a70933 Author: Dave Brosius dbros...@apache.org Authored: Fri Sep 27 20:48:38 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Fri Sep 27 20:48:38 2013 -0400 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeCmd.java | 10 +- .../org/apache/cassandra/tools/NodeToolHelp.yaml | 6 -- 3 files changed, 10 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe54388b/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1be1a91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1be1a91 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1be1a91 Branch: refs/heads/trunk Commit: a1be1a91374b786842b026383657441478b83b80 Parents: bb8e95c ee553f3 Author: Dave Brosius dbros...@apache.org Authored: Sat Sep 28 01:29:41 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Sat Sep 28 01:29:41 2013 -0400 -- src/java/org/apache/cassandra/triggers/CustomClassLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0d328bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0d328bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0d328bf Branch: refs/heads/trunk Commit: c0d328bf084ffefef40d51189bc193011c8d6e54 Parents: 879fa88 f2eaf9a Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Sep 25 15:17:22 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Sep 25 15:17:22 2013 +0300 -- doc/cql3/CQL.textile | 24 1 file changed, 12 insertions(+), 12 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/compaction/LegacyLeveledManifest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be236eae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be236eae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be236eae Branch: refs/heads/trunk Commit: be236eae29f98e14e746cc8d03efd4b41d7fb7d4 Parents: c0d328b 102e911 Author: Marcus Eriksson marc...@spotify.com Authored: Wed Sep 25 14:58:21 2013 +0200 Committer: Marcus Eriksson marc...@spotify.com Committed: Wed Sep 25 14:58:21 2013 +0200 -- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be236eae/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08e33464 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08e33464 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08e33464 Branch: refs/heads/trunk Commit: 08e3346494a21688d214f465c7048567a86e5f06 Parents: af4799b 3448ca5 Author: Marcus Eriksson marc...@spotify.com Authored: Tue Sep 24 09:57:39 2013 +0200 Committer: Marcus Eriksson marc...@spotify.com Committed: Tue Sep 24 09:57:39 2013 +0200 -- CHANGES.txt | 2 +- src/java/org/apache/cassandra/net/MessagingService.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08e33464/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08e33464/src/java/org/apache/cassandra/net/MessagingService.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d3698f89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3698f89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3698f89 Branch: refs/heads/trunk Commit: d3698f8901eec59af6b3576c70a1cc2b15f384dc Parents: 99691be 38ae1be Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Sep 24 15:58:34 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Sep 24 15:58:34 2013 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/ResultSet.java| 11 +++ .../cassandra/cql3/statements/SelectStatement.java | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3698f89/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3698f89/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/455e673b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/455e673b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/455e673b Branch: refs/heads/trunk Commit: 455e673bc9be2311e89eb245318fc1808566c6aa Parents: d3698f8 326d545 Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Sep 24 17:00:56 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Sep 24 17:00:56 2013 +0300 -- CHANGES.txt | 1 + examples/client_only/src/ClientOnlyExample.java | 109 --- src/java/org/apache/cassandra/auth/Auth.java| 5 +- .../cassandra/auth/CassandraAuthorizer.java | 2 +- .../cassandra/auth/PasswordAuthenticator.java | 2 +- .../apache/cassandra/cql3/QueryProcessor.java | 5 +- .../cql3/statements/ListUsersStatement.java | 2 +- .../apache/cassandra/service/ClientState.java | 64 +++ .../apache/cassandra/service/QueryState.java| 8 ++ .../cassandra/thrift/ThriftClientState.java | 11 +- .../cassandra/thrift/ThriftSessionManager.java | 6 +- .../cassandra/transport/ServerConnection.java | 6 +- 12 files changed, 96 insertions(+), 125 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/455e673b/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe4606ce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe4606ce Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe4606ce Branch: refs/heads/trunk Commit: fe4606ce17561cabb827331d81bca5f15602805b Parents: 65166aa 7ce28f8 Author: Dave Brosius dbros...@apache.org Authored: Sat Sep 21 16:10:19 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Sat Sep 21 16:10:19 2013 -0400 -- src/java/org/apache/cassandra/service/FileCacheService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63589bac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63589bac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63589bac Branch: refs/heads/trunk Commit: 63589bac5aa70f5833ef2c821f47fc3b7739613c Parents: 54f41a9 37e9bce Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu Sep 19 12:58:40 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu Sep 19 12:58:40 2013 +0200 -- CHANGES.txt | 1 + doc/cql3/CQL.textile| 6 ++- doc/native_protocol_v2.spec | 20 +--- .../apache/cassandra/cql3/AbstractMarker.java | 4 +- .../org/apache/cassandra/cql3/Attributes.java | 2 +- src/java/org/apache/cassandra/cql3/Cql.g| 31 +--- src/java/org/apache/cassandra/cql3/Lists.java | 4 +- src/java/org/apache/cassandra/cql3/Maps.java| 4 +- .../org/apache/cassandra/cql3/Operation.java| 2 +- src/java/org/apache/cassandra/cql3/Sets.java| 2 +- src/java/org/apache/cassandra/cql3/Term.java| 6 +-- .../cassandra/cql3/VariableSpecifications.java | 52 .../cassandra/cql3/functions/FunctionCall.java | 9 +--- .../cql3/statements/BatchStatement.java | 4 +- .../cql3/statements/CreateTableStatement.java | 1 - .../cql3/statements/DeleteStatement.java| 4 +- .../cql3/statements/ModificationStatement.java | 10 ++-- .../cql3/statements/ParsedStatement.java| 15 -- .../statements/SchemaAlteringStatement.java | 5 ++ .../cql3/statements/SelectStatement.java| 8 +-- .../cql3/statements/TruncateStatement.java | 5 ++ .../cql3/statements/UpdateStatement.java| 8 +-- .../cassandra/cql3/statements/UseStatement.java | 5 ++ 23 files changed, 150 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63589bac/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63589bac/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b1d1fac8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1d1fac8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1d1fac8 Branch: refs/heads/trunk Commit: b1d1fac8d2ff44ecdf7584fa33dd1504c914c41d Parents: 63589ba caf047b Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Sep 19 15:54:56 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Sep 19 15:54:56 2013 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/thrift/TServerFactory.java | 3 +- .../apache/cassandra/thrift/ThriftServer.java | 54 ++-- 3 files changed, 42 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1d1fac8/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1a91093 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1a91093 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1a91093 Branch: refs/heads/trunk Commit: e1a9109309511d80c4358406990bcd80b17ae7e1 Parents: 2315686 c2a36e7 Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Sep 19 18:21:11 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Sep 19 18:21:11 2013 +0300 -- src/java/org/apache/cassandra/thrift/ThriftServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23156863 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23156863 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23156863 Branch: refs/heads/trunk Commit: 23156863d8c3ab8a8ea490a0cd7c76af63a5e994 Parents: b1d1fac 7453e6f Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Sep 19 18:14:23 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Sep 19 18:14:23 2013 +0300 -- CHANGES.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23156863/CHANGES.txt -- diff --cc CHANGES.txt index 4254d70,fcc33f2..fe652f6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,7 +1,15 @@@ +2.1 + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + ++ + 2.0.2 + * Make ThriftServer more easlly extensible (CASSANDRA-6058) + + 2.0.1 * add file_cache_size_in_mb setting (CASSANDRA-5661) * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08eb9c8f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08eb9c8f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08eb9c8f Branch: refs/heads/trunk Commit: 08eb9c8f57ea1cb2ab534f294241c3904e1a2711 Parents: 4ba8e3c e638ace Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Sep 18 15:13:29 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Sep 18 15:15:03 2013 +0300 -- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08eb9c8f/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c985830
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c985830
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c985830
Branch: refs/heads/trunk
Commit: 1c9858306517ddecc5dd9d17b85d20a9724afe72
Parents: 5102e8d e93578b
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Sep 18 17:59:17 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Sep 18 17:59:17 2013 +0200
--
CHANGES.txt | 1 +
doc/cql3/CQL.textile| 3 +
.../apache/cassandra/cql3/AbstractMarker.java | 25 ++
src/java/org/apache/cassandra/cql3/Cql.g| 1 +
.../org/apache/cassandra/cql3/Relation.java | 2 +-
.../apache/cassandra/cql3/statements/Bound.java | 35 ++
.../cql3/statements/ModificationStatement.java | 69 ++--
.../cassandra/cql3/statements/Restriction.java | 289 +++
.../cql3/statements/SelectStatement.java| 348 ++-
9 files changed, 511 insertions(+), 262 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c985830/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c985830/src/java/org/apache/cassandra/cql3/statements/Restriction.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/Restriction.java
index 000,45cc607..73444ad
mode 00,100644..100644
--- a/src/java/org/apache/cassandra/cql3/statements/Restriction.java
+++ b/src/java/org/apache/cassandra/cql3/statements/Restriction.java
@@@ -1,0 -1,289 +1,289 @@@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ package org.apache.cassandra.cql3.statements;
+
+ import java.nio.ByteBuffer;
+ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.List;
+
+ import org.apache.cassandra.exceptions.InvalidRequestException;
-import org.apache.cassandra.thrift.IndexOperator;
++import org.apache.cassandra.db.IndexExpression;
+ import org.apache.cassandra.cql3.*;
+
+ /**
+ * A restriction/clause on a column.
+ * The goal of this class being to group all conditions for a column in a
SELECT.
+ */
+ public interface Restriction
+ {
+ public boolean isOnToken();
+
+ public boolean isSlice();
+ public boolean isEQ();
+ public boolean isIN();
+
+ // Only supported for EQ and IN, but it's convenient to have here
+ public ListByteBuffer values(ListByteBuffer variables) throws
InvalidRequestException;
+
+ public static class EQ implements Restriction
+ {
+ private final Term value;
+ private final boolean onToken;
+
+ public EQ(Term value, boolean onToken)
+ {
+ this.value = value;
+ this.onToken = onToken;
+ }
+
+ public ListByteBuffer values(ListByteBuffer variables) throws
InvalidRequestException
+ {
+ return Collections.singletonList(value.bindAndGet(variables));
+ }
+
+ public boolean isSlice()
+ {
+ return false;
+ }
+
+ public boolean isEQ()
+ {
+ return true;
+ }
+
+ public boolean isIN()
+ {
+ return false;
+ }
+
+ public boolean isOnToken()
+ {
+ return onToken;
+ }
+
+ @Override
+ public String toString()
+ {
+ return String.format(EQ(%s)%s, value, onToken ? * : );
+ }
+ }
+
+ public static abstract class IN implements Restriction
+ {
+ public static IN create(ListTerm values)
+ {
+ return new WithValues(values);
+ }
+
+ public static IN create(Term
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ea405ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ea405ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ea405ed Branch: refs/heads/trunk Commit: 2ea405edd3b2ff3e885eadd3afe4bcd62602a35c Parents: a7820f9 997c49a Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Sep 18 22:49:50 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Sep 18 22:49:50 2013 +0300 -- CHANGES.txt | 3 ++- bin/cqlsh | 4 2 files changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ea405ed/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cba309c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cba309c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cba309c Branch: refs/heads/trunk Commit: 0cba309cd52c5844189cc6b0e1de770b27953d57 Parents: 7906851 36f2178 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Sep 17 13:54:42 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Sep 17 13:54:42 2013 +0200 -- .../org/apache/cassandra/transport/messages/ResultMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/643f1354 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/643f1354 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/643f1354 Branch: refs/heads/trunk Commit: 643f1354bed21fa0665b0500986a9028b4ce5d94 Parents: 01e0219 a05f630 Author: Dave Brosius dbros...@apache.org Authored: Mon Sep 16 10:00:21 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Mon Sep 16 10:00:21 2013 -0400 -- .../apache/cassandra/db/columniterator/SSTableNamesIterator.java| 1 - 1 file changed, 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/975df2ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/975df2ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/975df2ed Branch: refs/heads/trunk Commit: 975df2edaf5f1fd56a2bff72b78c0e5d9f56ac20 Parents: 643f135 a2824e6 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Sep 16 16:23:00 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Sep 16 16:23:00 2013 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/MessagingService.java | 2 +- src/java/org/apache/cassandra/service/StorageService.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/975df2ed/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/975df2ed/src/java/org/apache/cassandra/net/MessagingService.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/975df2ed/src/java/org/apache/cassandra/service/StorageService.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71c94feb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71c94feb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71c94feb Branch: refs/heads/trunk Commit: 71c94feb0173d611ff45a7866e837c242491cbbc Parents: e546e33 50c9d77 Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Sep 13 12:07:37 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Sep 13 12:07:37 2013 +0200 -- CHANGES.txt | 1 + .../apache/cassandra/service/StorageProxy.java | 4 ++-- .../service/paxos/PrepareCallback.java | 20 3 files changed, 19 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71c94feb/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71c94feb/src/java/org/apache/cassandra/service/StorageProxy.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cabf0fa3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cabf0fa3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cabf0fa3 Branch: refs/heads/trunk Commit: cabf0fa32a514f552c2f49641b0dd200be667a97 Parents: 3634eab fa70e06 Author: Marcus Eriksson marc...@spotify.com Authored: Fri Sep 13 09:18:40 2013 +0200 Committer: Marcus Eriksson marc...@spotify.com Committed: Fri Sep 13 09:18:40 2013 +0200 -- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/tools/StandaloneScrubber.java | 9 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cabf0fa3/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cabf0fa3/src/java/org/apache/cassandra/tools/StandaloneScrubber.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d57ce284
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d57ce284
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d57ce284
Branch: refs/heads/trunk
Commit: d57ce284505d33f6cb568fd577532f2aa4f4ddfa
Parents: c1c29d8 53f19c8
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Sep 12 18:45:34 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Sep 12 18:45:34 2013 +0300
--
build.xml | 2 +-
lib/guava-13.0.1.jar | Bin 1891110 - 0 bytes
lib/guava-15.0.jar| Bin 0 - 2172168 bytes
lib/licenses/guava-13.0.1.txt | 202 -
lib/licenses/guava-15.0.txt | 202 +
5 files changed, 203 insertions(+), 203 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d57ce284/build.xml
--
diff --cc build.xml
index 79a64eb,6aab42a..50a1b36
--- a/build.xml
+++ b/build.xml
@@@ -336,9 -336,9 +336,9 @@@
scm connection=${scm.connection}
developerConnection=${scm.developerConnection} url=${scm.url}/
dependencyManagement
dependency groupId=org.xerial.snappy artifactId=snappy-java
version=1.0.5/
- dependency groupId=net.jpountz.lz4 artifactId=lz4
version=1.1.0/
+ dependency groupId=net.jpountz.lz4 artifactId=lz4
version=1.1.2/
dependency groupId=com.ning artifactId=compress-lzf
version=0.8.4/
- dependency groupId=com.google.guava artifactId=guava
version=13.0.1/
+ dependency groupId=com.google.guava artifactId=guava
version=15.0/
dependency groupId=commons-cli artifactId=commons-cli
version=1.1/
dependency groupId=commons-codec artifactId=commons-codec
version=1.2/
dependency groupId=org.apache.commons artifactId=commons-lang3
version=3.1/
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1c29d84 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1c29d84 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1c29d84 Branch: refs/heads/trunk Commit: c1c29d847abb129a71034a078150e13680d460f9 Parents: 0ec68f5 349d5db Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Sep 12 18:38:02 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Sep 12 18:38:02 2013 +0300 -- .../org/apache/cassandra/config/CFMetaData.java| 4 +++- .../apache/cassandra/cql3/UntypedResultSet.java| 14 -- .../cassandra/hadoop/pig/CassandraStorage.java | 17 + 3 files changed, 12 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1c29d84/src/java/org/apache/cassandra/config/CFMetaData.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38226121 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38226121 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38226121 Branch: refs/heads/trunk Commit: 3822612182c9c1c82ce580016ad8c6de07ff99c3 Parents: 36610aa 1ff0d8e Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Sep 10 18:23:51 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Sep 10 18:23:51 2013 +0300 -- .../apache/cassandra/db/index/composites/CompositesSearcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/38226121/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b21a0dab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b21a0dab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b21a0dab Branch: refs/heads/trunk Commit: b21a0dab5944c5399a0301938a99c8f190ff6a8d Parents: 241f7a4 52678a2 Author: Dave Brosius dbros...@apache.org Authored: Mon Sep 9 18:44:15 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Mon Sep 9 18:44:15 2013 -0400 -- src/java/org/apache/cassandra/db/compaction/SSTableSplitter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87d5c019 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87d5c019 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87d5c019 Branch: refs/heads/trunk Commit: 87d5c019ca713c328b5827a5bdf2eaf014ab21a0 Parents: a9ec0ac b248b1a Author: Aleksey Yeschenko alek...@apache.org Authored: Sun Sep 8 19:41:08 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sun Sep 8 19:41:08 2013 +0300 -- src/java/org/apache/cassandra/auth/AuthenticatedUser.java | 2 +- src/java/org/apache/cassandra/auth/DataResource.java| 6 +++--- src/java/org/apache/cassandra/auth/PermissionDetails.java | 6 +++--- src/java/org/apache/cassandra/config/TriggerDefinition.java | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) --
