[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/tools/NodeCmd.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5968f7b2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5968f7b2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5968f7b2 Branch: refs/heads/trunk Commit: 5968f7b2e87929bb5884b1711a8f4712f12d030d Parents: 67ba050 8d2c3fe Author: Vijay Authored: Sun Mar 9 14:52:17 2014 -0700 Committer: Vijay Committed: Sun Mar 9 14:52:17 2014 -0700 -- --
[3/3] 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/89b8b1a7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89b8b1a7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89b8b1a7 Branch: refs/heads/trunk Commit: 89b8b1a757f17ec8e9de476468b9cb6b9fb42832 Parents: d5e9644 0520aeb Author: Sylvain Lebresne Authored: Wed Feb 19 11:43:34 2014 +0100 Committer: Sylvain Lebresne Committed: Wed Feb 19 11:43:34 2014 +0100 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/db/marshal/DateType.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89b8b1a7/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89b8b1a7/src/java/org/apache/cassandra/db/marshal/DateType.java --
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/cql3/CFDefinition.java src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java src/java/org/apache/cassandra/cql3/Cql.g src/java/org/apache/cassandra/cql3/statements/SelectStatement.java src/java/org/apache/cassandra/db/marshal/CompositeType.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c727f6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c727f6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c727f6f Branch: refs/heads/trunk Commit: 4c727f6f97411d55e12d1b5615e5425d162b1ad8 Parents: 9ea9949 44cf4a6 Author: Sylvain Lebresne Authored: Mon Feb 17 15:02:44 2014 +0100 Committer: Sylvain Lebresne Committed: Mon Feb 17 15:02:44 2014 +0100 -- CHANGES.txt | 2 + doc/cql3/CQL.textile| 24 +- src/java/org/apache/cassandra/cql3/Cql.g| 16 .../apache/cassandra/cql3/QueryProcessor.java | 2 +- .../org/apache/cassandra/cql3/Relation.java | 17 +++- .../cassandra/cql3/statements/Restriction.java | 24 +- .../cql3/statements/SelectStatement.java| 85 +++- .../cassandra/db/marshal/CompositeType.java | 61 +++--- .../apache/cassandra/net/MessagingService.java | 26 +- 9 files changed, 197 insertions(+), 60 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c727f6f/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c727f6f/doc/cql3/CQL.textile -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c727f6f/src/java/org/apache/cassandra/cql3/Cql.g -- diff --cc src/java/org/apache/cassandra/cql3/Cql.g index 11291b6,6e7cf1c..55d8aac --- a/src/java/org/apache/cassandra/cql3/Cql.g +++ b/src/java/org/apache/cassandra/cql3/Cql.g @@@ -964,8 -881,22 +964,24 @@@ relation[List clauses { $clauses.add(new Relation(name, Relation.Type.IN, marker)); } | name=cident K_IN { Relation rel = Relation.createInRelation($name.id); } '(' ( f1=term { rel.addInValue(f1); } (',' fN=term { rel.addInValue(fN); } )* )? ')' { $clauses.add(rel); } +| name=cident K_CONTAINS { Relation.Type rt = Relation.Type.CONTAINS; } (K_KEY { rt = Relation.Type.CONTAINS_KEY; })? +t=term { $clauses.add(new Relation(name, rt, t)); } + | { + List ids = new ArrayList(); + List terms = new ArrayList(); + } + '(' n1=cident { ids.add(n1); } (',' ni=cident { ids.add(ni); })* ')' + type=relationType + '(' t1=term { terms.add(t1); } (',' ti=term { terms.add(ti); })* ')' + { + if (type == Relation.Type.IN) + addRecognitionError("Cannot use IN relation with tuple notation"); + if (ids.size() != terms.size()) + addRecognitionError(String.format("Number of values (" + terms.size() + ") in tuple notation doesn't match the number of column names (" + ids.size() + ")")); + else + for (int i = 0; i < ids.size(); i++) + $clauses.add(new Relation(ids.get(i), type, terms.get(i), i == 0 ? null : ids.get(i-1))); + } | '(' relation[$clauses] ')' ; http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c727f6f/src/java/org/apache/cassandra/cql3/QueryProcessor.java -- diff --cc src/java/org/apache/cassandra/cql3/QueryProcessor.java index f2559e6,167533f..5acb367 --- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java @@@ -45,10 -44,10 +45,10 @@@ import org.apache.cassandra.utils.Seman public class QueryProcessor { - public static final SemanticVersion CQL_VERSION = new SemanticVersion("3.1.4"); + public static final SemanticVersion CQL_VERSION = new SemanticVersion("3.1.5"); private static final Logger logger = LoggerFactory.getLogger(QueryProcessor.class); -private static final MemoryMeter meter = new MemoryMeter(); +private static final MemoryMeter meter = new MemoryMeter().withGuessing(MemoryMeter.Guess.FALLBACK_BEST); private static final long MAX_CACHE_PREPARED_MEMORY = Runtime.getRuntime().maxMemory() / 256; private static final int MAX_CACHE_PREPARED_COUNT = 1; http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c727f6f/src/java/org/apache/cassandra/cql3/Relation.java
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fddc09b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fddc09b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fddc09b Branch: refs/heads/trunk Commit: 7fddc09b2529f085314a1efedaaca1d14be736d3 Parents: 0b42b0e 15fd82c Author: Aleksey Yeschenko Authored: Fri Feb 14 20:55:29 2014 +0300 Committer: Aleksey Yeschenko Committed: Fri Feb 14 20:55:29 2014 +0300 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fddc09b/CHANGES.txt -- diff --cc CHANGES.txt index c306b43,571b8dd..5a3d7a9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -58,8 -22,8 +58,9 @@@ Merged from 1.2 * Don't exchange schema between nodes with different versions (CASSANDRA-6695) * Use real node messaging versions for schema exchange decisions (CASSANDRA-6700) * IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701) + * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711) + 2.0.5 * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609) * Add ks.cf names to tombstone logging (CASSANDRA-6597) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fddc09b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java -- diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java index 946e3be,7bfed33..2ac342f --- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java +++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java @@@ -440,10 -436,10 +440,11 @@@ public class SecondaryIndexManage // Update entire row only once per row level index Set> cleanedRowLevelIndexes = null; -for (Column column : indexedColumnsInRow) +for (Cell cell : indexedColumnsInRow) { -ColumnDefinition cDef = baseCfs.metadata.getColumnDefinitionFromColumnName(column.name()); +// TODO: this is probably incorrect, we should pull all indexes - SecondaryIndex index = indexesByColumn.get(cell.name().toByteBuffer()); ++baseCfs.metadata.getColumnDefinition(cell.name()); + SecondaryIndex index = indexesByColumn.get(cDef.name); if (index == null) continue;
[3/3] 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/c36656c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c36656c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c36656c0 Branch: refs/heads/trunk Commit: c36656c06bc10bccace324d40adc7d038de2f74f Parents: 5b0eb01 44f9c86 Author: Sylvain Lebresne Authored: Fri Feb 14 13:52:57 2014 +0100 Committer: Sylvain Lebresne Committed: Fri Feb 14 13:52:57 2014 +0100 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/statements/SelectStatement.java| 8 +--- 2 files changed, 6 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c36656c0/CHANGES.txt -- diff --cc CHANGES.txt index 42c8bd9,57eefac..d08cb93 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -56,8 -21,8 +56,9 @@@ Merged from 1.2 * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649) * Don't exchange schema between nodes with different versions (CASSANDRA-6695) * Use real node messaging versions for schema exchange decisions (CASSANDRA-6700) + * IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701) + 2.0.5 * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609) * Add ks.cf names to tombstone logging (CASSANDRA-6597) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c36656c0/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java -- diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index 3bf5906,307e668..60d13f4 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@@ -694,12 -706,12 +694,12 @@@ public class SelectStatement implement for (ByteBuffer val : values) { if (val == null) -throw new InvalidRequestException(String.format("Invalid null clustering key part %s", name)); -ColumnNameBuilder copy = builder.copy().add(val); +throw new InvalidRequestException(String.format("Invalid null clustering key part %s", def.name)); +Composite prefix = builder.buildWith(val); // See below for why this - s.add((bound == Bound.END && builder.remainingCount() > 0) ? prefix.end() : prefix); -s.add((b == Bound.END && copy.remainingCount() > 0) ? copy.buildAsEndOfRange() : copy.build()); ++s.add((b == Bound.END && builder.remainingCount() > 0) ? prefix.end() : prefix); } -return new ArrayList(s); +return new ArrayList(s); } ByteBuffer val = values.get(0); @@@ -947,64 -986,70 +947,66 @@@ assert orderingIndexes != null; -// optimization when only *one* order condition was given -// because there is no point of using composite comparator if there is only one order condition -if (parameters.orderings.size() == 1) +List idToSort = new ArrayList(); +List> sorters = new ArrayList>(); + +// If the restriction for the last clustering key is an IN, respect requested order +if (lastClusteringIsIn) { -CFDefinition.Name ordering = cfDef.get(parameters.orderings.keySet().iterator().next()); -Collections.sort(cqlRows.rows, new SingleColumnComparator(orderingIndexes.get(ordering), ordering.type)); -return; +List cc = cfm.clusteringColumns(); +idToSort.add(orderingIndexes.get(cc.get(cc.size() - 1).name)); +Restriction last = columnRestrictions[columnRestrictions.length - 1]; - sorters.add(makeComparatorFor(last.values(variables))); ++sorters.add(makeComparatorFor(last.values(variables), isReversed)); } -// builds a 'composite' type for multi-column comparison from the comparators of the ordering components -// and passes collected position information and built composite comparator to CompositeComparator to do -// an actual comparison of the CQL rows. -List> types = new ArrayList>(parameters.orderings.size()); -int[] positions = new int[parameters.orderings.size()]; - -int idx = 0; +// Then add the
[3/3] 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/21de3328 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21de3328 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21de3328 Branch: refs/heads/trunk Commit: 21de3328aad87e10ad4301b1c198022e57fecaa8 Parents: 79c6ecc 78df8a3 Author: Aleksey Yeschenko Authored: Thu Feb 13 19:34:31 2014 +0300 Committer: Aleksey Yeschenko Committed: Thu Feb 13 19:34:31 2014 +0300 -- CHANGES.txt | 1 + .../cassandra/net/IncomingTcpConnection.java| 4 +-- .../apache/cassandra/net/MessagingService.java | 28 +--- .../cassandra/service/MigrationManager.java | 4 +-- 4 files changed, 23 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21de3328/CHANGES.txt -- diff --cc CHANGES.txt index 139eb06,7425625..0af --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -52,8 -20,8 +52,9 @@@ Merged from 1.2 * Compact hints after partial replay to clean out tombstones (CASSANDRA-) * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649) * Don't exchange schema between nodes with different versions (CASSANDRA-6695) + * Use real node messaging versions for schema exchange decisions (CASSANDRA-6700) + 2.0.5 * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609) * Add ks.cf names to tombstone logging (CASSANDRA-6597) http://git-wip-us.apache.org/repos/asf/cassandra/blob/21de3328/src/java/org/apache/cassandra/net/IncomingTcpConnection.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21de3328/src/java/org/apache/cassandra/net/MessagingService.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21de3328/src/java/org/apache/cassandra/service/MigrationManager.java --
[3/3] 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/15d60756 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15d60756 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15d60756 Branch: refs/heads/trunk Commit: 15d607568ccf932e28b51544c1ee59cbff32c8eb Parents: d4461f8 de6a74a Author: Jonathan Ellis Authored: Wed Feb 12 15:50:38 2014 -0600 Committer: Jonathan Ellis Committed: Wed Feb 12 15:50:38 2014 -0600 -- .../org/apache/cassandra/service/CassandraDaemon.java | 2 +- src/java/org/apache/cassandra/utils/FBUtilities.java| 12 2 files changed, 1 insertion(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15d60756/src/java/org/apache/cassandra/service/CassandraDaemon.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15d60756/src/java/org/apache/cassandra/utils/FBUtilities.java --
[3/3] 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/d4461f83 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4461f83 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4461f83 Branch: refs/heads/trunk Commit: d4461f832e9d3a343dce76a9da8b35f538f493e4 Parents: f78db53 c6c686f Author: Jonathan Ellis Authored: Wed Feb 12 15:48:25 2014 -0600 Committer: Jonathan Ellis Committed: Wed Feb 12 15:48:25 2014 -0600 -- .../org/apache/cassandra/service/CassandraDaemon.java | 5 +++-- src/java/org/apache/cassandra/utils/FBUtilities.java| 12 2 files changed, 15 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4461f83/src/java/org/apache/cassandra/service/CassandraDaemon.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4461f83/src/java/org/apache/cassandra/utils/FBUtilities.java --
[3/3] 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/f78db530 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f78db530 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f78db530 Branch: refs/heads/trunk Commit: f78db5307335337566cd2b2d43aec042f88b8153 Parents: 1ede296 efec07e Author: Jonathan Ellis Authored: Wed Feb 12 15:38:40 2014 -0600 Committer: Jonathan Ellis Committed: Wed Feb 12 15:38:40 2014 -0600 -- src/java/org/apache/cassandra/service/StorageService.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f78db530/src/java/org/apache/cassandra/service/StorageService.java --
[3/3] 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/1ede2967 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ede2967 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ede2967 Branch: refs/heads/trunk Commit: 1ede2967b89f7831df8023f71174b262d878a0fe Parents: 0d0acac cafaa8e Author: Jonathan Ellis Authored: Wed Feb 12 15:36:15 2014 -0600 Committer: Jonathan Ellis Committed: Wed Feb 12 15:36:15 2014 -0600 -- 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/1ede2967/src/java/org/apache/cassandra/service/CassandraDaemon.java --
[3/3] 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/f5b3515e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5b3515e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5b3515e Branch: refs/heads/trunk Commit: f5b3515eec09a4609200dcfdaab8965665e57bdb Parents: 5cf381f babc2de Author: Aleksey Yeschenko Authored: Wed Feb 12 19:41:24 2014 +0300 Committer: Aleksey Yeschenko Committed: Wed Feb 12 19:41:24 2014 +0300 -- CHANGES.txt | 1 + .../cassandra/service/MigrationManager.java | 18 -- 2 files changed, 9 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5b3515e/CHANGES.txt -- diff --cc CHANGES.txt index 3831b38,a4dc8fd..a45df89 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -49,8 -17,8 +49,9 @@@ Merged from 1.2 * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667) * Compact hints after partial replay to clean out tombstones (CASSANDRA-) * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649) + * Don't exchange schema between nodes with different versions (CASSANDRA-6695) + 2.0.5 * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609) * Add ks.cf names to tombstone logging (CASSANDRA-6597) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5b3515e/src/java/org/apache/cassandra/service/MigrationManager.java --
[3/3] 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/e58737fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e58737fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e58737fe Branch: refs/heads/trunk Commit: e58737fe0809e82596e890bf58b2c4b657062143 Parents: a6e7d14 b9aece4 Author: Brandon Williams Authored: Tue Feb 11 09:36:10 2014 -0600 Committer: Brandon Williams Committed: Tue Feb 11 09:36:10 2014 -0600 -- --
[3/3] 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/503a8a86 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/503a8a86 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/503a8a86 Branch: refs/heads/trunk Commit: 503a8a865ed60b08e6c512c206a295a6a78f2848 Parents: 861d996 9a6ae96 Author: Marcus Eriksson Authored: Mon Feb 10 18:35:41 2014 +0100 Committer: Marcus Eriksson Committed: Mon Feb 10 18:35:41 2014 +0100 -- test/unit/org/apache/cassandra/db/CleanupTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/503a8a86/test/unit/org/apache/cassandra/db/CleanupTest.java --
[3/3] 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/de9be79d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de9be79d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de9be79d Branch: refs/heads/trunk Commit: de9be79d55ce36a23d9795faa37d792835404982 Parents: 319877f 16f99c5 Author: Jonathan Ellis Authored: Mon Feb 10 00:43:24 2014 -0600 Committer: Jonathan Ellis Committed: Mon Feb 10 00:43:24 2014 -0600 -- CHANGES.txt | 2 ++ .../cassandra/utils/EstimatedHistogram.java | 31 2 files changed, 20 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de9be79d/CHANGES.txt -- diff --cc CHANGES.txt index 802f515,b98dec7..7f9f9d2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,35 -1,5 +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 usage with ArrayBackedSortedColumns (CASSANDRA-6630) + * Add option to use row cache with a given amount of rows (CASSANDRA-5357) + * Avoid repairing already repaired data (CASSANDRA-5351) + 2.0.6 + * Fix EstimatedHistogram races (CASSANDRA-6682) * Failure detector correctly converts initial value to nanos (CASSANDRA-6658) * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445) * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) http://git-wip-us.apache.org/repos/asf/cassandra/blob/de9be79d/src/java/org/apache/cassandra/utils/EstimatedHistogram.java --
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/Memtable.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/813da911 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/813da911 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/813da911 Branch: refs/heads/trunk Commit: 813da911b9b4ba53b4da9714f3b37e76687d2904 Parents: a4ed367 800e45f Author: Aleksey Yeschenko Authored: Sat Feb 8 04:13:41 2014 +0300 Committer: Aleksey Yeschenko Committed: Sat Feb 8 04:13:41 2014 +0300 -- --
[3/3] 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/f71ef609 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f71ef609 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f71ef609 Branch: refs/heads/trunk Commit: f71ef609930a9f10691e8febd4bf7c984efe5114 Parents: f8b1a9e 3d5b5c3 Author: Brandon Williams Authored: Fri Feb 7 08:54:29 2014 -0600 Committer: Brandon Williams Committed: Fri Feb 7 08:54:29 2014 -0600 -- src/java/org/apache/cassandra/service/CassandraDaemon.java | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f71ef609/src/java/org/apache/cassandra/service/CassandraDaemon.java -- diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java index 0ad47ac,d87f6d8..179e955 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@@ -20,8 -20,10 +20,9 @@@ package org.apache.cassandra.service import java.io.File; import java.io.IOException; import java.lang.management.ManagementFactory; + import java.lang.management.MemoryPoolMXBean; import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URL; +import java.net.UnknownHostException; import java.util.Arrays; import java.util.Map; import java.util.UUID;
[3/3] 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/ff2a92c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff2a92c1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff2a92c1 Branch: refs/heads/trunk Commit: ff2a92c13c822e3220fe980323590bb4032f32bc Parents: d5c5734 ce9c8c2 Author: Brandon Williams Authored: Thu Feb 6 15:05:54 2014 -0600 Committer: Brandon Williams Committed: Thu Feb 6 15:05:54 2014 -0600 -- CHANGES.txt| 1 + .../org/apache/cassandra/gms/FailureDetector.java | 17 - 2 files changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff2a92c1/CHANGES.txt -- diff --cc CHANGES.txt index 86e576c,85c6533..098d8ad --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,8 +1,37 @@@ +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) + * Add option to use row cache with a given amount of rows (CASSANDRA-5357) + 2.0.6 + * Failure detector correctly converts initial value to nanos (CASSANDRA-6658) * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445) * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) - * Improve nodetool cfhistograms formatting (CASSANDRA-6360) * Expose bulk loading progress over JMX (CASSANDRA-4757) * Correctly handle null with IF conditions and TTL (CASSANDRA-6623) * Account for range/row tombstones in tombstone drop http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff2a92c1/src/java/org/apache/cassandra/gms/FailureDetector.java --
[3/3] 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/ac666706 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac666706 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac666706 Branch: refs/heads/trunk Commit: ac666706d7b8ab67fb14423f02471d37f5e3b226 Parents: ad8cea4 5f64af6 Author: Brandon Williams Authored: Thu Feb 6 13:11:40 2014 -0600 Committer: Brandon Williams Committed: Thu Feb 6 13:11:40 2014 -0600 -- --
[3/3] 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/3a82adb8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a82adb8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a82adb8 Branch: refs/heads/trunk Commit: 3a82adb89a619339bffa676890bc534f0975987e Parents: 5653516 43e6e18 Author: Jonathan Ellis Authored: Thu Feb 6 10:13:04 2014 -0600 Committer: Jonathan Ellis Committed: Thu Feb 6 10:13:04 2014 -0600 -- --
[3/3] 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/5653516e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5653516e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5653516e Branch: refs/heads/trunk Commit: 5653516e3ae44d95a71717db8eca758c01ee6b46 Parents: ab6eaed cd26f48 Author: Jonathan Ellis Authored: Thu Feb 6 10:08:47 2014 -0600 Committer: Jonathan Ellis Committed: Thu Feb 6 10:08:47 2014 -0600 -- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 26 ++-- .../cassandra/service/StorageServiceMBean.java | 7 ++ .../org/apache/cassandra/tools/BulkLoader.java | 6 - .../io/sstable/SSTableScannerTest.java | 8 +++--- 5 files changed, 34 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5653516e/CHANGES.txt -- diff --cc CHANGES.txt index 657bf9e,728c57a..745e50b --- 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 + * Expose bulk loading progress over JMX (CASSANDRA-4757) * 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/5653516e/src/java/org/apache/cassandra/service/StorageService.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5653516e/src/java/org/apache/cassandra/service/StorageServiceMBean.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5653516e/src/java/org/apache/cassandra/tools/BulkLoader.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5653516e/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java --
[3/3] 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/AtomicSortedColumns.java src/java/org/apache/cassandra/db/Memtable.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe4247e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe4247e5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe4247e5 Branch: refs/heads/trunk Commit: fe4247e589714d9ea183187c0538b6446f16ffca Parents: 58d1a4f 58e9481 Author: Sylvain Lebresne Authored: Wed Feb 5 18:51:40 2014 +0100 Committer: Sylvain Lebresne Committed: Wed Feb 5 18:51:40 2014 +0100 -- CHANGES.txt | 8 ++- .../apache/cassandra/db/AtomicBTreeColumns.java | 22 .../org/apache/cassandra/db/DeletionInfo.java | 14 + src/java/org/apache/cassandra/db/Memtable.java | 4 +--- 4 files changed, 30 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe4247e5/CHANGES.txt -- diff --cc CHANGES.txt index 0690c38,bba5f20..7d628b5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,40 -1,7 +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) + + 2.0.6 - * Fix direct Memory on architectures that do not support unaligned long access -(CASSANDRA-6628) - * Let scrub optionally skip broken counter partitions (CASSANDRA-5930) Merged from 1.2: - * Move handling of migration event source to solve bootstrap race. (CASSANDRA-6648) - * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647) - + * Fix partition and range deletes not triggering flush (CASSANDRA-6655) + 2.0.5 * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609) http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe4247e5/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java -- diff --cc src/java/org/apache/cassandra/db/AtomicBTreeColumns.java index 238bb7c,000..fd7d4bc mode 100644,00..100644 --- a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java +++ b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java @@@ -1,457 -1,0 +1,461 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.db; + +import java.util.AbstractCollection; +import java.util.ArrayList; +import java.util.Arrays; +import java.
[3/3] 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/45c70154 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45c70154 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45c70154 Branch: refs/heads/trunk Commit: 45c70154c668315b0f007e21d01d7b713082698c Parents: 9d4f7c9 79b3626 Author: Dave Brosius Authored: Tue Feb 4 20:18:33 2014 -0500 Committer: Dave Brosius Committed: Tue Feb 4 20:18:33 2014 -0500 -- CHANGES.txt | 3 ++- .../org/apache/cassandra/db/compaction/CompactionManager.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45c70154/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45c70154/src/java/org/apache/cassandra/db/compaction/CompactionManager.java --
[3/3] 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/c947c126 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c947c126 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c947c126 Branch: refs/heads/trunk Commit: c947c126f0893f214cae26e8b199a88618e4d6f7 Parents: 0842681 723fcd1 Author: Brandon Williams Authored: Tue Feb 4 11:00:15 2014 -0600 Committer: Brandon Williams Committed: Tue Feb 4 11:00:15 2014 -0600 -- --
[3/3] 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/78f71420 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78f71420 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78f71420 Branch: refs/heads/trunk Commit: 78f71420c33f588dcbb82bcbd689bb4aad6dd92f Parents: 63f110b 066d00b Author: Aleksey Yeschenko Authored: Tue Feb 4 01:02:08 2014 +0300 Committer: Aleksey Yeschenko Committed: Tue Feb 4 01:02:08 2014 +0300 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/78f71420/CHANGES.txt --
[3/3] 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/00fc3186 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00fc3186 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00fc3186 Branch: refs/heads/trunk Commit: 00fc31868aa4b002b9f6acbc18b861f6e8f11175 Parents: b5a3303 b5a2b65 Author: Jason Brown Authored: Thu Jan 30 10:00:34 2014 -0800 Committer: Jason Brown Committed: Thu Jan 30 10:00:34 2014 -0800 -- --
[3/3] 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/DataRange.java src/java/org/apache/cassandra/db/index/SecondaryIndex.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82571546 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82571546 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82571546 Branch: refs/heads/trunk Commit: 82571546efff0a3427fca3a000ffdf3f6c1e176c Parents: 8f17bbd 287745e Author: Aleksey Yeschenko Authored: Wed Jan 29 14:18:20 2014 -0600 Committer: Aleksey Yeschenko Committed: Wed Jan 29 14:18:20 2014 -0600 -- CHANGES.txt | 1 + .../cassandra/db/index/SecondaryIndex.java | 22 +--- 2 files changed, 15 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82571546/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82571546/src/java/org/apache/cassandra/db/index/SecondaryIndex.java -- diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndex.java index 81359af,fda28f0..7edfd94 --- a/src/java/org/apache/cassandra/db/index/SecondaryIndex.java +++ b/src/java/org/apache/cassandra/db/index/SecondaryIndex.java @@@ -181,15 -180,21 +181,21 @@@ public abstract class SecondaryInde getIndexName(), StringUtils.join(baseCfs.getSSTables(), ", "))); Collection sstables = baseCfs.markCurrentSSTablesReferenced(); - SecondaryIndexBuilder builder = new SecondaryIndexBuilder(baseCfs, - Collections.singleton(getIndexName()), - new ReducingKeyIterator(sstables)); - Future future = CompactionManager.instance.submitIndexBuild(builder); - FBUtilities.waitOnFuture(future); - forceBlockingFlush(); - - setIndexBuilt(); + try + { + SecondaryIndexBuilder builder = new SecondaryIndexBuilder(baseCfs, + Collections.singleton(getIndexName()), + new ReducingKeyIterator(sstables)); + Future future = CompactionManager.instance.submitIndexBuild(builder); + FBUtilities.waitOnFuture(future); + forceBlockingFlush(); + setIndexBuilt(); + } + finally + { + SSTableReader.releaseReferences(sstables); + } -logger.info("Index build of " + getIndexName() + " complete"); +logger.info("Index build of {} complete", getIndexName()); }
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/341d6c48 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/341d6c48 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/341d6c48 Branch: refs/heads/trunk Commit: 341d6c48c4c80d1a325a0045f1d7878e53dddc67 Parents: a1ecb12 479bf8a Author: Aleksey Yeschenko Authored: Wed Jan 29 00:20:21 2014 -0600 Committer: Aleksey Yeschenko Committed: Wed Jan 29 00:20:21 2014 -0600 -- CHANGES.txt | 1 + .../cassandra/db/ArrayBackedSortedColumns.java | 7 - .../db/ArrayBackedSortedColumnsTest.java| 30 3 files changed, 37 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/341d6c48/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/341d6c48/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java -- diff --cc src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java index 5d5178c,389e0f8..dbebf5e --- a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java +++ b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java @@@ -350,28 -349,33 +350,33 @@@ public class ArrayBackedSortedColumns e { public int size() { -return columns.size(); +return cells.size(); } -public Iterator iterator() +public Iterator iterator() { -return new Iterator() +return new Iterator() { int idx = size() - 1; + boolean shouldCallNext = true; public boolean hasNext() { return idx >= 0; } -public Column next() +public Cell next() { + shouldCallNext = false; -return columns.get(idx--); +return cells.get(idx--); } public void remove() { - cells.remove(idx--); + if (shouldCallNext) + throw new IllegalStateException(); -columns.remove(idx + 1); ++cells.remove(idx + 1); + shouldCallNext = true; } }; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/341d6c48/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java -- diff --cc test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java index 2befc29,06e2e75..185d3b3 --- a/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java +++ b/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java @@@ -171,4 -165,32 +171,34 @@@ public class ArrayBackedSortedColumnsTe assert name == value : "Expected " + name + " but got " + value; } } + + @Test + public void testRemove() + { + testRemoveInternal(false); + testRemoveInternal(true); + } + + private void testRemoveInternal(boolean reversed) + { ++CellNameType type = new SimpleDenseCellNameType(Int32Type.instance); + ColumnFamily map = ArrayBackedSortedColumns.factory.create(metadata(), reversed); ++ + int[] values = new int[]{ 1, 2, 2, 3 }; + + for (int i = 0; i < values.length; ++i) -map.addColumn(new Column(ByteBufferUtil.bytes(values[reversed ? values.length - 1 - i : i])), HeapAllocator.instance); ++map.addColumn(new Cell(type.makeCellName(values[reversed ? values.length - 1 - i : i])), HeapAllocator.instance); + -Iterator iter = map.getReverseSortedColumns().iterator(); ++Iterator iter = map.getReverseSortedColumns().iterator(); + assertTrue(iter.hasNext()); + iter.next(); + iter.remove(); + assertTrue(iter.hasNext()); + iter.next(); + iter.remove(); + assertTrue(iter.hasNext()); + iter.next(); + iter.remove(); + assertTrue(!iter.hasNext()); + } }
[3/3] 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/91893660 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91893660 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91893660 Branch: refs/heads/trunk Commit: 918936600a8f16c4063deb9d15f845b83136c2e5 Parents: 2ba3946 d9f9c5b Author: Aleksey Yeschenko Authored: Tue Jan 28 17:24:10 2014 -0600 Committer: Aleksey Yeschenko Committed: Tue Jan 28 17:24:10 2014 -0600 -- src/java/org/apache/cassandra/db/DataTracker.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/91893660/src/java/org/apache/cassandra/db/DataTracker.java --
[3/3] 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/9c9552ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c9552ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c9552ae Branch: refs/heads/trunk Commit: 9c9552aead388dbc777d1e9219a92fcd0830b290 Parents: 0254741 41ffca1 Author: Yuki Morishita Authored: Tue Jan 28 09:19:05 2014 -0600 Committer: Yuki Morishita Committed: Tue Jan 28 09:19:05 2014 -0600 -- CHANGES.txt | 1 + .../cassandra/streaming/ConnectionHandler.java | 117 +-- .../streaming/messages/StreamMessage.java | 3 +- 3 files changed, 61 insertions(+), 60 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c9552ae/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c9552ae/src/java/org/apache/cassandra/streaming/ConnectionHandler.java --
[3/3] 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/82735e09 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82735e09 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82735e09 Branch: refs/heads/trunk Commit: 82735e096a49a1871d88353f06620300df55ebf6 Parents: 714c423 20c2adc Author: Jonathan Ellis Authored: Mon Jan 27 17:00:24 2014 -0600 Committer: Jonathan Ellis Committed: Mon Jan 27 17:00:24 2014 -0600 -- CHANGES.txt | 1 + .../cassandra/dht/Murmur3Partitioner.java | 5 +- .../org/apache/cassandra/utils/BloomFilter.java | 79 ++-- .../org/apache/cassandra/utils/FBUtilities.java | 6 ++ .../cassandra/utils/Murmur3BloomFilter.java | 4 +- .../org/apache/cassandra/utils/MurmurHash.java | 6 +- .../cassandra/utils/obs/OffHeapBitSet.java | 2 +- 7 files changed, 72 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82735e09/CHANGES.txt -- diff --cc CHANGES.txt index cc406c8,68727dc..23bb4f1 --- 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) + * Cassandra won't start by default without jna (CASSANDRA-6575) + * New counters implementation (CASSANDRA-6504) + + 2.0.5 + * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609) * Add ks.cf names to tombstone logging (CASSANDRA-6597) * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495) * Wait for gossip to settle before accepting client connections (CASSANDRA-4288) http://git-wip-us.apache.org/repos/asf/cassandra/blob/82735e09/src/java/org/apache/cassandra/utils/FBUtilities.java --
[3/3] 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/680f2bda Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/680f2bda Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/680f2bda Branch: refs/heads/trunk Commit: 680f2bda4d0d51e023bcad2d160883ab408cca8f Parents: 4d13d09 8bbb6ed Author: Sylvain Lebresne Authored: Mon Jan 27 18:47:21 2014 +0100 Committer: Sylvain Lebresne Committed: Mon Jan 27 18:47:21 2014 +0100 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/680f2bda/CHANGES.txt --
[3/3] 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/4724d562 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4724d562 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4724d562 Branch: refs/heads/trunk Commit: 4724d562ca02e06dcc26c7126f1ba3ddeb811250 Parents: e488e58 1b858be Author: Brandon Williams Authored: Fri Jan 24 17:01:57 2014 -0600 Committer: Brandon Williams Committed: Fri Jan 24 17:01:57 2014 -0600 -- src/java/org/apache/cassandra/transport/Server.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[3/3] 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/630d5ee8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/630d5ee8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/630d5ee8 Branch: refs/heads/trunk Commit: 630d5ee8da288969dbec2dc4083e3e3af736cbff Parents: 5b995cd 7ae6178 Author: Jonathan Ellis Authored: Fri Jan 24 08:20:28 2014 +0900 Committer: Jonathan Ellis Committed: Fri Jan 24 08:20:28 2014 +0900 -- .../org/apache/cassandra/locator/AbstractReplicationStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[3/3] 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/b9260092 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9260092 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9260092 Branch: refs/heads/trunk Commit: b9260092dabb90c9a50d773d5a94b184766a50ee Parents: d86e1dd 6348ce0 Author: Brandon Williams Authored: Wed Jan 22 15:32:23 2014 -0600 Committer: Brandon Williams Committed: Wed Jan 22 15:32:23 2014 -0600 -- conf/cassandra.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9260092/conf/cassandra.yaml --
[3/3] 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/6aaa0231 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6aaa0231 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6aaa0231 Branch: refs/heads/trunk Commit: 6aaa023171162ee1b42c6de21f2ef60a49948fc5 Parents: 68baaed 66a8a55 Author: Aleksey Yeschenko Authored: Sun Jan 19 11:16:18 2014 -0800 Committer: Aleksey Yeschenko Committed: Sun Jan 19 11:16:18 2014 -0800 -- src/java/org/apache/cassandra/net/MessagingService.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6aaa0231/src/java/org/apache/cassandra/net/MessagingService.java --
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/BatchlogManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c112047 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c112047 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c112047 Branch: refs/heads/trunk Commit: 5c112047f8b47de3b400d96e2d5533cd8004b3bf Parents: bf14289 8814623 Author: Aleksey Yeschenko Authored: Fri Jan 17 19:54:30 2014 +0300 Committer: Aleksey Yeschenko Committed: Fri Jan 17 19:54:30 2014 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/db/BatchlogManager.java| 78 +- .../cassandra/db/BatchlogManagerTest.java | 84 3 files changed, 145 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c112047/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c112047/src/java/org/apache/cassandra/db/BatchlogManager.java -- diff --cc src/java/org/apache/cassandra/db/BatchlogManager.java index 4ce7f41,23cacca..86b7b17 --- a/src/java/org/apache/cassandra/db/BatchlogManager.java +++ b/src/java/org/apache/cassandra/db/BatchlogManager.java @@@ -122,21 -123,26 +123,26 @@@ public class BatchlogManager implement batchlogTasks.execute(runnable); } -public static RowMutation getBatchlogMutationFor(Collection mutations, UUID uuid) +public static Mutation getBatchlogMutationFor(Collection mutations, UUID uuid) { - long timestamp = FBUtilities.timestampMicros(); - ByteBuffer writtenAt = LongType.instance.decompose(timestamp / 1000); + return getBatchlogMutationFor(mutations, uuid, FBUtilities.timestampMicros()); + } + + @VisibleForTesting -static RowMutation getBatchlogMutationFor(Collection mutations, UUID uuid, long now) ++static Mutation getBatchlogMutationFor(Collection mutations, UUID uuid, long now) + { + ByteBuffer writtenAt = LongType.instance.decompose(now / 1000); -ByteBuffer data = serializeRowMutations(mutations); +ByteBuffer data = serializeMutations(mutations); ColumnFamily cf = ArrayBackedSortedColumns.factory.create(CFMetaData.BatchlogCf); - cf.addColumn(new Cell(cellName(""), ByteBufferUtil.EMPTY_BYTE_BUFFER, timestamp)); - cf.addColumn(new Cell(cellName("data"), data, timestamp)); - cf.addColumn(new Cell(cellName("written_at"), writtenAt, timestamp)); -cf.addColumn(new Column(columnName(""), ByteBufferUtil.EMPTY_BYTE_BUFFER, now)); -cf.addColumn(new Column(columnName("data"), data, now)); -cf.addColumn(new Column(columnName("written_at"), writtenAt, now)); ++cf.addColumn(new Cell(cellName(""), ByteBufferUtil.EMPTY_BYTE_BUFFER, now)); ++cf.addColumn(new Cell(cellName("data"), data, now)); ++cf.addColumn(new Cell(cellName("written_at"), writtenAt, now)); -return new RowMutation(Keyspace.SYSTEM_KS, UUIDType.instance.decompose(uuid), cf); +return new Mutation(Keyspace.SYSTEM_KS, UUIDType.instance.decompose(uuid), cf); } -private static ByteBuffer serializeRowMutations(Collection mutations) +private static ByteBuffer serializeMutations(Collection mutations) { FastByteArrayOutputStream bos = new FastByteArrayOutputStream(); DataOutputStream out = new DataOutputStream(bos); @@@ -205,6 -240,13 +240,13 @@@ totalBatchesReplayed.incrementAndGet(); } + private void deleteBatch(UUID id) + { -RowMutation mutation = new RowMutation(Keyspace.SYSTEM_KS, UUIDType.instance.decompose(id)); ++Mutation mutation = new Mutation(Keyspace.SYSTEM_KS, UUIDType.instance.decompose(id)); + mutation.delete(SystemKeyspace.BATCHLOG_CF, System.currentTimeMillis()); + mutation.apply(); + } + private void replaySerializedMutations(ByteBuffer data, long writtenAt, RateLimiter rateLimiter) throws IOException { DataInputStream in = new DataInputStream(ByteBufferUtil.inputStream(data)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c112047/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java -- diff --cc test/unit/org/apache/cassandra/db/BatchlogManagerTest.java index 000,fd1fa81..8fee6d6 mode 00,100644..100644 --- a/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java +++ b/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java @@@ -1,0 -1,82 +1,84 @@@ + packag
[3/3] 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/8a078054 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a078054 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a078054 Branch: refs/heads/trunk Commit: 8a078054ee35866d78478e22465ff9fcea3e25fa Parents: 3d5eea5 120437e Author: Brandon Williams Authored: Thu Jan 16 16:46:58 2014 -0600 Committer: Brandon Williams Committed: Thu Jan 16 16:46:58 2014 -0600 -- NEWS.txt | 11 +++ 1 file changed, 11 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a078054/NEWS.txt --
[3/3] 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/3d5eea5b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d5eea5b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d5eea5b Branch: refs/heads/trunk Commit: 3d5eea5b87b1c9842f69aec8ea12d61253207284 Parents: 6947e19 49427cd Author: Jonathan Ellis Authored: Thu Jan 16 16:40:13 2014 -0600 Committer: Jonathan Ellis Committed: Thu Jan 16 16:40:13 2014 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 6 -- 2 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d5eea5b/CHANGES.txt -- diff --cc CHANGES.txt index 4c0c4d8,76c020a..10fedf4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,5 +1,32 @@@ +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, 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) + + 2.0.5 + * Add ks.cf names to tombstone logging (CASSANDRA-6597) * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495) * Wait for gossip to settle before accepting client connections (CASSANDRA-4288) * Delete unfinished compaction incrementally (CASSANDRA-6086) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d5eea5b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java --
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/CounterCell.java src/java/org/apache/cassandra/db/CounterUpdateCell.java src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java src/java/org/apache/cassandra/db/context/CounterContext.java src/java/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.java src/java/org/apache/cassandra/io/sstable/SSTableWriter.java test/unit/org/apache/cassandra/db/CounterColumnTest.java test/unit/org/apache/cassandra/db/CounterMutationTest.java test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0fb58f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0fb58f6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0fb58f6 Branch: refs/heads/trunk Commit: a0fb58f6f71f9c2739867149b3b298350ad52b4d Parents: 7faff8d 83cd80b Author: Aleksey Yeschenko Authored: Thu Jan 16 22:21:37 2014 +0300 Committer: Aleksey Yeschenko Committed: Thu Jan 16 22:21:37 2014 +0300 -- CHANGES.txt | 1 + .../org/apache/cassandra/db/CounterCell.java| 125 +-- .../apache/cassandra/db/CounterUpdateCell.java | 12 +- .../db/compaction/CompactionController.java | 6 - .../db/compaction/LazilyCompactedRow.java | 10 +- .../cassandra/db/context/CounterContext.java| 765 +-- .../io/sstable/AbstractSSTableSimpleWriter.java | 5 +- .../cassandra/io/sstable/SSTableWriter.java | 2 +- .../apache/cassandra/db/CounterCellTest.java| 277 +++ .../cassandra/db/CounterMutationTest.java | 115 --- .../db/context/CounterContextTest.java | 703 - .../streaming/StreamingTransferTest.java| 15 +- 12 files changed, 871 insertions(+), 1165 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0fb58f6/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0fb58f6/src/java/org/apache/cassandra/db/CounterCell.java -- diff --cc src/java/org/apache/cassandra/db/CounterCell.java index 297ec73,000..0a1c992 mode 100644,00..100644 --- a/src/java/org/apache/cassandra/db/CounterCell.java +++ b/src/java/org/apache/cassandra/db/CounterCell.java @@@ -1,372 -1,0 +1,263 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.db; + +import java.io.IOException; +import java.nio.ByteBuffer; - import java.net.InetAddress; +import java.security.MessageDigest; - import java.util.Set; + - import com.google.common.collect.ImmutableSet; - import com.google.common.collect.Sets; - import org.apache.cassandra.serializers.MarshalException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.config.CFMetaData; - import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.composites.CellName; +import org.apache.cassandra.db.composites.CellNameType; +import org.apache.cassandra.db.context.CounterContext; +import org.apache.cassandra.db.context.IContext.ContextRelationship; - import org.apache.cassandra.exceptions.OverloadedException; - import org.apache.cassandra.exceptions.RequestExecutionException; +import org.apache.cassandra.io.util.DataOutputBuffer; ++import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.utils.Allocator; - import org.apache.cassandra.service.AbstractWriteResponseHandler; - import org.apache.cassandra.service.StorageProxy; +import org.apache.cassandra.utils.*; + +/** + * A column that represents a partitioned counter. + */ +public cl
[3/3] 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/31228677 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31228677 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31228677 Branch: refs/heads/trunk Commit: 3122867720d9075792cba31a5ef8242fdca58527 Parents: 54f728c 7514e61 Author: Brandon Williams Authored: Tue Jan 14 21:27:26 2014 -0600 Committer: Brandon Williams Committed: Tue Jan 14 21:27:26 2014 -0600 -- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/31228677/CHANGES.txt --
[3/3] 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/54f728c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54f728c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54f728c7 Branch: refs/heads/trunk Commit: 54f728c771742fba66ff751f305a3cf1f5676c7d Parents: ea565aa 05f1209 Author: Brandon Williams Authored: Tue Jan 14 21:22:07 2014 -0600 Committer: Brandon Williams Committed: Tue Jan 14 21:22:07 2014 -0600 -- src/java/org/apache/cassandra/thrift/ThriftConversion.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/54f728c7/src/java/org/apache/cassandra/thrift/ThriftConversion.java --
[3/3] 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/eb354fb4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb354fb4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb354fb4 Branch: refs/heads/trunk Commit: eb354fb4b1d468983d861b548259a2e116cd3a4a Parents: 4910ce8 200e494 Author: Brandon Williams Authored: Tue Jan 14 15:16:14 2014 -0600 Committer: Brandon Williams Committed: Tue Jan 14 15:16:14 2014 -0600 -- .../cassandra/locator/DynamicEndpointSnitch.java | 18 ++ 1 file changed, 2 insertions(+), 16 deletions(-) --
[3/3] 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/4910ce80 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4910ce80 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4910ce80 Branch: refs/heads/trunk Commit: 4910ce8020d9c2e9747a9f5f5dedd3b8c998bd6e Parents: f6f50dd 97c6bbe Author: Jonathan Ellis Authored: Tue Jan 14 11:51:54 2014 -0600 Committer: Jonathan Ellis Committed: Tue Jan 14 11:51:54 2014 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4910ce80/CHANGES.txt -- diff --cc CHANGES.txt index 6e47cff,ef2df51..4069a77 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,5 +1,32 @@@ +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, 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) + + 2.0.5 + * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495) * Wait for gossip to settle before accepting client connections (CASSANDRA-4288) * Delete unfinished compaction incrementally (CASSANDRA-6086) * Allow specifying custom secondary index options in CQL3 (CASSANDRA-6480) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4910ce80/src/java/org/apache/cassandra/service/StorageProxy.java --
[3/3] 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/f07aa399 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f07aa399 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f07aa399 Branch: refs/heads/trunk Commit: f07aa39992db8621cca987ea550c056affda2c76 Parents: e3d1e38 8b8c159 Author: Brandon Williams Authored: Mon Jan 13 09:15:19 2014 -0600 Committer: Brandon Williams Committed: Mon Jan 13 09:15:19 2014 -0600 -- src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f07aa399/src/java/org/apache/cassandra/gms/Gossiper.java --
[3/3] 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/e3d1e38a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3d1e38a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3d1e38a Branch: refs/heads/trunk Commit: e3d1e38a44a84f4689c4f352144a2132d0da6fa2 Parents: fd888bc db69dce Author: Brandon Williams Authored: Mon Jan 13 08:23:02 2014 -0600 Committer: Brandon Williams Committed: Mon Jan 13 08:23:02 2014 -0600 -- --
[3/3] 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/fd888bcb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd888bcb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd888bcb Branch: refs/heads/trunk Commit: fd888bcbcce2fda02c636e9b6d45cae9097180ca Parents: 0a89f38 71a5127 Author: Sylvain Lebresne Authored: Mon Jan 13 10:36:29 2014 +0100 Committer: Sylvain Lebresne Committed: Mon Jan 13 10:36:29 2014 +0100 -- CHANGES.txt | 1 + .../cql3/statements/SelectStatement.java| 21 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd888bcb/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd888bcb/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java -- diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index 4d89988,c3671be..5d5c12f --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@@ -799,39 -784,51 +799,40 @@@ public class SelectStatement implement return expressions; } - -private Iterable columnsInOrder(final ColumnFamily cf, final List variables) throws InvalidRequestException +private static ByteBuffer validateIndexedValue(ColumnDefinition def, ByteBuffer value) throws InvalidRequestException { -if (columnRestrictions.length == 0) -return cf.getSortedColumns(); - -// If the restriction for the last column alias is an IN, respect -// requested order -Restriction last = columnRestrictions[columnRestrictions.length - 1]; -if (last == null || last.isSlice()) -return cf.getSortedColumns(); - -ColumnNameBuilder builder = cfDef.getColumnNameBuilder(); -for (int i = 0; i < columnRestrictions.length - 1; i++) -builder.add(columnRestrictions[i].values(variables).get(0)); +if (value == null) +throw new InvalidRequestException(String.format("Unsupported null value for indexed column %s", def.name)); +if (value.remaining() > 0x) +throw new InvalidRequestException("Index expression values may not be larger than 64K"); +return value; +} +private Iterator applySliceRestriction(final Iterator cells, final List variables) throws InvalidRequestException +{ +assert sliceRestriction != null; -List values = last.values(variables); -final List requested = new ArrayList(values.size()); -Iterator iter = values.iterator(); -while (iter.hasNext()) -{ -ByteBuffer t = iter.next(); -ColumnNameBuilder b = iter.hasNext() ? builder.copy() : builder; -requested.add(b.add(t).build()); -} +final CellNameType type = cfm.comparator; +final CellName excludedStart = sliceRestriction.isInclusive(Bound.START) ? null : type.makeCellName(sliceRestriction.bound(Bound.START, variables)); +final CellName excludedEnd = sliceRestriction.isInclusive(Bound.END) ? null : type.makeCellName(sliceRestriction.bound(Bound.END, variables)); -return new Iterable() +return new AbstractIterator() { -public Iterator iterator() +protected Cell computeNext() { - if (!cells.hasNext()) - return endOfData(); - - Cell c = cells.next(); -return new AbstractIterator() ++while (cells.hasNext()) + { -Iterator iter = requested.iterator(); -public Column computeNext() -{ -while (iter.hasNext()) -{ -Column column = cf.getColumn(iter.next()); -if (column != null) -return column; -} -return endOfData(); -} -}; ++Cell c = cells.next(); + - // For dynamic CF, the column could be out of the requested bounds (because we don't support strict bounds internally (unless - // the comparator is composite that is)), filter here - if ( (excludedStart
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/gms/Gossiper.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bef7146c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bef7146c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bef7146c Branch: refs/heads/trunk Commit: bef7146c73ff986f01da8b8674b2f860d0e5e201 Parents: db07b20 4be6200 Author: Brandon Williams Authored: Thu Jan 9 17:00:39 2014 -0600 Committer: Brandon Williams Committed: Thu Jan 9 17:00:39 2014 -0600 -- src/java/org/apache/cassandra/gms/Gossiper.java | 37 +--- 1 file changed, 24 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bef7146c/src/java/org/apache/cassandra/gms/Gossiper.java --
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: NEWS.txt src/java/org/apache/cassandra/db/BatchlogManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59c99621 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59c99621 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59c99621 Branch: refs/heads/trunk Commit: 59c996212c90d1d5ae8f8140a78623dcb5ad6c80 Parents: 25777e1 95f1b5f Author: Aleksey Yeschenko Authored: Sun Jan 5 03:26:20 2014 +0300 Committer: Aleksey Yeschenko Committed: Sun Jan 5 03:26:20 2014 +0300 -- CHANGES.txt | 1 + NEWS.txt| 9 ++ conf/cassandra.yaml | 4 +++ .../org/apache/cassandra/config/Config.java | 1 + .../cassandra/config/DatabaseDescriptor.java| 5 .../apache/cassandra/db/BatchlogManager.java| 29 +--- 6 files changed, 39 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59c99621/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59c99621/NEWS.txt -- diff --cc NEWS.txt index b1ec355,2e40e9c..14276d1 --- a/NEWS.txt +++ b/NEWS.txt @@@ -13,23 -13,16 +13,32 @@@ restore snapshots created with the prev 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. +2.1 +=== + +Upgrading +- + - Rolling upgrades from anything pre-2.0 is not supported. + - For leveled compaction users, 2.0 must be atleast started before + upgrading to 2.1 due to the fact that the old JSON leveled + manifest is migrated into the sstable metadata files on startup + in 2.0 and this code is gone from 2.1. + - For size-tiered compaction users, Cassandra now defaults to ignoring + the coldest 5% of sstables. This can be customized with the + cold_reads_to_omit compaction option; 0.0 omits nothing (the old + behavior) and 1.0 omits everything. + - Multithreaded compaction has been removed. + + 2.0.5 + = + + New features + + - Batchlog replay can be, and is throttled by default now. + See batchlog_replay_throttle_in_kb setting in cassandra.yaml. + + 2.0.3 = http://git-wip-us.apache.org/repos/asf/cassandra/blob/59c99621/conf/cassandra.yaml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59c99621/src/java/org/apache/cassandra/config/Config.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59c99621/src/java/org/apache/cassandra/config/DatabaseDescriptor.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59c99621/src/java/org/apache/cassandra/db/BatchlogManager.java -- diff --cc src/java/org/apache/cassandra/db/BatchlogManager.java index b103b69,cfa049a..4ce7f41 --- a/src/java/org/apache/cassandra/db/BatchlogManager.java +++ b/src/java/org/apache/cassandra/db/BatchlogManager.java @@@ -204,22 -210,24 +210,24 @@@ public class BatchlogManager implement DataInputStream in = new DataInputStream(ByteBufferUtil.inputStream(data)); int size = in.readInt(); for (int i = 0; i < size; i++) - replaySerializedMutation(Mutation.serializer.deserialize(in, VERSION), writtenAt); -replaySerializedMutation(RowMutation.serializer.deserialize(in, VERSION), writtenAt, rateLimiter); ++replaySerializedMutation(Mutation.serializer.deserialize(in, VERSION), writtenAt, rateLimiter); } /* * We try to deliver the mutations to the replicas ourselves if they are alive and only resort to writing hints * when a replica is down or a write request times out. */ - private void replaySerializedMutation(Mutation mutation, long writtenAt) -private void replaySerializedMutation(RowMutation mutation, long writtenAt, RateLimiter rateLimiter) ++private void replaySerializedMutation(Mutation mutation, long writtenAt, RateLimiter rateLimiter) { int ttl = calculateHintTTL(mutation, writtenAt); if (ttl <= 0) return; // the mutation isn't safe to replay. - Set liveEndpoints = new HashSet(); + Set liveEndpoints = new HashSet<>(); String ks = mutation.getKeyspaceName(); Token tk = StorageService.getPartitioner().getTo
[3/3] 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/9ce5e1ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ce5e1ad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ce5e1ad Branch: refs/heads/trunk Commit: 9ce5e1ad177ac099bd2aac8ff199ddbfc58b09e9 Parents: 15963c8 be9a70e Author: Aleksey Yeschenko Authored: Sat Jan 4 03:09:57 2014 +0300 Committer: Aleksey Yeschenko Committed: Sat Jan 4 03:09:57 2014 +0300 -- debian/init | 43 + .../org/apache/cassandra/cql3/CFPropDefs.java | 189 --- .../org/apache/cassandra/cql3/KSPropDefs.java | 89 - .../cassandra/cql3/PropertyDefinitions.java | 143 -- .../cql3/statements/AlterKeyspaceStatement.java | 1 - .../cassandra/cql3/statements/CFPropDefs.java | 189 +++ .../statements/CreateKeyspaceStatement.java | 1 - .../cassandra/cql3/statements/KSPropDefs.java | 89 + .../cql3/statements/PropertyDefinitions.java| 143 ++ .../SizeTieredCompactionStrategy.java | 2 +- 10 files changed, 429 insertions(+), 460 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ce5e1ad/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java --
[3/3] 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/8165af5d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8165af5d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8165af5d Branch: refs/heads/trunk Commit: 8165af5db91c43dd564f879bd7f124275e3b9608 Parents: 80548b3 5284e12 Author: Sylvain Lebresne Authored: Thu Jan 2 14:19:47 2014 +0100 Committer: Sylvain Lebresne Committed: Thu Jan 2 14:19:47 2014 +0100 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/service/ClientState.java | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8165af5d/CHANGES.txt --
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/service/CassandraDaemon.java test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49efc13c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49efc13c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49efc13c Branch: refs/heads/trunk Commit: 49efc13cd530735ad802769e7f5322f3c79085ef Parents: 76ee9a1 4ed2234 Author: Yuki Morishita Authored: Mon Dec 30 14:03:54 2013 -0600 Committer: Yuki Morishita Committed: Mon Dec 30 14:03:54 2013 -0600 -- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 35 ++--- .../org/apache/cassandra/db/SystemKeyspace.java | 23 -- .../cassandra/service/CassandraDaemon.java | 16 ++--- .../cassandra/db/ColumnFamilyStoreTest.java | 74 ++-- .../db/compaction/CompactionsTest.java | 4 +- 6 files changed, 124 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/49efc13c/CHANGES.txt -- diff --cc CHANGES.txt index 0974925,958369a..7af391e --- 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.5 + * Delete unfinished compaction incrementally (CASSANDRA-6086) Merged from 1.2: * fsync compression metadata (CASSANDRA-6531) http://git-wip-us.apache.org/repos/asf/cassandra/blob/49efc13c/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/49efc13c/src/java/org/apache/cassandra/db/SystemKeyspace.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/49efc13c/src/java/org/apache/cassandra/service/CassandraDaemon.java -- diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java index 006,d36b0db..02731d8 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@@ -21,7 -21,11 +21,9 @@@ import java.io.File import java.io.IOException; import java.lang.management.ManagementFactory; import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URL; import java.util.Arrays; + import java.util.Map; + import java.util.UUID; import java.util.concurrent.TimeUnit; import javax.management.MBeanServer; import javax.management.ObjectName; @@@ -30,7 -34,7 +32,6 @@@ import javax.management.StandardMBean import com.addthis.metrics.reporter.config.ReporterConfig; import com.google.common.collect.Iterables; - import com.google.common.collect.SetMultimap; -import org.apache.log4j.PropertyConfigurator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@@ -199,6 -237,22 +200,12 @@@ public class CassandraDaemo // load keyspace descriptions. DatabaseDescriptor.loadSchemas(); -try -{ -LeveledManifest.maybeMigrateManifests(); -} -catch(IOException e) -{ -logger.error("Could not migrate old leveled manifest. Move away the .json file in the data directory", e); -System.exit(100); -} - +
[3/3] 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/7eaedbf9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7eaedbf9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7eaedbf9 Branch: refs/heads/trunk Commit: 7eaedbf9587089e9b856c47959b76ee8a1093914 Parents: 35c2f92 604e31b Author: Brandon Williams Authored: Mon Dec 30 08:18:39 2013 -0600 Committer: Brandon Williams Committed: Mon Dec 30 08:18:39 2013 -0600 -- .../cassandra/db/HintedHandOffManager.java | 24 ++- .../cassandra/db/HintedHandOffManagerMBean.java | 6 .../org/apache/cassandra/tools/NodeCmd.java | 8 - .../org/apache/cassandra/tools/NodeProbe.java | 21 + .../apache/cassandra/tools/NodeToolHelp.yaml| 3 ++ .../apache/cassandra/db/HintedHandOffTest.java | 32 6 files changed, 92 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7eaedbf9/src/java/org/apache/cassandra/db/HintedHandOffManager.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7eaedbf9/src/java/org/apache/cassandra/tools/NodeCmd.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7eaedbf9/src/java/org/apache/cassandra/tools/NodeProbe.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7eaedbf9/test/unit/org/apache/cassandra/db/HintedHandOffTest.java --
[3/3] 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/4642f5ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4642f5ca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4642f5ca Branch: refs/heads/trunk Commit: 4642f5ca1e720e9699c3935c596704ef31d675da Parents: 70f7574 0e0884f Author: Aleksey Yeschenko Authored: Sat Dec 28 20:59:28 2013 +0300 Committer: Aleksey Yeschenko Committed: Sat Dec 28 20:59:28 2013 +0300 -- .../apache/cassandra/db/ColumnFamilyStore.java | 23 ++-- 1 file changed, 12 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4642f5ca/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 6f0308e,cbd9d2e..0bed84b --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -335,8 -329,18 +326,18 @@@ public class ColumnFamilyStore implemen catch (Exception e) { // this shouldn't block anything. -logger.warn("Failed unregistering mbean: " + mbeanName, e); +logger.warn("Failed unregistering mbean: {}", mbeanName, e); } + + compactionStrategy.shutdown(); + + SystemKeyspace.removeTruncationRecord(metadata.cfId); + data.unreferenceSSTables(); + indexManager.invalidate(); + + for (RowCacheKey key : CacheService.instance.rowCache.getKeySet()) + if (key.cfId == metadata.cfId) + invalidateCachedRow(key); } /**
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk Conflicts: test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67f9eba7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67f9eba7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67f9eba7 Branch: refs/heads/trunk Commit: 67f9eba79eac01886765d616a6e7e02a6c912232 Parents: 30afda3 2111a20 Author: Yuki Morishita Authored: Thu Dec 26 15:58:48 2013 -0600 Committer: Yuki Morishita Committed: Thu Dec 26 15:58:48 2013 -0600 -- CHANGES.txt | 1 + .../cassandra/io/sstable/SSTableWriter.java | 11 +++-- .../cassandra/io/sstable/LegacySSTableTest.java | 48 +++- 3 files changed, 55 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67f9eba7/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67f9eba7/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67f9eba7/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java -- diff --cc test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java index bb3689c,e508a55..ab6506d --- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java @@@ -26,9 -26,14 +26,15 @@@ import java.util.* import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; - import org.apache.cassandra.db.DecoratedKey; + import org.apache.cassandra.db.*; import org.apache.cassandra.db.columniterator.SSTableNamesIterator; +import org.apache.cassandra.db.composites.CellNameType; + import org.apache.cassandra.dht.IPartitioner; + import org.apache.cassandra.dht.Range; + import org.apache.cassandra.dht.Token; + import org.apache.cassandra.service.StorageService; + import org.apache.cassandra.streaming.StreamPlan; + import org.apache.cassandra.streaming.StreamSession; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.ByteBufferUtil; import org.junit.BeforeClass; @@@ -87,6 -92,46 +93,46 @@@ public class LegacySSTableTest extends */ @Test + public void testStreaming() throws Throwable + { + StorageService.instance.initServer(); + + for (File version : LEGACY_SSTABLE_ROOT.listFiles()) + if (Descriptor.Version.validate(version.getName())) + testStreaming(version.getName()); + } + + private void testStreaming(String version) throws Exception + { + SSTableReader sstable = SSTableReader.open(getDescriptor(version)); + IPartitioner p = StorageService.getPartitioner(); + List> ranges = new ArrayList<>(); + ranges.add(new Range<>(p.getMinimumToken(), p.getToken(ByteBufferUtil.bytes("100"; + ranges.add(new Range<>(p.getToken(ByteBufferUtil.bytes("100")), p.getMinimumToken())); + ArrayList details = new ArrayList<>(); + details.add(new StreamSession.SSTableStreamingSections(sstable, + sstable.getPositionsForRanges(ranges), + sstable.estimatedKeysForRanges(ranges))); + new StreamPlan("LegacyStreamingTest").transferFiles(FBUtilities.getBroadcastAddress(), details) + .execute().get(); -sstable.close(); + + ColumnFamilyStore cfs = Keyspace.open(KSNAME).getColumnFamilyStore(CFNAME); + assert cfs.getSSTables().size() == 1; + sstable = cfs.getSSTables().iterator().next(); ++CellNameType type = sstable.metadata.comparator; + for (String keystring : TEST_DATA) + { + ByteBuffer key = ByteBufferUtil.bytes(keystring); -SSTableNamesIterator iter = new SSTableNamesIterator(sstable, Util.dk(key), FBUtilities.singleton(key)); ++SSTableNamesIterator iter = new SSTableNamesIterator(sstable, Util.dk(key), FBUtilities.singleton(Util.cellname(key), type)); + ColumnFamily cf = iter.getColumnFamily(); + + // check not deleted (CASSANDRA-6527) + assert cf.deletionInfo().equals(DeletionInfo.live()); -assert iter.next().name().equals(key); ++assert iter.next().name().toByteBuffer().equals(key); + } + } + + @Test public void testVersions() throws Throwable { f
[3/3] 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/d7536612 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7536612 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7536612 Branch: refs/heads/trunk Commit: d7536612f3d828e9132a8cdc32732ec8516ac991 Parents: b34ed0d b5c9b49 Author: Jonathan Ellis Authored: Sat Dec 21 00:36:35 2013 -0600 Committer: Jonathan Ellis Committed: Sat Dec 21 00:36:35 2013 -0600 -- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 9 +- .../org/apache/cassandra/db/Directories.java| 34 ++-- src/java/org/apache/cassandra/db/Keyspace.java | 6 ++-- 4 files changed, 43 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7536612/CHANGES.txt -- diff --cc CHANGES.txt index c9dcc18,b80c821..8c698cd --- 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 + * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418) * add StorageService.stopDaemon() (CASSANDRA-4268) * add IRE for invalid CF supplied to get_count (CASSANDRA-5701) * add client encryption support to sstableloader (CASSANDRA-6378) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7536612/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7536612/src/java/org/apache/cassandra/db/Directories.java -- diff --cc src/java/org/apache/cassandra/db/Directories.java index 81d15d1,2db4d9b..6f00d6d --- a/src/java/org/apache/cassandra/db/Directories.java +++ b/src/java/org/apache/cassandra/db/Directories.java @@@ -483,38 -429,37 +483,68 @@@ public class Directorie } throw new RuntimeException("Snapshot " + snapshotName + " doesn't exist"); } + +public long trueSnapshotsSize() +{ +long result = 0L; +for (File dir : sstableDirectories) +result += getTrueAllocatedSizeIn(new File(dir, join(SNAPSHOT_SUBDIR))); +return result; +} + +private String getSSTablePrefix() +{ +return keyspacename + Component.separator + cfname + Component.separator; +} + +public long getTrueAllocatedSizeIn(File input) +{ +if (!input.isDirectory()) +return 0; + +TrueFilesSizeVisitor visitor = new TrueFilesSizeVisitor(); +try +{ +Files.walkFileTree(input.toPath(), visitor); +} +catch (IOException e) +{ +logger.error("Could not calculate the size of {}. {}", input, e); +} + +return visitor.getAllocatedSize(); +} + // Recursively finds all the sub directories in the KS directory. + public static List getKSChildDirectories(String ksName) + { + List result = new ArrayList(); + for (DataDirectory dataDirectory : dataFileLocations) + { + File ksDir = new File(dataDirectory.location, ksName); + File[] cfDirs = ksDir.listFiles(); + if (cfDirs == null) + continue; + for (File cfDir : cfDirs) + { + if (cfDir.isDirectory()) + result.add(cfDir); +
[3/3] 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/8614bea2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8614bea2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8614bea2 Branch: refs/heads/trunk Commit: 8614bea2994501d4527307072e2ff3c46aa68d97 Parents: 388cbfa 7bf1464 Author: Jonathan Ellis Authored: Fri Dec 20 14:39:48 2013 -0600 Committer: Jonathan Ellis Committed: Fri Dec 20 14:39:48 2013 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/thrift/CassandraServer.java | 5 + 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8614bea2/CHANGES.txt -- diff --cc CHANGES.txt index ac6c53a,67036c5..384e32d --- 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 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) * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8614bea2/src/java/org/apache/cassandra/thrift/CassandraServer.java --
[3/3] 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/268f3cb1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/268f3cb1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/268f3cb1 Branch: refs/heads/trunk Commit: 268f3cb190311095fbadfb869959a2256d7da33d Parents: d276d0a d9dac01 Author: Aleksey Yeschenko Authored: Thu Dec 19 16:58:21 2013 +0300 Committer: Aleksey Yeschenko Committed: Thu Dec 19 16:58:21 2013 +0300 -- CHANGES.txt | 3 +- .../cassandra/config/DatabaseDescriptor.java| 1 + .../apache/cassandra/service/StorageProxy.java | 42 ++-- 3 files changed, 42 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/268f3cb1/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/268f3cb1/src/java/org/apache/cassandra/config/DatabaseDescriptor.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/268f3cb1/src/java/org/apache/cassandra/service/StorageProxy.java --
[3/3] 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/435f1b72 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/435f1b72 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/435f1b72 Branch: refs/heads/trunk Commit: 435f1b72c6248625933efade3d9f8b6a301f31d9 Parents: 2e4d709 4a6f8a6 Author: Jonathan Ellis Authored: Wed Dec 18 18:01:34 2013 -0600 Committer: Jonathan Ellis Committed: Wed Dec 18 18:01:34 2013 -0600 -- .../cassandra/thrift/SSLTransportFactory.java | 86 1 file changed, 86 insertions(+) --
[3/3] 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/2e4d709d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e4d709d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e4d709d Branch: refs/heads/trunk Commit: 2e4d709d191a42a61d460796d71408516054b77c Parents: 1152e4b 1b2a190 Author: Jonathan Ellis Authored: Wed Dec 18 16:17:20 2013 -0600 Committer: Jonathan Ellis Committed: Wed Dec 18 16:17:20 2013 -0600 -- CHANGES.txt | 1 + .../org/apache/cassandra/tools/BulkLoader.java | 130 ++- 2 files changed, 124 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e4d709d/CHANGES.txt -- diff --cc CHANGES.txt index 7074d2a,d6223be..0184c40 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,5 +1,27 @@@ +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 + * add client encryption support to sstableloader (CASSANDRA-6378) * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468) * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496) * Fix assertion failure in filterColdSSTables (CASSANDRA-6483) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e4d709d/src/java/org/apache/cassandra/tools/BulkLoader.java --
[3/3] 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/d365faab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d365faab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d365faab Branch: refs/heads/trunk Commit: d365faab07f14d436bf827b3cf6dae5d25e4c9c1 Parents: 1a5ebd6 1727ea7 Author: Sylvain Lebresne Authored: Wed Dec 18 13:51:48 2013 +0100 Committer: Sylvain Lebresne Committed: Wed Dec 18 13:51:48 2013 +0100 -- CHANGES.txt | 1 + .../cassandra/service/AbstractWriteResponseHandler.java | 11 ++- src/java/org/apache/cassandra/service/ReadCallback.java | 4 src/java/org/apache/cassandra/service/StorageProxy.java | 4 ++-- 4 files changed, 17 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d365faab/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d365faab/src/java/org/apache/cassandra/service/StorageProxy.java -- diff --cc src/java/org/apache/cassandra/service/StorageProxy.java index 6f362db,2da9d38..e4741f6 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@@ -1664,33 -1577,17 +1664,33 @@@ public class StorageProxy implements St Tracing.trace("Timed out while read-repairing after receiving all {} data and digest responses", blockFor); else logger.debug("Range slice timeout while read-repairing after receiving all {} data and digest responses", blockFor); - throw new ReadTimeoutException(consistency_level, blockFor, blockFor, true); + throw new ReadTimeoutException(consistency_level, blockFor-1, blockFor, true); } -catch (DigestMismatchException e) + +if (haveSufficientRows) +return trim(command, rows); + +// we didn't get enough rows in our concurrent fetch; recalculate our concurrency factor +// based on the results we've seen so far (as long as we still have ranges left to query) +if (i < ranges.size()) { -throw new AssertionError(e); // no digests in range slices yet +float fetchedRows = command.countCQL3Rows() ? cql3RowCount : rows.size(); +float remainingRows = command.limit() - fetchedRows; +float actualRowsPerRange; +if (fetchedRows == 0.0) +{ +// we haven't actually gotten any results, so query all remaining ranges at once +actualRowsPerRange = 0.0f; +concurrencyFactor = ranges.size() - i; +} +else +{ +actualRowsPerRange = i / fetchedRows; +concurrencyFactor = Math.max(1, Math.min(ranges.size() - i, Math.round(remainingRows / actualRowsPerRange))); +} +logger.debug("Didn't get enough response rows; actual rows per range: {}; remaining rows: {}, new concurrent requests: {}", + actualRowsPerRange, (int) remainingRows, concurrencyFactor); } - -// if we're done, great, otherwise, move to the next range -int count = nodeCmd.countCQL3Rows() ? cql3RowCount : rows.size(); -if (count >= nodeCmd.limit()) -break; } } finally
[3/3] 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/f943433a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f943433a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f943433a Branch: refs/heads/trunk Commit: f943433ae8f62f2ecb2c21e7be924ded09d669f2 Parents: c821d8b 22d8744 Author: Aleksey Yeschenko Authored: Tue Dec 17 18:26:46 2013 +0300 Committer: Aleksey Yeschenko Committed: Tue Dec 17 18:26:46 2013 +0300 -- .../apache/cassandra/locator/TokenMetadata.java | 18 -- 1 file changed, 4 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f943433a/src/java/org/apache/cassandra/locator/TokenMetadata.java --
[3/3] 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/2ee6b8fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ee6b8fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ee6b8fd Branch: refs/heads/trunk Commit: 2ee6b8fd91db261dedae6e9a3539342b084056bd Parents: 5d167cf bdff106 Author: Aleksey Yeschenko Authored: Sun Dec 15 13:37:13 2013 +0300 Committer: Aleksey Yeschenko Committed: Sun Dec 15 13:37:13 2013 +0300 -- CHANGES.txt | 1 + .../locator/AbstractReplicationStrategy.java| 35 -- .../apache/cassandra/locator/TokenMetadata.java | 35 +- .../apache/cassandra/service/StorageProxy.java | 39 +--- 4 files changed, 53 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ee6b8fd/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ee6b8fd/src/java/org/apache/cassandra/locator/TokenMetadata.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ee6b8fd/src/java/org/apache/cassandra/service/StorageProxy.java --
[3/3] 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/9533b587 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9533b587 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9533b587 Branch: refs/heads/trunk Commit: 9533b587f0e04b496615ffb884cc2d7530799314 Parents: 14ebfbf bb09d3c Author: Jonathan Ellis Authored: Sat Dec 14 09:57:06 2013 -0600 Committer: Jonathan Ellis Committed: Sat Dec 14 09:57:06 2013 -0600 -- test/Test.iml | 214 - 1 file changed, 214 deletions(-) --
[3/3] 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/611f328f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/611f328f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/611f328f Branch: refs/heads/trunk Commit: 611f328f3f7ad37c2e74302564e7b198d17535ab Parents: b25ae0f fb5808d Author: Jonathan Ellis Authored: Fri Dec 13 05:35:17 2013 +0600 Committer: Jonathan Ellis Committed: Fri Dec 13 05:35:17 2013 +0600 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/611f328f/CHANGES.txt --
[3/3] 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/b25ae0f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b25ae0f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b25ae0f9 Branch: refs/heads/trunk Commit: b25ae0f921a7366ce44751867f600c8bce4d287b Parents: a9b93c2 c4d3a31 Author: Jonathan Ellis Authored: Fri Dec 13 02:30:58 2013 +0600 Committer: Jonathan Ellis Committed: Fri Dec 13 02:30:58 2013 +0600 -- src/java/org/apache/cassandra/net/CallbackInfo.java | 9 + src/java/org/apache/cassandra/net/MessagingService.java | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25ae0f9/src/java/org/apache/cassandra/net/MessagingService.java --
[3/3] 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/d16d5c4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d16d5c4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d16d5c4f Branch: refs/heads/trunk Commit: d16d5c4f2992c6b36f5afe02a856d8eabc87eee9 Parents: 448e4d4 e6eb550 Author: Aleksey Yeschenko Authored: Thu Dec 12 21:17:24 2013 +0300 Committer: Aleksey Yeschenko Committed: Thu Dec 12 21:17:24 2013 +0300 -- --
[3/3] 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/706058c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/706058c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/706058c7 Branch: refs/heads/trunk Commit: 706058c789afdaf6f03dcfb3a00e5572e5fe405b Parents: 69c1801 c99734c Author: Jonathan Ellis Authored: Tue Dec 10 10:35:56 2013 +0600 Committer: Jonathan Ellis Committed: Tue Dec 10 10:35:56 2013 +0600 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/706058c7/CHANGES.txt -- diff --cc CHANGES.txt index 2c280bf,e0338db..61348d0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,5 +1,24 @@@ +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) + + 2.0.4 + * Fix cleanup ClassCastException (CASSANDRA-6462) * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410) * Allow specifying datacenters to participate in a repair (CASSANDRA-6218) * Fix divide-by-zero in PCI (CASSANDRA-6403)
[3/3] 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/69c18014 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69c18014 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69c18014 Branch: refs/heads/trunk Commit: 69c180146285ff1c820800ff6d2f7e2ae2c6a7f1 Parents: 8010d77 5d24c55 Author: Jonathan Ellis Authored: Tue Dec 10 10:34:23 2013 +0600 Committer: Jonathan Ellis Committed: Tue Dec 10 10:34:23 2013 +0600 -- .../org/apache/cassandra/db/compaction/CompactionManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/69c18014/src/java/org/apache/cassandra/db/compaction/CompactionManager.java --
[3/3] 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/9c0b180a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c0b180a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c0b180a Branch: refs/heads/trunk Commit: 9c0b180a42968118074ea22725174bc9f104f88f Parents: 5c379c5 2ccb3da Author: Aleksey Yeschenko Authored: Sat Dec 7 13:56:43 2013 +0300 Committer: Aleksey Yeschenko Committed: Sat Dec 7 13:56:43 2013 +0300 -- test/unit/org/apache/cassandra/db/DirectoriesTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c0b180a/test/unit/org/apache/cassandra/db/DirectoriesTest.java --
[3/3] 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/5c379c54 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c379c54 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c379c54 Branch: refs/heads/trunk Commit: 5c379c54b9c1806152e83a5cce76fc9ad14e1228 Parents: e6170fe 3c15ff2 Author: Aleksey Yeschenko Authored: Sat Dec 7 13:32:16 2013 +0300 Committer: Aleksey Yeschenko Committed: Sat Dec 7 13:32:16 2013 +0300 -- CHANGES.txt | 1 + .../org/apache/cassandra/db/Directories.java| 2 +- .../apache/cassandra/db/DirectoriesTest.java| 22 3 files changed, 24 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c379c54/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c379c54/src/java/org/apache/cassandra/db/Directories.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c379c54/test/unit/org/apache/cassandra/db/DirectoriesTest.java --
[3/3] 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/e1f2a08f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1f2a08f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1f2a08f Branch: refs/heads/trunk Commit: e1f2a08fc6c795b64b28c0672d735b008916acb9 Parents: 5ad8a3d f7efaff Author: Brandon Williams Authored: Thu Dec 5 16:18:14 2013 -0600 Committer: Brandon Williams Committed: Thu Dec 5 16:18:14 2013 -0600 -- --
[3/3] 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/e4d44724 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4d44724 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4d44724 Branch: refs/heads/trunk Commit: e4d447240a4b68a56596445ac5e4f4fbbe0c50af Parents: b34d43f 32dbe58 Author: Marcus Eriksson Authored: Wed Dec 4 20:17:45 2013 +0100 Committer: Marcus Eriksson Committed: Wed Dec 4 20:17:45 2013 +0100 -- test/unit/org/apache/cassandra/service/MoveTest.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4d44724/test/unit/org/apache/cassandra/service/MoveTest.java --
[3/3] 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/57516e08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57516e08 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57516e08 Branch: refs/heads/trunk Commit: 57516e082b71a761513767107e76e5eb19c49253 Parents: ab9fe1a 6724964 Author: Jonathan Ellis Authored: Mon Dec 2 21:39:20 2013 -0600 Committer: Jonathan Ellis Committed: Mon Dec 2 21:39:20 2013 -0600 -- CHANGES.txt | 1 + conf/cassandra-env.sh | 3 +++ src/java/org/apache/cassandra/gms/VersionedValue.java | 6 +- 3 files changed, 9 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/57516e08/CHANGES.txt -- diff --cc CHANGES.txt index bb3a98a,11f4c09..3bc50ac --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,5 +1,23 @@@ +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) + + 2.0.4 + * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410) * Allow specifying datacenters to participate in a repair (CASSANDRA-6218) * Fix divide-by-zero in PCI (CASSANDRA-6403) * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
[3/3] 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/cf9baefc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf9baefc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf9baefc Branch: refs/heads/trunk Commit: cf9baefc8372e47becf22ecb5bec5901fb10158e Parents: 3d85491 e4fc877 Author: Sylvain Lebresne Authored: Mon Dec 2 09:25:14 2013 +0100 Committer: Sylvain Lebresne Committed: Mon Dec 2 09:25:14 2013 +0100 -- CHANGES.txt | 1 + .../transport/RequestThreadPoolExecutor.java| 31 ++-- 2 files changed, 29 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf9baefc/CHANGES.txt --
[3/3] 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/122bb6b2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/122bb6b2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/122bb6b2 Branch: refs/heads/trunk Commit: 122bb6b205c3ad976c417c92780c16a618686ca3 Parents: 99b0076 43e61e8 Author: Sylvain Lebresne Authored: Thu Nov 28 09:13:53 2013 +0100 Committer: Sylvain Lebresne Committed: Thu Nov 28 09:13:53 2013 +0100 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/cql3/QueryProcessor.java | 6 +- 2 files changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/122bb6b2/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/122bb6b2/src/java/org/apache/cassandra/cql3/QueryProcessor.java --
[3/3] 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/99b0076c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99b0076c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99b0076c Branch: refs/heads/trunk Commit: 99b0076c7421e63f7dc6bc61dd7ba42eb9225101 Parents: ff44eeb 28658dd Author: Dave Brosius Authored: Wed Nov 27 23:58:49 2013 -0500 Committer: Dave Brosius Committed: Wed Nov 27 23:58:49 2013 -0500 -- src/java/org/apache/cassandra/dht/BootStrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[3/3] 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/ff44eeb6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff44eeb6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff44eeb6 Branch: refs/heads/trunk Commit: ff44eeb6c74b3b3f3731a30aa207323ade906887 Parents: 8c78ced 8ec971b Author: Aleksey Yeschenko Authored: Thu Nov 28 05:17:01 2013 +0300 Committer: Aleksey Yeschenko Committed: Thu Nov 28 05:17:01 2013 +0300 -- src/java/org/apache/cassandra/tools/SSTableImport.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff44eeb6/src/java/org/apache/cassandra/tools/SSTableImport.java --
[3/3] 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/f15d6d59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f15d6d59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f15d6d59 Branch: refs/heads/trunk Commit: f15d6d591a569eb399bcd2b472b65ed1f8e15b90 Parents: a13c6dc f15681b Author: Jonathan Ellis Authored: Tue Nov 26 14:39:47 2013 -0600 Committer: Jonathan Ellis Committed: Tue Nov 26 14:39:47 2013 -0600 -- src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f15d6d59/src/java/org/apache/cassandra/locator/TokenMetadata.java --
[3/3] 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/4a1b4322 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a1b4322 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a1b4322 Branch: refs/heads/trunk Commit: 4a1b4322d8bfc4f7a8d2668a4326bac86c49a01d Parents: f69e043 6c68b30 Author: Aleksey Yeschenko Authored: Tue Nov 26 02:30:18 2013 +0300 Committer: Aleksey Yeschenko Committed: Tue Nov 26 02:30:18 2013 +0300 -- doc/cql3/CQL.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[3/3] 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/f69e043c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f69e043c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f69e043c Branch: refs/heads/trunk Commit: f69e043ce4a4c8ecba6682fcd7ddf771a773afea Parents: dc95675 5eaa216 Author: Aleksey Yeschenko Authored: Sun Nov 24 21:55:26 2013 +0300 Committer: Aleksey Yeschenko Committed: Sun Nov 24 21:55:26 2013 +0300 -- CHANGES.txt | 2 ++ pylib/cqlshlib/formatting.py | 2 ++ 2 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f69e043c/CHANGES.txt -- diff --cc CHANGES.txt index eb0bc91,34dc7a5..ef3aa17 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,9 +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) + * 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) + Merged from 1.2: + * cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172) 2.0.3
[3/3] 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/8732fe93 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8732fe93 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8732fe93 Branch: refs/heads/trunk Commit: 8732fe938659232b3f0c63933b125131fa50fd2e Parents: f3dc188 e44d5d4 Author: Jonathan Ellis Authored: Sat Nov 23 19:31:47 2013 -0600 Committer: Jonathan Ellis Committed: Sat Nov 23 19:31:47 2013 -0600 -- --
[3/3] 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/c550cc82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c550cc82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c550cc82 Branch: refs/heads/trunk Commit: c550cc829d66aade8e57af2f3f434effb0f2d487 Parents: 3016e63 1ca459d Author: Jonathan Ellis Authored: Thu Nov 21 15:14:23 2013 -0600 Committer: Jonathan Ellis Committed: Thu Nov 21 15:14:23 2013 -0600 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/db/Memtable.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c550cc82/CHANGES.txt -- diff --cc CHANGES.txt index e220d78,24d14ee..6a3de3c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,6 +1,20 @@@ +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) + + 2.0.4 * remove RF from nodetool ring output (CASSANDRA-6289) + * fix attempting to flush empty rows (CASSANDRA-6374) 2.0.3 http://git-wip-us.apache.org/repos/asf/cassandra/blob/c550cc82/src/java/org/apache/cassandra/db/Memtable.java --
[3/3] 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/c04d74f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c04d74f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c04d74f1 Branch: refs/heads/trunk Commit: c04d74f1009f8cd93f563c2fde099b35f58dd941 Parents: 256da63 d869164 Author: Jonathan Ellis Authored: Wed Nov 20 21:01:17 2013 -0600 Committer: Jonathan Ellis Committed: Wed Nov 20 21:01:17 2013 -0600 -- .../apache/cassandra/service/PendingRangeCalculatorService.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[3/3] 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/ff6f04e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff6f04e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff6f04e3 Branch: refs/heads/trunk Commit: ff6f04e315c4838d62c66ff7b743bcf38114612e Parents: ea72d69 fcb2c65 Author: Jonathan Ellis Authored: Wed Nov 20 10:52:08 2013 -0600 Committer: Jonathan Ellis Committed: Wed Nov 20 10:52:08 2013 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/CollationController.java | 9 + 2 files changed, 6 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff6f04e3/CHANGES.txt -- diff --cc CHANGES.txt index 2e59f4e,43538b7..42a9334 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,5 +1,19 @@@ +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) + + 2.0.3 + * Fix FD leak on slice read path (CASSANDRA-6275) * Cancel read meter task when closing SSTR (CASSANDRA-6358) * free off-heap IndexSummary during bulk (CASSANDRA-6359) * Recover from IOException in accept() thread (CASSANDRA-6349) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff6f04e3/src/java/org/apache/cassandra/db/CollationController.java --
[3/3] 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/ea72d69c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea72d69c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea72d69c Branch: refs/heads/trunk Commit: ea72d69c8b08983c4e4e62fa3eff10642cf6d010 Parents: 1141b82 1bad5ed Author: Jonathan Ellis Authored: Wed Nov 20 07:26:30 2013 -0600 Committer: Jonathan Ellis Committed: Wed Nov 20 07:26:30 2013 -0600 -- src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea72d69c/src/java/org/apache/cassandra/io/sstable/SSTableReader.java --
[3/3] 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/3958a009 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3958a009 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3958a009 Branch: refs/heads/trunk Commit: 3958a009912cd4360607dc13a96cad474614dd87 Parents: 88fbdb1 47724e6 Author: Yuki Morishita Authored: Tue Nov 19 11:00:50 2013 -0600 Committer: Yuki Morishita Committed: Tue Nov 19 11:00:50 2013 -0600 -- .../apache/cassandra/service/StorageServiceServerTest.java| 7 --- 1 file changed, 7 deletions(-) --
[3/3] 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/88fbdb11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88fbdb11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88fbdb11 Branch: refs/heads/trunk Commit: 88fbdb11e7b1c0df46f79d738468221378068d48 Parents: 52cc7ef f651567 Author: Sylvain Lebresne Authored: Tue Nov 19 08:32:29 2013 +0100 Committer: Sylvain Lebresne Committed: Tue Nov 19 08:32:29 2013 +0100 -- --
[3/3] 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/52cc7efb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52cc7efb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52cc7efb Branch: refs/heads/trunk Commit: 52cc7efb2bcd47285148da85c089d796cb20734a Parents: 542d9c8 ade99b9 Author: Dave Brosius Authored: Mon Nov 18 21:34:33 2013 -0500 Committer: Dave Brosius Committed: Mon Nov 18 21:34:33 2013 -0500 -- src/java/org/apache/cassandra/dht/Murmur3Partitioner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[3/3] 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/414ba406 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/414ba406 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/414ba406 Branch: refs/heads/trunk Commit: 414ba406de1e002e4f8e13d4c8137764f17c6675 Parents: 48cfe0b 08167d6 Author: Jonathan Ellis Authored: Sat Nov 16 10:34:28 2013 -0600 Committer: Jonathan Ellis Committed: Sat Nov 16 10:34:28 2013 -0600 -- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/SSTableReader.java | 15 --- 2 files changed, 13 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/414ba406/CHANGES.txt -- diff --cc CHANGES.txt index fbe7292,cd6895f..442c7df --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +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) + * 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) + + 2.0.3 + * Cancel read meter task when closing SSTR (CASSANDRA-6358) * free off-heap IndexSummary during bulk (CASSANDRA-6359) * Recover from IOException in accept() thread (CASSANDRA-6349) * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338) http://git-wip-us.apache.org/repos/asf/cassandra/blob/414ba406/src/java/org/apache/cassandra/io/sstable/SSTableReader.java --
[3/3] 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/48cfe0b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48cfe0b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48cfe0b1 Branch: refs/heads/trunk Commit: 48cfe0b1050aa3fbf5bf377c00a31602f095dc26 Parents: d362ba5 67accea Author: Jonathan Ellis Authored: Sat Nov 16 10:31:26 2013 -0600 Committer: Jonathan Ellis Committed: Sat Nov 16 10:31:26 2013 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/io/sstable/SSTableLoader.java | 2 +- src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/48cfe0b1/CHANGES.txt -- diff --cc CHANGES.txt index 458d1ba,a283387..fbe7292 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +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) + * 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) + + 2.0.3 + * free off-heap IndexSummary during bulk (CASSANDRA-6359) * Recover from IOException in accept() thread (CASSANDRA-6349) * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338) * Fix trying to hint timed out counter writes (CASSANDRA-6322) http://git-wip-us.apache.org/repos/asf/cassandra/blob/48cfe0b1/src/java/org/apache/cassandra/io/sstable/SSTableReader.java --
[3/3] 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/d362ba59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d362ba59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d362ba59 Branch: refs/heads/trunk Commit: d362ba596698c3b873750253cb2e0d4776c9865e Parents: f388c9d 917bc05 Author: Jonathan Ellis Authored: Sat Nov 16 10:26:23 2013 -0600 Committer: Jonathan Ellis Committed: Sat Nov 16 10:26:23 2013 -0600 -- CHANGES.txt | 1 + .../org/apache/cassandra/net/MessagingService.java| 14 +- 2 files changed, 10 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d362ba59/CHANGES.txt -- diff --cc CHANGES.txt index 43c9285,b21e7a7..458d1ba --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +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) + * 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) + + 2.0.3 + * Recover from IOException in accept() thread (CASSANDRA-6349) * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338) * Fix trying to hint timed out counter writes (CASSANDRA-6322) * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d362ba59/src/java/org/apache/cassandra/net/MessagingService.java --
[3/3] 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/fab27bd5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fab27bd5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fab27bd5 Branch: refs/heads/trunk Commit: fab27bd59792b1e00cf7b6bc6035f2a86891bd9c Parents: c41eedf 09b2470 Author: Sylvain Lebresne Authored: Fri Nov 15 15:42:09 2013 +0100 Committer: Sylvain Lebresne Committed: Fri Nov 15 15:42:09 2013 +0100 -- CHANGES.txt| 2 ++ src/java/org/apache/cassandra/db/ConsistencyLevel.java | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fab27bd5/CHANGES.txt --
[3/3] 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/0619da2a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0619da2a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0619da2a Branch: refs/heads/trunk Commit: 0619da2aeab0be2da0b4db47872e0dd7c33c2457 Parents: fa86ce8 b457156 Author: Jonathan Ellis Authored: Wed Nov 13 09:38:02 2013 -0600 Committer: Jonathan Ellis Committed: Wed Nov 13 09:38:02 2013 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 29 ++-- .../cassandra/net/MessageDeliveryTask.java | 10 +++ 3 files changed, 38 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0619da2a/CHANGES.txt -- diff --cc CHANGES.txt index 727c97d,e4f1862..6213580 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +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) + * 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) + + 2.0.3 + * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338) * Fix trying to hint timed out counter writes (CASSANDRA-6322) * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809) * Avoid flushing compaction_history after each operation (CASSANDRA-6287) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0619da2a/src/java/org/apache/cassandra/gms/Gossiper.java --
[3/3] 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/e9c595b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9c595b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9c595b5 Branch: refs/heads/trunk Commit: e9c595b5ef9af942eb76414f5a62df2907d3315f Parents: d37696c 3af19c4 Author: Jonathan Ellis Authored: Mon Nov 11 11:41:25 2013 -0600 Committer: Jonathan Ellis Committed: Mon Nov 11 11:41:25 2013 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/WriteCallbackInfo.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c595b5/CHANGES.txt -- diff --cc CHANGES.txt index 6e1a91b,fa0b7cff..f78f1e8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +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) + * 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) + + 2.0.3 + * Fix trying to hint timed out counter writes (CASSANDRA-6322) * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809) * Avoid flushing compaction_history after each operation (CASSANDRA-6287) * Fix repair assertion error when tombstones expire (CASSANDRA-6277)
[3/3] 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/9c739eb7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c739eb7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c739eb7 Branch: refs/heads/trunk Commit: 9c739eb753f143abc5bc5cbd05e2f76041e1069c Parents: edeebed 5522a18 Author: Aleksey Yeschenko Authored: Sat Nov 9 03:07:25 2013 +0300 Committer: Aleksey Yeschenko Committed: Sat Nov 9 03:07:25 2013 +0300 -- CHANGES.txt | 1 + pylib/cqlshlib/tracing.py | 9 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c739eb7/CHANGES.txt --
[3/3] 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/99ad43a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99ad43a8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99ad43a8 Branch: refs/heads/trunk Commit: 99ad43a8dadd382ff79c2f0fd8b05079627cdfe7 Parents: 26307f9 3c229c0 Author: Jonathan Ellis Authored: Thu Nov 7 20:38:59 2013 -0600 Committer: Jonathan Ellis Committed: Thu Nov 7 20:38:59 2013 -0600 -- src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/99ad43a8/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java --
[3/3] 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/26307f96 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26307f96 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26307f96 Branch: refs/heads/trunk Commit: 26307f96ccb89d8e69d63b6be1db77f92ae16c39 Parents: f01166a 00a6839 Author: Aleksey Yeschenko Authored: Fri Nov 8 00:55:16 2013 +0300 Committer: Aleksey Yeschenko Committed: Fri Nov 8 00:55:16 2013 +0300 -- src/java/org/apache/cassandra/db/context/CounterContext.java | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/26307f96/src/java/org/apache/cassandra/db/context/CounterContext.java --
[3/3] 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/c2bd0d8d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2bd0d8d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2bd0d8d Branch: refs/heads/trunk Commit: c2bd0d8d171d52dbc8f5520e9c5a2e6a24fbd1de Parents: c65c15c 0e9906e Author: Jason Brown Authored: Wed Nov 6 22:09:24 2013 -0800 Committer: Jason Brown Committed: Wed Nov 6 22:09:24 2013 -0800 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/db/ConsistencyLevel.java | 6 -- 2 files changed, 1 insertion(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2bd0d8d/CHANGES.txt --
[3/3] 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/82c0094a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82c0094a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82c0094a Branch: refs/heads/trunk Commit: 82c0094a89c30bf9b66e2d8c43003da98ea4c432 Parents: 2d6ab6f dc71d22 Author: Brandon Williams Authored: Tue Nov 5 15:33:56 2013 -0600 Committer: Brandon Williams Committed: Tue Nov 5 15:33:56 2013 -0600 -- .../cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82c0094a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java --
[3/3] 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/1fe9a112 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fe9a112 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fe9a112 Branch: refs/heads/trunk Commit: 1fe9a112c6d6eb50adc5351cd36db4c34369cd53 Parents: d5e32da 579eb22 Author: Jonathan Ellis Authored: Fri Nov 1 19:41:02 2013 -0500 Committer: Jonathan Ellis Committed: Fri Nov 1 19:41:02 2013 -0500 -- src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fe9a112/src/java/org/apache/cassandra/db/compaction/CompactionTask.java --