[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66f0d6b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66f0d6b7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66f0d6b7 Branch: refs/heads/trunk Commit: 66f0d6b7351bc2cc21a1df75c0a035a18c8720ab Parents: 0ab0db2 2993965 Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Aug 1 09:35:07 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Aug 1 09:35:07 2013 -0500 -- src/java/org/apache/cassandra/gms/Gossiper.java | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f0d6b7/src/java/org/apache/cassandra/gms/Gossiper.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2451140b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2451140b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2451140b Branch: refs/heads/trunk Commit: 2451140b868faed033c291ba0589a05564aae04b Parents: e01c238 7a39421 Author: Jonathan Ellis jbel...@apache.org Authored: Wed Jul 31 18:16:31 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Jul 31 18:16:31 2013 -0500 -- CHANGES.txt | 2 + .../hadoop/cql3/CqlPagingRecordReader.java | 41 ++-- .../cassandra/hadoop/cql3/CqlRecordWriter.java | 33 3 files changed, 72 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2451140b/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2451140b/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2451140b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14943766 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14943766 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14943766 Branch: refs/heads/trunk Commit: 14943766ef48d8e2e7a1c6978512904c5a1d5aaa Parents: d410a71 a7202ef Author: Jonathan Ellis jbel...@apache.org Authored: Wed Jul 31 18:23:08 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Jul 31 18:23:08 2013 -0500 -- --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05d27ea2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05d27ea2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05d27ea2 Branch: refs/heads/trunk Commit: 05d27ea27e2f8f2e76b5ff104d30871b8264261d Parents: ec4b1fe 5c28958 Author: Jonathan Ellis jbel...@apache.org Authored: Wed Jul 31 19:22:41 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Jul 31 19:22:41 2013 -0500 -- --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/318b00e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/318b00e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/318b00e2 Branch: refs/heads/trunk Commit: 318b00e25100b9261fa09e80b7a377963ef2608c Parents: 6b3b62f af1a9fe Author: Jonathan Ellis jbel...@apache.org Authored: Tue Jul 30 09:24:15 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Jul 30 09:24:15 2013 -0500 -- src/java/org/apache/cassandra/hadoop/ConfigHelper.java | 10 ++ 1 file changed, 10 insertions(+) --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/369415c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/369415c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/369415c2 Branch: refs/heads/trunk Commit: 369415c262e95cb0ebbb9ea6325f3ce76747fb08 Parents: bdc8e26 e873213 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Jul 30 14:33:42 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Jul 30 14:33:42 2013 -0500 -- .../org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/369415c2/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef29c82e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef29c82e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef29c82e Branch: refs/heads/trunk Commit: ef29c82e8026b0eb70121559ac138a5bc86fd53b Parents: 1d6bed3 97bc9c7 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Jul 30 15:16:23 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Jul 30 15:16:23 2013 -0500 -- .../cassandra/io/util/ICompressedFile.java | 25 1 file changed, 25 insertions(+) --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f921965a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f921965a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f921965a Branch: refs/heads/trunk Commit: f921965a0b81f0c1dfdb08c5048eff3644b5dde9 Parents: 7915225 dfa59e3 Author: Yuki Morishita yu...@apache.org Authored: Fri Jul 26 10:51:35 2013 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Fri Jul 26 10:51:35 2013 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f921965a/CHANGES.txt -- diff --cc CHANGES.txt index 94b5236,077a986..d18ff6e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,113 -1,6 +1,114 @@@ +2.0.0-rc1 + * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690) + * fix schema-related trigger issues (CASSANDRA-5774) + * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138) + * Fix assertion error during repair (CASSANDRA-5801) + * Fix range tombstone bug (CASSANDRA-5805) + * DC-local CAS (CASSANDRA-5797) + + +2.0.0-beta2 + * Replace countPendingHints with Hints Created metric (CASSANDRA-5746) + * Allow nodetool with no args, and with help to run without a server (CASSANDRA-5734) + * Cleanup AbstractType/TypeSerializer classes (CASSANDRA-5744) + * Remove unimplemented cli option schema-mwt (CASSANDRA-5754) + * Support range tombstones in thrift (CASSANDRA-5435) + * Normalize table-manipulating CQL3 statements' class names (CASSANDRA-5759) + * cqlsh: add missing table options to DESCRIBE output (CASSANDRA-5749) + * Fix assertion error during repair (CASSANDRA-5757) + * Fix bulkloader (CASSANDRA-5542) + * Add LZ4 compression to the native protocol (CASSANDRA-5765) + * Fix bugs in the native protocol v2 (CASSANDRA-5770) + * CAS on 'primary key only' table (CASSANDRA-5715) + * Support streaming SSTables of old versions (CASSANDRA-5772) + * Always respect protocol version in native protocol (CASSANDRA-5778) + * Fix ConcurrentModificationException during streaming (CASSANDRA-5782) + * Update deletion timestamp in Commit#updatesWithPaxosTime (CASSANDRA-5787) + * Thrift cas() method crashes if input columns are not sorted (CASSANDRA-5786) + * Order columns names correctly when querying for CAS (CASSANDRA-5788) + * Fix streaming retry (CASSANDRA-5775) + + +2.0.0-beta1 + * Removed on-heap row cache (CASSANDRA-5348) + * use nanotime consistently for node-local timeouts (CASSANDRA-5581) + * Avoid unnecessary second pass on name-based queries (CASSANDRA-5577) + * Experimental triggers (CASSANDRA-1311) + * JEMalloc support for off-heap allocation (CASSANDRA-3997) + * Single-pass compaction (CASSANDRA-4180) + * Removed token range bisection (CASSANDRA-5518) + * Removed compatibility with pre-1.2.5 sstables and network messages + (CASSANDRA-5511) + * removed PBSPredictor (CASSANDRA-5455) + * CAS support (CASSANDRA-5062, 5441, 5442, 5443, 5619, 5667) + * Leveled compaction performs size-tiered compactions in L0 + (CASSANDRA-5371, 5439) + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339) + * Log when a node is down longer than the hint window (CASSANDRA-4554) + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917) + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961, CASSANDRA-5650) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Conflicts: bin/cqlsh Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/308afb20 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/308afb20 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/308afb20 Branch: refs/heads/trunk Commit: 308afb20bed382a2a1d0424bef23a683cf1ad99e Parents: 2548e5a 187f73f Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Jul 27 04:45:02 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Jul 27 04:45:02 2013 +0300 -- CHANGES.txt | 1 + bin/cqlsh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/308afb20/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/308afb20/bin/cqlsh --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2130b2e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2130b2e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2130b2e2 Branch: refs/heads/trunk Commit: 2130b2e2a0b1f288f1d4969acb588bc020ab9cbf Parents: 59c6e50 a3dbc3d Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Jul 25 10:53:09 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Jul 25 10:53:09 2013 -0500 -- examples/pig/README.txt | 2 +- .../hadoop/pig/AbstractCassandraStorage.java| 48 +-- .../cassandra/hadoop/pig/CassandraStorage.java | 30 --- .../apache/cassandra/hadoop/pig/CqlStorage.java | 84 +--- 4 files changed, 98 insertions(+), 66 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2130b2e2/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2130b2e2/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2130b2e2/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/db/DeletionTime.java
src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6cc50946
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cc50946
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cc50946
Branch: refs/heads/trunk
Commit: 6cc50946300ba0a24d1028a0e266a3dc627ed404
Parents: 4021fff d38446a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Jul 24 16:58:24 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Jul 24 16:58:24 2013 +0200
--
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/DeletionTime.java | 4 ++--
src/java/org/apache/cassandra/db/RangeTombstone.java| 4 ++--
.../org/apache/cassandra/db/compaction/LazilyCompactedRow.java | 3 +--
.../db/index/AbstractSimplePerColumnSecondaryIndex.java | 5 -
5 files changed, 10 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cc50946/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cc50946/src/java/org/apache/cassandra/db/DeletionTime.java
--
diff --cc src/java/org/apache/cassandra/db/DeletionTime.java
index 5296529,deab30b..3d6fad4
--- a/src/java/org/apache/cassandra/db/DeletionTime.java
+++ b/src/java/org/apache/cassandra/db/DeletionTime.java
@@@ -83,9 -83,9 +83,9 @@@ public class DeletionTime implements Co
return localDeletionTime gcBefore;
}
- public boolean isDeleted(Column column, long now)
-public boolean isDeleted(IColumn column)
++public boolean isDeleted(Column column)
{
- return column.isMarkedForDelete(now) column.getMarkedForDeleteAt()
= markedForDeleteAt;
-return column.mostRecentLiveChangeAt() = markedForDeleteAt;
++return column.timestamp() = markedForDeleteAt;
}
public long memorySize()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cc50946/src/java/org/apache/cassandra/db/RangeTombstone.java
--
diff --cc src/java/org/apache/cassandra/db/RangeTombstone.java
index cac50e8,5e87847..02dddb2
--- a/src/java/org/apache/cassandra/db/RangeTombstone.java
+++ b/src/java/org/apache/cassandra/db/RangeTombstone.java
@@@ -237,7 -239,7 +237,7 @@@ public class RangeTombstone extends Int
}
}
- public boolean isDeleted(Column column, long now)
-public boolean isDeleted(IColumn column)
++public boolean isDeleted(Column column)
{
for (RangeTombstone tombstone : ranges)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cc50946/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
index 1f38494,9a03598..6390b14
--- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
@@@ -246,10 -293,10 +246,9 @@@ public class LazilyCompactedRow extend
// PrecompactedRow.removeDeletedAndOldShards have only
checked the top-level CF deletion times,
// not the range tombstone. For that we use the columnIndexer
tombstone tracker.
- // Note that this doesn't work for super columns.
- if (indexBuilder.tombstoneTracker().isDeleted(reduced,
System.currentTimeMillis()))
+ if (indexBuilder.tombstoneTracker().isDeleted(reduced))
return null;
-serializedSize += reduced.serializedSizeForSSTable();
columns++;
minTimestampSeen = Math.min(minTimestampSeen,
reduced.minTimestamp());
maxTimestampSeen = Math.max(maxTimestampSeen,
reduced.maxTimestamp());
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cc50946/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
--
diff --cc
src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
index 73f818f,2ff2d27..afc7409
---
a/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
+++
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Conflicts: build.xml debian/changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/283b1a33 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/283b1a33 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/283b1a33 Branch: refs/heads/trunk Commit: 283b1a33b47e6b9acbd30efd320ec47f8b029af4 Parents: db70bbe 66bd605 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Jul 23 19:00:36 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Jul 23 19:00:36 2013 +0200 -- doc/cql3/CQL.textile | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/283b1a33/doc/cql3/CQL.textile --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6fd5bab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6fd5bab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6fd5bab
Branch: refs/heads/trunk
Commit: f6fd5bab7550bd8e4abc814f4ab607c9fce4b43c
Parents: ee85c8e 373c033
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Jul 18 18:46:17 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Jul 18 18:46:17 2013 -0500
--
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6fd5bab/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 9d2e89a,d166553..12ba352
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -893,8 -942,9 +893,8 @@@ public class StorageService extends Not
// Dont set any state for the node which is bootstrapping the
existing token...
tokenMetadata.updateNormalTokens(tokens,
FBUtilities.getBroadcastAddress());
}
-Tracing.instance();
if (!Gossiper.instance.seenAnySeed())
- throw new IllegalStateException(Unable to contact any seeds!)
+ throw new IllegalStateException(Unable to contact any seeds!);
setMode(Mode.JOINING, Starting to bootstrap..., true);
new BootStrapper(FBUtilities.getBroadcastAddress(), tokens,
tokenMetadata).bootstrap(); // handles token update
logger.info(Bootstrap completed! for the tokens {}, tokens);
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee85c8ea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee85c8ea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee85c8ea Branch: refs/heads/trunk Commit: ee85c8ea980942bdd8b767fffc7ac6b9bc25d6ee Parents: c4c04e7 76ad645 Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Jul 18 16:17:15 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Jul 18 16:17:15 2013 -0500 -- CHANGES.txt | 1 + .../cassandra/gms/GossipDigestAckVerbHandler.java | 2 ++ .../cassandra/gms/GossipDigestSynVerbHandler.java | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 14 ++ .../org/apache/cassandra/service/StorageService.java | 2 ++ 5 files changed, 20 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee85c8ea/CHANGES.txt -- diff --cc CHANGES.txt index 6d72309,80b73f4..00abb86 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,93 -1,5 +1,94 @@@ +2.0.0-beta2 + * Replace countPendingHints with Hints Created metric (CASSANDRA-5746) + * Allow nodetool with no args, and with help to run without a server (CASSANDRA-5734) + * Cleanup AbstractType/TypeSerializer classes (CASSANDRA-5744) + * Remove unimplemented cli option schema-mwt (CASSANDRA-5754) + * Support range tombstones in thrift (CASSANDRA-5435) + * Normalize table-manipulating CQL3 statements' class names (CASSANDRA-5759) + * cqlsh: add missing table options to DESCRIBE output (CASSANDRA-5749) + * Fix assertion error during repair (CASSANDRA-5757) + * Fix bulkloader (CASSANDRA-5542) + + +2.0.0-beta1 + * Removed on-heap row cache (CASSANDRA-5348) + * use nanotime consistently for node-local timeouts (CASSANDRA-5581) + * Avoid unnecessary second pass on name-based queries (CASSANDRA-5577) + * Experimental triggers (CASSANDRA-1311) + * JEMalloc support for off-heap allocation (CASSANDRA-3997) + * Single-pass compaction (CASSANDRA-4180) + * Removed token range bisection (CASSANDRA-5518) + * Removed compatibility with pre-1.2.5 sstables and network messages + (CASSANDRA-5511) + * removed PBSPredictor (CASSANDRA-5455) + * CAS support (CASSANDRA-5062, 5441, 5442, 5443, 5619, 5667) + * Leveled compaction performs size-tiered compactions in L0 + (CASSANDRA-5371, 5439) + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339) + * Log when a node is down longer than the hint window (CASSANDRA-4554) + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917) + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961, CASSANDRA-5650) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command (CASSANDRA-5331) + * Rebuild BF when loading sstables if bloom_filter_fp_chance + has changed since compaction (CASSANDRA-5015) + * remove row-level bloom filters (CASSANDRA-4885) + * Change Kernel Page Cache skipping into row preheating (disabled by default) + (CASSANDRA-4937) + * Improve repair by deciding on a gcBefore before sending + out TreeRequests (CASSANDRA-4932) + * Add an official way to disable compactions (CASSANDRA-5074) + * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919) + * Add binary protocol versioning (CASSANDRA-5436) + * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530) + * Add alias support to SELECT statement (CASSANDRA-5075) + * Don't create empty RowMutations in
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ef78c68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ef78c68 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ef78c68 Branch: refs/heads/trunk Commit: 2ef78c689fc344f46fe7c6f12f21e490ca083da6 Parents: 57f1ad3 0feb59a Author: Jonathan Ellis jbel...@apache.org Authored: Wed Jul 17 12:05:02 2013 -0700 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Jul 17 12:05:02 2013 -0700 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ef78c68/CHANGES.txt -- diff --cc CHANGES.txt index 09b5c25,09f4c7b..09472bc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,89 -1,5 +1,90 @@@ +2.0.0-beta2 + * Allow nodetool with no args, and with help to run without a server (CASSANDRA-5734) + * Cleanup AbstractType/TypeSerializer classes (CASSANDRA-5744) + * Remove unimplemented cli option schema-mwt (CASSANDRA-5754) + * Support range tombstones in thrift (CASSANDRA-5435) + * Normalize table-manipulating CQL3 statements' class names (CASSANDRA-5759) + * cqlsh: add missing table options to DESCRIBE output (CASSANDRA-5749) + +2.0.0-beta1 + * Removed on-heap row cache (CASSANDRA-5348) + * use nanotime consistently for node-local timeouts (CASSANDRA-5581) + * Avoid unnecessary second pass on name-based queries (CASSANDRA-5577) + * Experimental triggers (CASSANDRA-1311) + * JEMalloc support for off-heap allocation (CASSANDRA-3997) + * Single-pass compaction (CASSANDRA-4180) + * Removed token range bisection (CASSANDRA-5518) + * Removed compatibility with pre-1.2.5 sstables and network messages + (CASSANDRA-5511) + * removed PBSPredictor (CASSANDRA-5455) + * CAS support (CASSANDRA-5062, 5441, 5442, 5443, 5619, 5667) + * Leveled compaction performs size-tiered compactions in L0 + (CASSANDRA-5371, 5439) + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339) + * Log when a node is down longer than the hint window (CASSANDRA-4554) + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917) + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961, CASSANDRA-5650) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command (CASSANDRA-5331) + * Rebuild BF when loading sstables if bloom_filter_fp_chance + has changed since compaction (CASSANDRA-5015) + * remove row-level bloom filters (CASSANDRA-4885) + * Change Kernel Page Cache skipping into row preheating (disabled by default) + (CASSANDRA-4937) + * Improve repair by deciding on a gcBefore before sending + out TreeRequests (CASSANDRA-4932) + * Add an official way to disable compactions (CASSANDRA-5074) + * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919) + * Add binary protocol versioning (CASSANDRA-5436) + * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530) + * Add alias support to SELECT statement (CASSANDRA-5075) + * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541) + * Use range tombstones when dropping cfs/columns from schema (CASSANDRA-5579) + * cqlsh: drop CQL2/CQL3-beta support (CASSANDRA-5585) + * Track max/min column names in sstables to be able to optimize slice + queries (CASSANDRA-5514, CASSANDRA-5595, CASSANDRA-5600) + * Binary protocol: allow batching already prepared statements (CASSANDRA-4693) + * Allow preparing timestamp, ttl and limit in CQL3 queries (CASSANDRA-4450) +
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09d3d2b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09d3d2b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09d3d2b8 Branch: refs/heads/trunk Commit: 09d3d2b839172c37bd2a6605ff29bfbcb1d735bb Parents: 2ef78c6 9382c4b Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Jul 17 15:02:42 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Jul 17 15:02:42 2013 -0500 -- src/java/org/apache/cassandra/cli/CliClient.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/09d3d2b8/src/java/org/apache/cassandra/cli/CliClient.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/28028496 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/28028496 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/28028496 Branch: refs/heads/trunk Commit: 280284961f3fbea6d5638c94d19768afaeaaac43 Parents: 40cf7b0 ba6396a Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Jul 15 15:56:08 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Jul 15 15:56:08 2013 -0500 -- CHANGES.txt | 1 + .../cassandra/config/DatabaseDescriptor.java| 16 .../cassandra/service/StorageService.java | 27 3 files changed, 39 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/28028496/CHANGES.txt -- diff --cc CHANGES.txt index ddb46f1,ee277aa..63c85af --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,89 -1,5 +1,90 @@@ +2.0.0-beta2 + * Allow nodetool with no args, and with help to run without a server (CASSANDRA-5734) + * Cleanup AbstractType/TypeSerializer classes (CASSANDRA-5744) + * Remove unimplemented cli option schema-mwt (CASSANDRA-5754) + * Support range tombstones in thrift (CASSANDRA-5435) + * Normalize table-manipulating CQL3 statements' class names (CASSANDRA-5759) + * cqlsh: add missing table options to DESCRIBE output (CASSANDRA-5749) + +2.0.0-beta1 + * Removed on-heap row cache (CASSANDRA-5348) + * use nanotime consistently for node-local timeouts (CASSANDRA-5581) + * Avoid unnecessary second pass on name-based queries (CASSANDRA-5577) + * Experimental triggers (CASSANDRA-1311) + * JEMalloc support for off-heap allocation (CASSANDRA-3997) + * Single-pass compaction (CASSANDRA-4180) + * Removed token range bisection (CASSANDRA-5518) + * Removed compatibility with pre-1.2.5 sstables and network messages + (CASSANDRA-5511) + * removed PBSPredictor (CASSANDRA-5455) + * CAS support (CASSANDRA-5062, 5441, 5442, 5443, 5619, 5667) + * Leveled compaction performs size-tiered compactions in L0 + (CASSANDRA-5371, 5439) + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339) + * Log when a node is down longer than the hint window (CASSANDRA-4554) + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917) + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961, CASSANDRA-5650) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command (CASSANDRA-5331) + * Rebuild BF when loading sstables if bloom_filter_fp_chance + has changed since compaction (CASSANDRA-5015) + * remove row-level bloom filters (CASSANDRA-4885) + * Change Kernel Page Cache skipping into row preheating (disabled by default) + (CASSANDRA-4937) + * Improve repair by deciding on a gcBefore before sending + out TreeRequests (CASSANDRA-4932) + * Add an official way to disable compactions (CASSANDRA-5074) + * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919) + * Add binary protocol versioning (CASSANDRA-5436) + * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530) + * Add alias support to SELECT statement (CASSANDRA-5075) + * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541) + * Use range tombstones when dropping cfs/columns from schema (CASSANDRA-5579) + * cqlsh: drop CQL2/CQL3-beta support (CASSANDRA-5585) + * Track max/min column names in sstables to be able to optimize slice + queries (CASSANDRA-5514, CASSANDRA-5595,
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/11928f7d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11928f7d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11928f7d Branch: refs/heads/trunk Commit: 11928f7d8952d587337ddae77d8408156391e90d Parents: 2802849 d614566 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Jul 15 16:10:30 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Jul 15 16:10:30 2013 -0500 -- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/11928f7d/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae26aab4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae26aab4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae26aab4 Branch: refs/heads/trunk Commit: ae26aab47b1351ebab88b0aa5c7f9c473f39a019 Parents: 11928f7 e706190 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Jul 15 17:08:45 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Jul 15 17:08:45 2013 -0500 -- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae26aab4/src/java/org/apache/cassandra/service/StorageService.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f879076 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f879076 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f879076 Branch: refs/heads/trunk Commit: 3f87907697cd78076fa9843636ccf584be6726cf Parents: ae26aab 6659961 Author: Jonathan Ellis jbel...@apache.org Authored: Mon Jul 15 17:37:42 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Jul 15 17:37:42 2013 -0500 -- CHANGES.txt | 1 + .../hadoop/cql3/CqlPagingRecordReader.java | 20 +--- 2 files changed, 14 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f879076/CHANGES.txt -- diff --cc CHANGES.txt index 63c85af,00148a3..09b5c25 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,89 -1,5 +1,90 @@@ +2.0.0-beta2 + * Allow nodetool with no args, and with help to run without a server (CASSANDRA-5734) + * Cleanup AbstractType/TypeSerializer classes (CASSANDRA-5744) + * Remove unimplemented cli option schema-mwt (CASSANDRA-5754) + * Support range tombstones in thrift (CASSANDRA-5435) + * Normalize table-manipulating CQL3 statements' class names (CASSANDRA-5759) + * cqlsh: add missing table options to DESCRIBE output (CASSANDRA-5749) + +2.0.0-beta1 + * Removed on-heap row cache (CASSANDRA-5348) + * use nanotime consistently for node-local timeouts (CASSANDRA-5581) + * Avoid unnecessary second pass on name-based queries (CASSANDRA-5577) + * Experimental triggers (CASSANDRA-1311) + * JEMalloc support for off-heap allocation (CASSANDRA-3997) + * Single-pass compaction (CASSANDRA-4180) + * Removed token range bisection (CASSANDRA-5518) + * Removed compatibility with pre-1.2.5 sstables and network messages + (CASSANDRA-5511) + * removed PBSPredictor (CASSANDRA-5455) + * CAS support (CASSANDRA-5062, 5441, 5442, 5443, 5619, 5667) + * Leveled compaction performs size-tiered compactions in L0 + (CASSANDRA-5371, 5439) + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339) + * Log when a node is down longer than the hint window (CASSANDRA-4554) + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917) + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961, CASSANDRA-5650) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command (CASSANDRA-5331) + * Rebuild BF when loading sstables if bloom_filter_fp_chance + has changed since compaction (CASSANDRA-5015) + * remove row-level bloom filters (CASSANDRA-4885) + * Change Kernel Page Cache skipping into row preheating (disabled by default) + (CASSANDRA-4937) + * Improve repair by deciding on a gcBefore before sending + out TreeRequests (CASSANDRA-4932) + * Add an official way to disable compactions (CASSANDRA-5074) + * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919) + * Add binary protocol versioning (CASSANDRA-5436) + * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530) + * Add alias support to SELECT statement (CASSANDRA-5075) + * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541) + * Use range tombstones when dropping cfs/columns from schema (CASSANDRA-5579) + * cqlsh: drop CQL2/CQL3-beta support (CASSANDRA-5585) + * Track max/min column names in sstables to be able to optimize slice + queries (CASSANDRA-5514, CASSANDRA-5595, CASSANDRA-5600) + * Binary protocol: allow batching already prepared statements (CASSANDRA-4693) + * Allow preparing timestamp, ttl and limit in CQL3 queries
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4ebd5ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4ebd5ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4ebd5ff
Branch: refs/heads/trunk
Commit: e4ebd5ff59aa63bcf8ea9e457d8048367d16ea8c
Parents: 3f87907 b2daab7
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Jul 15 17:44:46 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Jul 15 17:44:46 2013 -0500
--
.../hadoop/cql3/CqlPagingRecordReader.java | 49 +---
1 file changed, 23 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4ebd5ff/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
--
diff --cc src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
index 5b9de9b,a900261..c0a6832
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
@@@ -486,10 -483,10 +483,10 @@@ public class CqlPagingRecordReader exte
// query token(k) = token(pre_partition_key) and m =
pre_cluster_key_m and n pre_cluster_key_n
PairInteger, String clause = whereClause(clusterColumns, 0);
return Pair.create(clause.left,
- WHERE token( + partitionKeyString + ) =
token( + partitionKeyMarkers + ) + clause.right);
+String.format( WHERE token(%s) = token(%s)
%s, partitionKeyString, partitionKeyMarkers, clause.right));
}
-/** recursively compose the where clause */
+/** recursively serialize the where clause */
private PairInteger, String whereClause(ListBoundColumn column,
int position)
{
if (position == column.size() - 1 || column.get(position +
1).value == null)
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eec01e9f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eec01e9f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eec01e9f
Branch: refs/heads/trunk
Commit: eec01e9fe8668c6b08be87e3680c35824e02bef9
Parents: e4ebd5f 3280fb0
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Jul 15 23:45:14 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Jul 15 23:45:14 2013 -0500
--
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eec01e9f/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 195e592,7f1bdbc..a31c10a
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -877,8 -919,8 +877,8 @@@ public class StorageService extends Not
private void bootstrap(CollectionToken tokens)
{
isBootstrapMode = true;
-SystemTable.updateTokens(tokens); // DON'T use setToken, that makes
us part of the ring locally which is incorrect until we are done bootstrapping
+SystemKeyspace.updateTokens(tokens); // DON'T use setToken, that
makes us part of the ring locally which is incorrect until we are done
bootstrapping
- if (DatabaseDescriptor.isReplacing())
+ if (!DatabaseDescriptor.isReplacing())
{
// if not an existing token then bootstrap
// order is important here, the gossiper can fire in between
adding these two states. It's ok to send TOKENS without STATUS, but *not* vice
versa.
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2eec795 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2eec795 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2eec795 Branch: refs/heads/trunk Commit: b2eec795c9a8646359f8ac98e201a85b034bfc8d Parents: 0ed859a fa327aa Author: Jonathan Ellis jbel...@apache.org Authored: Sat Jul 13 16:15:12 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Sat Jul 13 16:15:12 2013 -0500 -- bin/cassandra-shuffle.bat | 51 ++ 1 file changed, 51 insertions(+) --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a90e8b77 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a90e8b77 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a90e8b77 Branch: refs/heads/trunk Commit: a90e8b77c5b0f4d231bd7b61abc0bd16450beeaa Parents: 4cd087f f8c072e Author: Jonathan Ellis jbel...@apache.org Authored: Mon Jul 8 11:30:39 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Jul 8 11:30:39 2013 -0500 -- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/transport/Server.java | 7 +-- 2 files changed, 7 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a90e8b77/CHANGES.txt -- diff --cc CHANGES.txt index 40c076c,7c16cd0..5d597bd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,81 -1,8 +1,82 @@@ +2.0 + * Removed on-heap row cache (CASSANDRA-5348) + * use nanotime consistently for node-local timeouts (CASSANDRA-5581) + * Avoid unnecessary second pass on name-based queries (CASSANDRA-5577) + * Experimental triggers (CASSANDRA-1311) + * JEMalloc support for off-heap allocation (CASSANDRA-3997) + * Single-pass compaction (CASSANDRA-4180) + * Removed token range bisection (CASSANDRA-5518) + * Removed compatibility with pre-1.2.5 sstables and network messages + (CASSANDRA-5511) + * removed PBSPredictor (CASSANDRA-5455) + * CAS support (CASSANDRA-5062, 5441, 5442, 5443, 5619, 5667) + * Leveled compaction performs size-tiered compactions in L0 + (CASSANDRA-5371, 5439) + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339) + * Log when a node is down longer than the hint window (CASSANDRA-4554) + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917) + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961, CASSANDRA-5650) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command (CASSANDRA-5331) + * Rebuild BF when loading sstables if bloom_filter_fp_chance + has changed since compaction (CASSANDRA-5015) + * remove row-level bloom filters (CASSANDRA-4885) + * Change Kernel Page Cache skipping into row preheating (disabled by default) + (CASSANDRA-4937) + * Improve repair by deciding on a gcBefore before sending + out TreeRequests (CASSANDRA-4932) + * Add an official way to disable compactions (CASSANDRA-5074) + * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919) + * Add binary protocol versioning (CASSANDRA-5436) + * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530) + * Add alias support to SELECT statement (CASSANDRA-5075) + * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541) + * Use range tombstones when dropping cfs/columns from schema (CASSANDRA-5579) + * cqlsh: drop CQL2/CQL3-beta support (CASSANDRA-5585) + * Track max/min column names in sstables to be able to optimize slice + queries (CASSANDRA-5514, CASSANDRA-5595, CASSANDRA-5600) + * Binary protocol: allow batching already prepared statements (CASSANDRA-4693) + * Allow preparing timestamp, ttl and limit in CQL3 queries (CASSANDRA-4450) + * Support native link w/o JNA in Java7 (CASSANDRA-3734) + * Use SASL authentication in binary protocol v2 (CASSANDRA-5545) + * Replace Thrift HsHa with LMAX Disruptor based implementation (CASSANDRA-5582) + * cqlsh: Add row count to SELECT output (CASSANDRA-5636) + * Include a timestamp with all read commands to determine column expiration + (CASSANDRA-5149) + * Streaming 2.0 (CASSANDRA-5286, 5699) + * Conditional create/drop ks/table/index
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b621078f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b621078f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b621078f Branch: refs/heads/trunk Commit: b621078f20587573b91ba76ed1309a7c0a91a122 Parents: 82b920b 40f0bdc Author: Jonathan Ellis jbel...@apache.org Authored: Mon Jul 1 09:12:34 2013 -0700 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Jul 1 09:12:34 2013 -0700 -- --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0888c2e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0888c2e1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0888c2e1 Branch: refs/heads/trunk Commit: 0888c2e18722aacbd53c509655515a3f5bb6601a Parents: 66f3014 8c2a280 Author: Jonathan Ellis jbel...@apache.org Authored: Sat Jun 29 11:37:30 2013 -0700 Committer: Jonathan Ellis jbel...@apache.org Committed: Sat Jun 29 11:37:30 2013 -0700 -- src/java/org/apache/cassandra/cli/CliMain.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0888c2e1/src/java/org/apache/cassandra/cli/CliMain.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03ff2687 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03ff2687 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03ff2687 Branch: refs/heads/trunk Commit: 03ff268748080cff3c871d882b0194c9c99bce81 Parents: 66fe216 d265fde Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Jun 28 14:04:31 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Jun 28 14:04:31 2013 -0500 -- src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03ff2687/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt NEWS.txt src/java/org/apache/cassandra/gms/VersionedValue.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dacd2b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dacd2b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dacd2b6 Branch: refs/heads/trunk Commit: 1dacd2b6d1e76a4a55181e7a78978f3a9335fd32 Parents: 29232a8 54266ea Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Jun 26 15:56:59 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Jun 26 15:56:59 2013 -0500 -- CHANGES.txt | 2 +- NEWS.txt | 10 ++ src/java/org/apache/cassandra/gms/VersionedValue.java | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dacd2b6/CHANGES.txt -- diff --cc CHANGES.txt index a79d2db,cb3fede..1c5abd0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,77 -1,5 +1,77 @@@ +2.0 + * Removed on-heap row cache (CASSANDRA-5348) + * use nanotime consistently for node-local timeouts (CASSANDRA-5581) + * Avoid unnecessary second pass on name-based queries (CASSANDRA-5577) + * Experimental triggers (CASSANDRA-1311) + * JEMalloc support for off-heap allocation (CASSANDRA-3997) + * Single-pass compaction (CASSANDRA-4180) + * Removed token range bisection (CASSANDRA-5518) + * Removed compatibility with pre-1.2.5 sstables and network messages + (CASSANDRA-5511) + * removed PBSPredictor (CASSANDRA-5455) + * CAS support (CASSANDRA-5062, 5441, 5442, 5443, 5619) + * Leveled compaction performs size-tiered compactions in L0 + (CASSANDRA-5371, 5439) + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339) + * Log when a node is down longer than the hint window (CASSANDRA-4554) + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917) + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961, CASSANDRA-5650) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command (CASSANDRA-5331) + * Rebuild BF when loading sstables if bloom_filter_fp_chance + has changed since compaction (CASSANDRA-5015) + * remove row-level bloom filters (CASSANDRA-4885) + * Change Kernel Page Cache skipping into row preheating (disabled by default) + (CASSANDRA-4937) + * Improve repair by deciding on a gcBefore before sending + out TreeRequests (CASSANDRA-4932) + * Add an official way to disable compactions (CASSANDRA-5074) + * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919) + * Add binary protocol versioning (CASSANDRA-5436) + * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530) + * Add alias support to SELECT statement (CASSANDRA-5075) + * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541) + * Use range tombstones when dropping cfs/columns from schema (CASSANDRA-5579) + * cqlsh: drop CQL2/CQL3-beta support (CASSANDRA-5585) + * Track max/min column names in sstables to be able to optimize slice + queries (CASSANDRA-5514, CASSANDRA-5595, CASSANDRA-5600) + * Binary protocol: allow batching already prepared statements (CASSANDRA-4693) + * Allow preparing timestamp, ttl and limit in CQL3 queries (CASSANDRA-4450) + * Support native link w/o JNA in Java7 (CASSANDRA-3734) + * Use SASL authentication in binary protocol v2 (CASSANDRA-5545) + * Replace Thrift HsHa with LMAX Disruptor based implementation (CASSANDRA-5582) + * cqlsh: Add row count to SELECT output
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2c271e2c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c271e2c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2c271e2c
Branch: refs/heads/trunk
Commit: 2c271e2c0d957b6ebfcea4dcd70f3c8b8c6cf0cd
Parents: a607ee0 a6ca5d4
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Jun 25 14:18:53 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Jun 25 14:18:53 2013 -0500
--
CHANGES.txt | 2 +
src/java/org/apache/cassandra/gms/Gossiper.java | 46 +---
2 files changed, 23 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c271e2c/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c271e2c/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index 46f19f5,efa9865..a74da02
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -874,28 -871,20 +874,20 @@@ public class Gossiper implements IFailu
if (logger.isTraceEnabled())
logger.trace(Updating heartbeat state generation to
+ remoteGeneration + from + localGeneration + for + ep);
// major state change will handle the update by inserting
the remote state directly
- copyNewerApplicationStates(remoteState, localEpStatePtr);
handleMajorStateChange(ep, remoteState);
}
-else if ( remoteGeneration == localGeneration ) // generation
has not changed, apply new states
+else if (remoteGeneration == localGeneration) // generation
has not changed, apply new states
{
/* find maximum state */
int localMaxVersion =
getMaxEndpointStateVersion(localEpStatePtr);
int remoteMaxVersion =
getMaxEndpointStateVersion(remoteState);
-if ( remoteMaxVersion localMaxVersion )
+if (remoteMaxVersion localMaxVersion)
{
- if (logger.isTraceEnabled())
- {
- logger.trace(Updating heartbeat state version to
+ remoteState.getHeartBeatState().getHeartBeatVersion() +
- from +
localEpStatePtr.getHeartBeatState().getHeartBeatVersion() + for + ep);
- }
-
localEpStatePtr.setHeartBeatState(remoteState.getHeartBeatState());
- MapApplicationState, VersionedValue merged =
copyNewerApplicationStates(localEpStatePtr, remoteState);
- for (EntryApplicationState, VersionedValue appState
: merged.entrySet())
- doNotifications(ep, appState.getKey(),
appState.getValue());
+ // apply states, but do not notify since there is no
major change
+ applyNewStates(ep, localEpStatePtr, remoteState);
}
else if (logger.isTraceEnabled())
- logger.trace(Ignoring remote version +
remoteMaxVersion + = + localMaxVersion + for + ep);
+ logger.trace(Ignoring remote version +
remoteMaxVersion + = + localMaxVersion + for + ep);
if (!localEpStatePtr.isAlive()
!isDeadState(localEpStatePtr)) // unless of course, it was dead
markAlive(ep, localEpStatePtr);
}
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a684ee09 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a684ee09 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a684ee09 Branch: refs/heads/trunk Commit: a684ee095d3f706d5126ec19292227fc909353c9 Parents: ab6232a 07c627a Author: Jonathan Ellis jbel...@apache.org Authored: Mon Jun 24 18:00:34 2013 -0700 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Jun 24 18:00:34 2013 -0700 -- CHANGES.txt | 1 + .../apache/cassandra/tools/SSTableExport.java | 27 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a684ee09/CHANGES.txt -- diff --cc CHANGES.txt index ebcdd4e,be0c1d0..2c43d57 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,72 -1,6 +1,73 @@@ +2.0 + * Removed on-heap row cache (CASSANDRA-5348) + * use nanotime consistently for node-local timeouts (CASSANDRA-5581) + * Avoid unnecessary second pass on name-based queries (CASSANDRA-5577) + * Experimental triggers (CASSANDRA-1311) + * JEMalloc support for off-heap allocation (CASSANDRA-3997) + * Single-pass compaction (CASSANDRA-4180) + * Removed token range bisection (CASSANDRA-5518) + * Removed compatibility with pre-1.2.5 sstables and network messages + (CASSANDRA-5511) + * removed PBSPredictor (CASSANDRA-5455) + * CAS support (CASSANDRA-5062, 5441, 5442, 5443, 5619) + * Leveled compaction performs size-tiered compactions in L0 + (CASSANDRA-5371, 5439) + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339) + * Log when a node is down longer than the hint window (CASSANDRA-4554) + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917) + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961, CASSANDRA-5650) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command (CASSANDRA-5331) + * Rebuild BF when loading sstables if bloom_filter_fp_chance + has changed since compaction (CASSANDRA-5015) + * remove row-level bloom filters (CASSANDRA-4885) + * Change Kernel Page Cache skipping into row preheating (disabled by default) + (CASSANDRA-4937) + * Improve repair by deciding on a gcBefore before sending + out TreeRequests (CASSANDRA-4932) + * Add an official way to disable compactions (CASSANDRA-5074) + * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919) + * Add binary protocol versioning (CASSANDRA-5436) + * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530) + * Add alias support to SELECT statement (CASSANDRA-5075) + * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541) + * Use range tombstones when dropping cfs/columns from schema (CASSANDRA-5579) + * cqlsh: drop CQL2/CQL3-beta support (CASSANDRA-5585) + * Track max/min column names in sstables to be able to optimize slice + queries (CASSANDRA-5514, CASSANDRA-5595, CASSANDRA-5600) + * Binary protocol: allow batching already prepared statements (CASSANDRA-4693) + * Allow preparing timestamp, ttl and limit in CQL3 queries (CASSANDRA-4450) + * Support native link w/o JNA in Java7 (CASSANDRA-3734) + * Use SASL authentication in binary protocol v2 (CASSANDRA-5545) + * Replace Thrift HsHa with LMAX Disruptor based implementation (CASSANDRA-5582) + * cqlsh: Add row count to SELECT output (CASSANDRA-5636) + * Include a timestamp with all read commands to determine column expiration + (CASSANDRA-5149) + * Streaming 2.0 (CASSANDRA-5286) + * Conditional create/drop ks/table/index
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bb6f012 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bb6f012 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bb6f012 Branch: refs/heads/trunk Commit: 7bb6f012b48fa6c38f78467306893aa52dfd9b4a Parents: 56a47b3 b4dca44 Author: Jason Brown jasedbr...@gmail.com Authored: Thu Jun 20 12:21:40 2013 -0700 Committer: Jason Brown jasedbr...@gmail.com Committed: Thu Jun 20 12:21:40 2013 -0700 -- CHANGES.txt | 2 ++ .../cassandra/locator/Ec2MultiRegionSnitch.java | 22 +++- 2 files changed, 14 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bb6f012/CHANGES.txt --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21deff6c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21deff6c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21deff6c Branch: refs/heads/trunk Commit: 21deff6c2a454771aa3df0170cc15dbc0ee6 Parents: 8df9d1f 7dc2eb9 Author: Jonathan Ellis jbel...@apache.org Authored: Thu Jun 20 15:47:13 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Jun 20 15:47:13 2013 -0500 -- .../cassandra/locator/Ec2MultiRegionSnitch.java | 42 +++- 1 file changed, 23 insertions(+), 19 deletions(-) --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfc163df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfc163df Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfc163df Branch: refs/heads/trunk Commit: cfc163df0296ae179285281ad9d6ed46ee185b85 Parents: 5556414 7861f17 Author: Jonathan Ellis jbel...@apache.org Authored: Wed Jun 19 10:24:19 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Jun 19 10:24:19 2013 -0500 -- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfc163df/src/java/org/apache/cassandra/service/StorageService.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ca07f52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ca07f52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ca07f52 Branch: refs/heads/trunk Commit: 2ca07f5238c5d918f78361e1fa35beb84205cf6a Parents: 66a5e09 0bff5f5 Author: Dave Brosius dbros...@apache.org Authored: Sun Jun 16 13:20:28 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Sun Jun 16 13:20:28 2013 -0400 -- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/statements/SelectStatement.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ca07f52/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ca07f52/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f09cc5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f09cc5a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f09cc5a Branch: refs/heads/trunk Commit: 0f09cc5a1b596c93bb7cbdb324391fac17892ed4 Parents: 60bf7a5 f51c962 Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Jun 13 19:22:54 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Jun 13 19:22:54 2013 -0500 -- bin/cassandra-shuffle | 0 1 file changed, 0 insertions(+), 0 deletions(-) --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0eb048f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0eb048f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0eb048f2 Branch: refs/heads/trunk Commit: 0eb048f2358f37565703fb70152fc066aed8cc73 Parents: 90052d5 b973a33 Author: Jonathan Ellis jbel...@apache.org Authored: Thu Jun 6 14:24:32 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Jun 6 14:24:32 2013 -0500 -- .../org/apache/cassandra/hadoop/ConfigHelper.java | 10 +- .../apache/cassandra/thrift/ITransportFactory.java | 43 - .../cassandra/thrift/TClientTransportFactory.java | 70 --- .../cassandra/thrift/TFramedTransportFactory.java | 11 +-- 4 files changed, 46 insertions(+), 88 deletions(-) --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db4c27e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db4c27e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db4c27e9 Branch: refs/heads/trunk Commit: db4c27e91b3d9c9027615b9b1ac085524f3090ba Parents: ccc87fb 15dfdef Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Jun 4 04:46:51 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Jun 4 04:46:51 2013 +0300 -- build.xml |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db4c27e9/build.xml --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d78b6226 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d78b6226 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d78b6226 Branch: refs/heads/trunk Commit: d78b622646e47e158e73d37e5a87af5fddb38bea Parents: b3101a1 6d7404b Author: Brandon Williams brandonwilli...@apache.org Authored: Wed May 29 12:54:38 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed May 29 12:54:38 2013 -0500 -- CHANGES.txt|1 + examples/pig/README.txt|4 +++ .../cassandra/hadoop/pig/CassandraStorage.java | 21 +++ 3 files changed, 26 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d78b6226/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d78b6226/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java -- diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java index b5c596e,6490d05..b5f20e7 --- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java @@@ -106,9 -106,10 +107,10 @@@ public class CassandraStorage extends L private int limit; private boolean widerows = false; private boolean usePartitionFilter = false; + private int splitSize = 64 * 1024; // wide row hacks private ByteBuffer lastKey; -private MapByteBuffer,IColumn lastRow; +private MapByteBuffer,Column lastRow; private boolean hasNext = true; public CassandraStorage()
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Conflicts:
bin/cqlsh
pylib/cqlshlib/test/test_cqlsh_completion.py
pylib/cqlshlib/test/test_cqlsh_output.py
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f7e2b80
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f7e2b80
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f7e2b80
Branch: refs/heads/trunk
Commit: 4f7e2b801894614266d8284bd41e7d2676c8773b
Parents: d78b622 87450cb
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed May 29 21:12:08 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed May 29 21:12:08 2013 +0300
--
CHANGES.txt |1 +
bin/cqlsh| 70 -
pylib/cqlshlib/test/test_cqlsh_completion.py |4 +-
3 files changed, 71 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f7e2b80/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f7e2b80/bin/cqlsh
--
diff --cc bin/cqlsh
index 977603b,1abd078..5741c31
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -952,6 -1138,29 +962,20 @@@ class Shell(cmd.Cmd)
line = ' | '.join(col.rjust(w, color=self.color) for (col, w) in
zip(row, widths))
self.writeresult(' ' + line)
+ def print_formatted_result_vertically(self, formatted_names,
formatted_values):
+ max_col_width = max([n.displaywidth for n in formatted_names])
+ max_val_width = max([n.displaywidth for row in formatted_values for n
in row])
+
+ # for each row returned, list all the column-value pairs
+ for row_id, row in enumerate(formatted_values):
+ self.writeresult(@ Row %d % (row_id + 1))
+ self.writeresult('-%s-' % '-+-'.join(['-' * max_col_width, '-' *
max_val_width]))
+ for field_id, field in enumerate(row):
+ column = formatted_names[field_id].ljust(max_col_width,
color=self.color)
+ value = field.ljust(field.displaywidth, color=self.color)
+ self.writeresult(' ' + | .join([column, value]))
+ self.writeresult('')
+
-def print_dynamic_result(self, cursor):
-for row in cursor:
-colnames = [d[0] for d in cursor.description]
-colnames_t = [(name, self.get_nametype(cursor, n)) for (n, name)
in enumerate(colnames)]
-colnames = [self.myformat_colname(name, nametype) for (name,
nametype) in colnames_t]
-colvals = map(self.myformat_value, row, cursor.column_types)
-line = ' | '.join('%s,%s' % (n.coloredval, v.coloredval) for (n,
v) in zip(colnames, colvals))
-self.writeresult(' ' + line)
-
def emptyline(self):
pass
@@@ -1645,9 -2008,51 +1669,51 @@@
self.tracing_enabled = False
print 'Disabled tracing.'
+ def do_expand(self, parsed):
+
+ EXPAND [cqlsh]
+
+ Enables or disables expanded (vertical) output.
+
+ EXPAND ON
+
+ Enables expanded (vertical) output.
+
+ EXPAND OFF
+
+ Disables expanded (vertical) output.
+
+ EXPAND
+
+ EXPAND with no arguments shows the current value of expand setting.
+
+ switch = parsed.get_binding('switch')
+ if switch is None:
+ if self.expand_enabled:
+ print Expanded output is currently enabled. Use EXPAND OFF
to disable
+ else:
+ print Expanded output is currently disabled. Use EXPAND ON
to enable.
+ return
+
+ if switch.upper() == 'ON':
+ if self.expand_enabled:
+ self.printerr('Expanded output is already enabled. '
+ 'Use EXPAND OFF to disable.')
+ return
+ self.expand_enabled = True
+ print 'Now printing expanded output'
+ return
+
+ if switch.upper() == 'OFF':
+ if not self.expand_enabled:
+ self.printerr('Expanded output is not enabled.')
+ return
+ self.expand_enabled = False
+ print 'Disabled expanded output.'
+
def do_consistency(self, parsed):
-CONSISTENCY [cqlsh with CQL3 only]
+CONSISTENCY [cqlsh only]
Overrides default consistency level (default level is ONE).
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f7e2b80/pylib/cqlshlib/test/test_cqlsh_completion.py
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/tools/NodeCmd.java src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5dd390b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5dd390b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5dd390b Branch: refs/heads/trunk Commit: e5dd390b96fb2ff6126b6d60de235fe0fb18af51 Parents: bef5209 843dc79 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue May 28 13:54:13 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue May 28 13:54:13 2013 -0500 -- src/java/org/apache/cassandra/tools/NodeCmd.java | 40 ++- src/java/org/apache/cassandra/tools/NodeProbe.java | 18 ++- .../org/apache/cassandra/tools/NodeToolHelp.yaml |6 ++ 3 files changed, 50 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5dd390b/src/java/org/apache/cassandra/tools/NodeCmd.java -- diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java index 2e050a8,bca0fcd..2af02ea --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@@ -115,8 -118,8 +115,10 @@@ public class NodeCm ENABLETHRIFT, FLUSH, GETCOMPACTIONTHRESHOLD, +DISABLEAUTOCOMPACTION, +ENABLEAUTOCOMPACTION, + GETCOMPACTIONTHROUGHPUT, + GETSTREAMTHROUGHPUT, GETENDPOINTS, GETSSTABLES, GOSSIPINFO, http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5dd390b/src/java/org/apache/cassandra/tools/NodeProbe.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5dd390b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml -- diff --cc src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml index c66c501,568aa20..6ec6d2e --- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml +++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml @@@ -161,12 -161,12 +161,18 @@@ commands - name: getcompactionthreshold keyspace cfname help: | Print min and max compaction thresholds for a given column family + - name: disableautocompaction [keyspace] [cfnames] +help: | + Disable autocompaction for the given keyspace and column family + - name: enableautocompaction [keyspace] [cfnames] +help: | + Enable autocompaction + - name: getcompactionthroughput + help: | + Print the MB/s throughput cap for compaction in the system + - name: getstreamthroughput + help: | + Print the MB/s throughput cap for streaming in the system - name: stop compaction_type help: | Supported types are COMPACTION, VALIDATION, CLEANUP, SCRUB, INDEX_BUILD
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34407424 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34407424 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34407424 Branch: refs/heads/trunk Commit: 34407424b39297776c9db47b11f6fea34e6f17a2 Parents: e5dd390 27e8f87 Author: Jonathan Ellis jbel...@apache.org Authored: Tue May 28 20:32:55 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue May 28 20:32:55 2013 -0500 -- .../exceptions/AlreadyExistsException.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0387cf58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0387cf58 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0387cf58 Branch: refs/heads/trunk Commit: 0387cf587965e2c5f04218c7ec1555fd136ba393 Parents: 4e2d76b aaf18bd Author: Jonathan Ellis jbel...@apache.org Authored: Mon May 27 11:27:59 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon May 27 11:27:59 2013 -0500 -- CHANGES.txt|1 + .../cassandra/hadoop/ColumnFamilyInputFormat.java | 24 ++ 2 files changed, 18 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0387cf58/CHANGES.txt -- diff --cc CHANGES.txt index 47f6f0a,34e5b52..0ce9e63 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,60 -1,5 +1,61 @@@ +2.0 + * Removed on-heap row cache (CASSANDRA-5348) + * use nanotime consistently for node-local timeouts (CASSANDRA-5581) + * Avoid unnecessary second pass on name-based queries (CASSANDRA-5577) + * Experimental triggers (CASSANDRA-1311) + * JEMalloc support for off-heap allocation (CASSANDRA-3997) + * Single-pass compaction (CASSANDRA-4180) + * Removed token range bisection (CASSANDRA-5518) + * Removed compatibility with pre-1.2.5 sstables and network messages + (CASSANDRA-5511) + * removed PBSPredictor (CASSANDRA-5455) + * CAS support (CASSANDRA-5062, 5441, 5443) + * Leveled compaction performs size-tiered compactions in L0 + (CASSANDRA-5371, 5439) + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339) + * Log when a node is down longer than the hint window (CASSANDRA-4554) + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917) + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command (CASSANDRA-5331) + * Rebuild BF when loading sstables if bloom_filter_fp_chance + has changed since compaction (CASSANDRA-5015) + * remove row-level bloom filters (CASSANDRA-4885) + * Change Kernel Page Cache skipping into row preheating (disabled by default) + (CASSANDRA-4937) + * Improve repair by deciding on a gcBefore before sending + out TreeRequests (CASSANDRA-4932) + * Add an official way to disable compactions (CASSANDRA-5074) + * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919) + * Add binary protocol versioning (CASSANDRA-5436) + * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530) + * Add alias support to SELECT statement (CASSANDRA-5075) + * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541) + * Use range tombstones when dropping cfs/columns from schema (CASSANDRA-5579) + * cqlsh: drop CQL2/CQL3-beta support (CASSANDRA-5585) + * Track max/min column names in sstables to be able to optimize slice + queries (CASSANDRA-5514) + * Binary protocol: allow batching already prepared statements (CASSANDRA-4693) + 1.2.6 + * (Hadoop) Fix InputKeyRange in CFIF (CASSANDRA-5536) * Fix dealing with ridiculously large max sstable sizes in LCS (CASSANDRA-5589) * Ignore pre-truncate hints (CASSANDRA-4655) * Move System.exit on OOM into a separate thread (CASSANDRA-5273) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0387cf58/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0680372d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0680372d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0680372d Branch: refs/heads/trunk Commit: 0680372d8d35db485a47602d9838c28baa1ced17 Parents: a583123 e394625 Author: Jonathan Ellis jbel...@apache.org Authored: Thu May 23 09:25:10 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu May 23 09:25:10 2013 -0500 -- .../org/apache/cassandra/net/CallbackInfo.java |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0680372d/src/java/org/apache/cassandra/net/CallbackInfo.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44827b4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44827b4a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44827b4a Branch: refs/heads/trunk Commit: 44827b4a824611cdbcd152b6240ccd688ac2ba82 Parents: bac41da bf28e8d Author: Jonathan Ellis jbel...@apache.org Authored: Wed May 22 10:33:20 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed May 22 10:33:20 2013 -0500 -- CHANGES.txt|1 + .../apache/cassandra/service/CassandraDaemon.java | 12 +++- 2 files changed, 12 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/44827b4a/CHANGES.txt -- diff --cc CHANGES.txt index 570c867,21faf5a..1ad2f25 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,57 -1,5 +1,58 @@@ +2.0 + * use nanotime consistently for node-local timeouts (CASSANDRA-5581) + * Avoid unnecessary second pass on name-based queries (CASSANDRA-5577) + * Experimental triggers (CASSANDRA-1311) + * JEMalloc support for off-heap allocation (CASSANDRA-3997) + * Single-pass compaction (CASSANDRA-4180) + * Removed token range bisection (CASSANDRA-5518) + * Removed compatibility with pre-1.2.5 sstables and network messages + (CASSANDRA-5511) + * removed PBSPredictor (CASSANDRA-5455) + * CAS support (CASSANDRA-5062, 5441, 5443) + * Leveled compaction performs size-tiered compactions in L0 + (CASSANDRA-5371, 5439) + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339) + * Log when a node is down longer than the hint window (CASSANDRA-4554) + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917) + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command (CASSANDRA-5331) + * Rebuild BF when loading sstables if bloom_filter_fp_chance + has changed since compaction (CASSANDRA-5015) + * remove row-level bloom filters (CASSANDRA-4885) + * Change Kernel Page Cache skipping into row preheating (disabled by default) + (CASSANDRA-4937) + * Improve repair by deciding on a gcBefore before sending + out TreeRequests (CASSANDRA-4932) + * Add an official way to disable compactions (CASSANDRA-5074) + * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919) + * Add binary protocol versioning (CASSANDRA-5436) + * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530) + * Add alias support to SELECT statement (CASSANDRA-5075) + * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541) + * Use range tombstones when dropping cfs/columns from schema (CASSANDRA-5579) + * cqlsh: drop CQL2/CQL3-beta support (CASSANDRA-5585) + + 1.2.6 + * Move System.exit on OOM into a separate thread (CASSANDRA-5273) * Write row markers when serializing schema (CASSANDRA-5572) * Check only SSTables for the requested range when streaming (CASSANDRA-5569) * Improve batchlog replay behavior and hint ttl handling (CASSANDRA-5314) http://git-wip-us.apache.org/repos/asf/cassandra/blob/44827b4a/src/java/org/apache/cassandra/service/CassandraDaemon.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fc450a0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fc450a0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fc450a0 Branch: refs/heads/trunk Commit: 2fc450a0bf85fb3caaa1b81274f40552a7b59ba4 Parents: 62f4293 c48c7ef Author: Yuki Morishita yu...@apache.org Authored: Wed May 22 14:08:31 2013 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Wed May 22 14:08:31 2013 -0500 -- CHANGES.txt|1 + .../org/apache/cassandra/db/DeletedColumn.java | 21 +++ .../org/apache/cassandra/db/RangeTombstone.java|1 - 3 files changed, 22 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fc450a0/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fc450a0/src/java/org/apache/cassandra/db/DeletedColumn.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fc450a0/src/java/org/apache/cassandra/db/RangeTombstone.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c609f27c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c609f27c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c609f27c Branch: refs/heads/trunk Commit: c609f27cd33eb78d29255424954da7f32b204230 Parents: f3b42d2 dac6992 Author: Jonathan Ellis jbel...@apache.org Authored: Tue May 21 14:18:54 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue May 21 14:18:54 2013 -0500 -- .../commitlog/BatchCommitLogExecutorService.java |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c609f27c/src/java/org/apache/cassandra/db/commitlog/BatchCommitLogExecutorService.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/db/ColumnFamilyStore.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7b67666 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7b67666 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7b67666 Branch: refs/heads/trunk Commit: c7b67666d8665f13a66aba218c64c5979c3f20bf Parents: 405c251 8b96334 Author: Yuki Morishita yu...@apache.org Authored: Thu May 16 11:42:42 2013 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Thu May 16 11:42:42 2013 -0500 -- CHANGES.txt|1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 90 ++- .../org/apache/cassandra/streaming/StreamOut.java | 31 +- .../cassandra/streaming/StreamingRepairTask.java |7 +- 4 files changed, 94 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b67666/CHANGES.txt -- diff --cc CHANGES.txt index 543765c,619e415..8d1410e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,53 -1,6 +1,54 @@@ +2.0 + * JEMalloc support for off-heap allocation (CASSANDRA-3997) + * Single-pass compaction (CASSANDRA-4180) + * Removed token range bisection (CASSANDRA-5518) + * Removed compatibility with pre-1.2.5 sstables and network messages + (CASSANDRA-5511) + * removed PBSPredictor (CASSANDRA-5455) + * CAS support (CASSANDRA-5062, 5441, 5443) + * Leveled compaction performs size-tiered compactions in L0 + (CASSANDRA-5371, 5439) + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339) + * Log when a node is down longer than the hint window (CASSANDRA-4554) + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917) + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command (CASSANDRA-5331) + * Rebuild BF when loading sstables if bloom_filter_fp_chance + has changed since compaction (CASSANDRA-5015) + * remove row-level bloom filters (CASSANDRA-4885) + * Change Kernel Page Cache skipping into row preheating (disabled by default) + (CASSANDRA-4937) + * Improve repair by deciding on a gcBefore before sending + out TreeRequests (CASSANDRA-4932) + * Add an official way to disable compactions (CASSANDRA-5074) + * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919) + * Add binary protocol versioning (CASSANDRA-5436) + * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530) + * Add alias support to SELECT statement (CASSANDRA-5075) + * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541) + + 1.2.6 * Write row markers when serializing schema (CASSANDRA-5572) + * Check only SSTables for the requested range when streaming (CASSANDRA-5569) 1.2.5 http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b67666/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 05784ce,055c415..36c1db0 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -1461,9 -1413,9 +1495,9 @@@ public class ColumnFamilyStore implemen final RowPosition startWith = range.left; final RowPosition stopAt = range.right; -QueryFilter filter = new QueryFilter(null, new QueryPath(columnFamily, superColumn, null), columnFilter); +QueryFilter filter = new QueryFilter(null, name,
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02547747 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02547747 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02547747 Branch: refs/heads/trunk Commit: 02547747198c0d14f9a4102a920b914bcfd57a23 Parents: 4adb583 3950de9 Author: Jonathan Ellis jbel...@apache.org Authored: Tue May 14 13:34:04 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue May 14 13:34:04 2013 -0500 -- CHANGES.txt |1 + src/java/org/apache/cassandra/dht/BytesToken.java |2 +- 2 files changed, 2 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02547747/CHANGES.txt -- diff --cc CHANGES.txt index c137922,6432775..019dc16 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,52 -1,5 +1,53 @@@ +2.0 + * JEMalloc support for off-heap allocation (CASSANDRA-3997) + * Single-pass compaction (CASSANDRA-4180) + * Removed token range bisection (CASSANDRA-5518) + * Removed compatibility with pre-1.2.5 sstables and network messages + (CASSANDRA-5511) + * removed PBSPredictor (CASSANDRA-5455) + * CAS support (CASSANDRA-5062, 5441, 5443) + * Leveled compaction performs size-tiered compactions in L0 + (CASSANDRA-5371, 5439) + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339) + * Log when a node is down longer than the hint window (CASSANDRA-4554) + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917) + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command (CASSANDRA-5331) + * Rebuild BF when loading sstables if bloom_filter_fp_chance + has changed since compaction (CASSANDRA-5015) + * remove row-level bloom filters (CASSANDRA-4885) + * Change Kernel Page Cache skipping into row preheating (disabled by default) + (CASSANDRA-4937) + * Improve repair by deciding on a gcBefore before sending + out TreeRequests (CASSANDRA-4932) + * Add an official way to disable compactions (CASSANDRA-5074) + * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919) + * Add binary protocol versioning (CASSANDRA-5436) + * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530) + * Add alias support to SELECT statement (CASSANDRA-5075) + * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541) + + 1.2.5 + * make BytesToken.toString only return hex bytes (CASSANDRA-5566) * Ensure that submitBackground enqueues at least one task (CASSANDRA-5554) * fix 2i updates with identical values and timestamps (CASSANDRA-5540) * fix compaction throttling bursty-ness (CASSANDRA-4316)
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17410338 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17410338 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17410338 Branch: refs/heads/trunk Commit: 174103386cceefb403ce9b689473508d1ea50160 Parents: 10cc4e0 11b0cfb Author: Yuki Morishita yu...@apache.org Authored: Mon May 13 21:00:21 2013 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Mon May 13 21:00:21 2013 -0500 -- CHANGES.txt|1 - .../cassandra/service/ActiveRepairService.java |9 - 2 files changed, 0 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17410338/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17410338/src/java/org/apache/cassandra/service/ActiveRepairService.java -- diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java index 1752911,000..b692ab0 mode 100644,00..100644 --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@@ -1,1144 -1,0 +1,1135 @@@ +/* + * 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.service; + +import java.io.*; +import java.net.InetAddress; +import java.security.MessageDigest; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.locks.Condition; + +import com.google.common.base.Objects; +import com.google.common.collect.Sets; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.concurrent.JMXConfigurableThreadPoolExecutor; +import org.apache.cassandra.concurrent.NamedThreadFactory; +import org.apache.cassandra.concurrent.Stage; +import org.apache.cassandra.concurrent.StageManager; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.*; +import org.apache.cassandra.db.compaction.AbstractCompactedRow; +import org.apache.cassandra.db.compaction.CompactionManager; +import org.apache.cassandra.dht.AbstractBounds; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; +import org.apache.cassandra.gms.*; +import org.apache.cassandra.io.IVersionedSerializer; +import org.apache.cassandra.locator.TokenMetadata; +import org.apache.cassandra.net.*; +import org.apache.cassandra.streaming.StreamingRepairTask; +import org.apache.cassandra.utils.*; + +/** + * ActiveRepairService encapsulates validating (hashing) individual column families, + * exchanging MerkleTrees with remote nodes via a tree request/response conversation, + * and then triggering repairs for disagreeing ranges. + * + * The node where repair was invoked acts as the 'initiator,' where valid trees are sent after generation + * and where the local and remote tree will rendezvous in rendezvous(). + * Once the trees rendezvous, a Differencer is executed and the service can trigger repairs + * for disagreeing ranges. + * + * Tree comparison and repair triggering occur in the single threaded Stage.ANTI_ENTROPY. + * + * The steps taken to enact a repair are as follows: + * 1. A repair is requested via JMX/nodetool: + * * The initiator sends TreeRequest messages to all neighbors of the target node: when a node + * receives a TreeRequest, it will perform a validation (read-only) compaction to immediately validate + * the column family. This is performed on the CompactionManager ExecutorService. + * 2. The validation process builds the merkle tree by: + * * Calling Validator.prepare(), which samples the column family to determine key distribution, + * * Calling Validator.add() in order for rows in repair range in the
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03a1fb10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03a1fb10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03a1fb10 Branch: refs/heads/trunk Commit: 03a1fb10fbb3fdc760e607e96190dcb5691da327 Parents: 0e4bf09 c3ff774 Author: Jonathan Ellis jbel...@apache.org Authored: Fri May 10 08:53:34 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri May 10 08:53:34 2013 -0500 -- NEWS.txt|4 conf/cassandra.yaml |4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03a1fb10/NEWS.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03a1fb10/conf/cassandra.yaml --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce6429dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce6429dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce6429dc Branch: refs/heads/trunk Commit: ce6429dc62cfdfdaed3c4d1c2bad6063792794dc Parents: a5a3a28 6db71b2 Author: Jonathan Ellis jbel...@apache.org Authored: Wed May 8 17:14:52 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed May 8 17:14:52 2013 -0500 -- CHANGES.txt |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce6429dc/CHANGES.txt --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32c3b6e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32c3b6e5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32c3b6e5 Branch: refs/heads/trunk Commit: 32c3b6e526e191532358730f0d4d9dfbf1aa7b0e Parents: 3563350 59bd0e7 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon May 6 09:16:07 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon May 6 09:16:07 2013 +0200 -- CHANGES.txt|2 ++ .../org/apache/cassandra/locator/Ec2Snitch.java| 15 --- .../cassandra/net/OutboundTcpConnectionPool.java |2 ++ .../cassandra/streaming/IncomingStreamReader.java |6 ++ 4 files changed, 10 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32c3b6e5/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32c3b6e5/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Conflicts:
bin/cqlsh
src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59172810
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59172810
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59172810
Branch: refs/heads/trunk
Commit: 5917281000bf51d10ffade5ac357f9cbf81daee6
Parents: 5dad160 24f6387
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed May 1 20:03:26 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed May 1 20:03:26 2013 +0300
--
CHANGES.txt|3 +
bin/cqlsh | 41 +--
pylib/cqlshlib/cql3handling.py |6 ++-
.../cql3/statements/AlterTableStatement.java | 27 ++
4 files changed, 71 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/59172810/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/59172810/bin/cqlsh
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/59172810/pylib/cqlshlib/cql3handling.py
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/59172810/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index 945d202,c6af2a0..03e1b4b
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -186,18 -191,81 +190,41 @@@ public class AlterTableStatement extend
cfProps.applyToCFMetadata(cfm);
break;
case RENAME:
-
-if (cfm.getKeyAliases().size() cfDef.keys.size()
!renamesAllAliases(cfDef, renames.keySet(), CFDefinition.Name.Kind.KEY_ALIAS,
cfDef.keys.size()))
++if (cfm.partitionKeyColumns().size() cfDef.keys.size()
!renamesAllAliases(cfDef, renames.keySet(), CFDefinition.Name.Kind.KEY_ALIAS,
cfDef.keys.size()))
+ throw new InvalidRequestException(When upgrading from
Thrift, all the columns of the (composite) partition key must be renamed
together.);
-if (cfm.getColumnAliases().size() cfDef.columns.size()
!renamesAllAliases(cfDef, renames.keySet(),
CFDefinition.Name.Kind.COLUMN_ALIAS, cfDef.columns.size()))
++if (cfm.clusteringKeyColumns().size() cfDef.columns.size()
!renamesAllAliases(cfDef, renames.keySet(),
CFDefinition.Name.Kind.COLUMN_ALIAS, cfDef.columns.size()))
+ throw new InvalidRequestException(When upgrading from
Thrift, all the columns of the (composite) clustering key must be renamed
together.);
+
for (Map.EntryColumnIdentifier, ColumnIdentifier entry :
renames.entrySet())
{
-CFDefinition.Name from = cfDef.get(entry.getKey());
+ColumnIdentifier from = entry.getKey();
ColumnIdentifier to = entry.getValue();
-if (from == null)
-throw new
InvalidRequestException(String.format(Column %s was not found in table %s,
entry.getKey(), columnFamily()));
-
-CFDefinition.Name exists = cfDef.get(to);
-if (exists != null)
-throw new
InvalidRequestException(String.format(Cannot rename column %s in table %s to
%s; another column of that name already exist, from, columnFamily(), to));
-
-switch (from.kind)
-{
-case KEY_ALIAS:
-cfm.keyAliases(rename(from.position, to,
cfm.getKeyAliases()));
-break;
-case COLUMN_ALIAS:
-cfm.columnAliases(rename(from.position, to,
cfm.getColumnAliases()));
-break;
-case VALUE_ALIAS:
-cfm.valueAlias(to.key);
-break;
-case COLUMN_METADATA:
-throw new
InvalidRequestException(String.format(Cannot rename non PRIMARY KEY part %s,
from));
-}
+cfm.renameColumn(from.key, from.toString(), to.key,
to.toString());
}
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/service/ActiveRepairService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9d97e38 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9d97e38 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9d97e38 Branch: refs/heads/trunk Commit: a9d97e381e1ee33e7e4c0ff42f29890a0bd289da Parents: 526f98f fbc4bbc Author: Yuki Morishita yu...@apache.org Authored: Tue Apr 30 14:29:43 2013 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Tue Apr 30 14:29:43 2013 -0500 -- CHANGES.txt|1 + .../cassandra/service/ActiveRepairService.java |9 + 2 files changed, 10 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9d97e38/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9d97e38/src/java/org/apache/cassandra/service/ActiveRepairService.java -- diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java index b692ab0,000..1752911 mode 100644,00..100644 --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@@ -1,1135 -1,0 +1,1144 @@@ +/* + * 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.service; + +import java.io.*; +import java.net.InetAddress; +import java.security.MessageDigest; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.locks.Condition; + +import com.google.common.base.Objects; +import com.google.common.collect.Sets; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.cassandra.concurrent.JMXConfigurableThreadPoolExecutor; +import org.apache.cassandra.concurrent.NamedThreadFactory; +import org.apache.cassandra.concurrent.Stage; +import org.apache.cassandra.concurrent.StageManager; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.*; +import org.apache.cassandra.db.compaction.AbstractCompactedRow; +import org.apache.cassandra.db.compaction.CompactionManager; +import org.apache.cassandra.dht.AbstractBounds; +import org.apache.cassandra.dht.Range; +import org.apache.cassandra.dht.Token; +import org.apache.cassandra.gms.*; +import org.apache.cassandra.io.IVersionedSerializer; +import org.apache.cassandra.locator.TokenMetadata; +import org.apache.cassandra.net.*; +import org.apache.cassandra.streaming.StreamingRepairTask; +import org.apache.cassandra.utils.*; + +/** + * ActiveRepairService encapsulates validating (hashing) individual column families, + * exchanging MerkleTrees with remote nodes via a tree request/response conversation, + * and then triggering repairs for disagreeing ranges. + * + * The node where repair was invoked acts as the 'initiator,' where valid trees are sent after generation + * and where the local and remote tree will rendezvous in rendezvous(). + * Once the trees rendezvous, a Differencer is executed and the service can trigger repairs + * for disagreeing ranges. + * + * Tree comparison and repair triggering occur in the single threaded Stage.ANTI_ENTROPY. + * + * The steps taken to enact a repair are as follows: + * 1. A repair is requested via JMX/nodetool: + * * The initiator sends TreeRequest messages to all neighbors of the target node: when a node + * receives a TreeRequest, it will perform a validation (read-only) compaction to immediately validate + * the column family. This is performed on the CompactionManager ExecutorService. + * 2. The validation process builds the merkle tree by: + * * Calling Validator.prepare(), which samples the column family to determine key
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/851fe640
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/851fe640
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/851fe640
Branch: refs/heads/trunk
Commit: 851fe64006f7d0493a9079d7520c70a1096c02b1
Parents: 011e8a0 4f5c847
Author: Dave Brosius dbros...@apache.org
Authored: Tue Apr 30 01:01:55 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Tue Apr 30 01:01:55 2013 -0400
--
build.xml |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/851fe640/build.xml
--
diff --cc build.xml
index 8889794,c8407b2..ec2e90a
--- a/build.xml
+++ b/build.xml
@@@ -122,12 -123,9 +123,13 @@@
/fileset
fileset dir=${build.dir.lib}
include name=**/*.jar /
+ exclude name=**/*-sources.jar/
/fileset
/path
+
+ path id=cobertura.classpath
+ pathelement location=${cobertura.classes.dir}/
+ /path
macrodef name=create-javadoc
attribute name=destdir/
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/net/MessagingService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d821a1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d821a1e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d821a1e Branch: refs/heads/trunk Commit: 5d821a1ea4f87679a8dfc4c8efd2c649990e1594 Parents: 2fa3321 68444f9 Author: Yuki Morishita yu...@apache.org Authored: Thu Apr 25 12:38:27 2013 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Thu Apr 25 12:38:27 2013 -0500 -- CHANGES.txt|1 + .../org/apache/cassandra/net/MessagingService.java |1 + 2 files changed, 2 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d821a1e/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d821a1e/src/java/org/apache/cassandra/net/MessagingService.java -- diff --cc src/java/org/apache/cassandra/net/MessagingService.java index c23f566,824ac90..32b0705 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@@ -212,10 -191,7 +212,11 @@@ public final class MessagingService imp put(Verb.INDEX_SCAN, IndexScanCommand.serializer); put(Verb.REPLICATION_FINISHED, null); put(Verb.COUNTER_MUTATION, CounterMutation.serializer); + put(Verb.SNAPSHOT, SnapshotCommand.serializer); +put(Verb.ECHO, EchoMessage.serializer); +put(Verb.PAXOS_PREPARE, Commit.serializer); +put(Verb.PAXOS_PROPOSE, Commit.serializer); +put(Verb.PAXOS_COMMIT, Commit.serializer); }}; /**
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ee4deb9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ee4deb9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ee4deb9 Branch: refs/heads/trunk Commit: 9ee4deb9cefe4b377cc5e5f34603d71fdf7ee2ce Parents: a9d6aef b7ef940 Author: Jonathan Ellis jbel...@apache.org Authored: Mon Apr 15 15:46:34 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Apr 15 15:46:34 2013 -0500 -- .../apache/cassandra/cache/SerializingCache.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/841ae04f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/841ae04f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/841ae04f Branch: refs/heads/trunk Commit: 841ae04f80275ed7f097e5a20e4a442d22114f77 Parents: 6b332dd b4ebbae Author: Dave Brosius dbros...@apache.org Authored: Mon Apr 15 19:19:36 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Mon Apr 15 19:19:36 2013 -0400 -- .../statements/CreateColumnFamilyStatement.java|3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/841ae04f/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/db/ColumnIndex.java
src/java/org/apache/cassandra/io/sstable/SSTableWriter.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/0aaf67a7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0aaf67a7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0aaf67a7
Branch: refs/heads/trunk
Commit: 0aaf67a74f441a8d3c4b54920f35c93f064be4f5
Parents: 8b0e186 0f1fb43
Author: Yuki Morishita yu...@apache.org
Authored: Thu Apr 11 11:12:36 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Thu Apr 11 11:12:36 2013 -0500
--
CHANGES.txt|3 +-
src/java/org/apache/cassandra/db/ColumnIndex.java | 24 +++---
.../apache/cassandra/io/sstable/SSTableWriter.java |2 +-
.../cassandra/streaming/StreamingTransferTest.java | 36 +++
4 files changed, 56 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0aaf67a7/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0aaf67a7/src/java/org/apache/cassandra/db/ColumnIndex.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnIndex.java
index e307458,bcd0eef..daaac63
--- a/src/java/org/apache/cassandra/db/ColumnIndex.java
+++ b/src/java/org/apache/cassandra/db/ColumnIndex.java
@@@ -58,12 -67,23 +58,21 @@@ public class ColumnInde
public Builder(ColumnFamily cf,
ByteBuffer key,
- int estimatedColumnCount,
+ DataOutput output)
+DataOutput output,
+boolean fromStream)
{
this.indexOffset = rowHeaderSize(key, cf.deletionInfo());
-this.result = new ColumnIndex(estimatedColumnCount);
+this.result = new ColumnIndex(new
ArrayListIndexHelper.IndexInfo());
this.output = output;
- this.tombstoneTracker = new
RangeTombstone.Tracker(cf.getComparator());
-this.atomSerializer = cf.getOnDiskSerializer();
+ this.tombstoneTracker = fromStream ? null : new
RangeTombstone.Tracker(cf.getComparator());
+ }
+
+ public Builder(ColumnFamily cf,
+ByteBuffer key,
- int estimatedColumnCount,
+DataOutput output)
+ {
-this(cf, key, estimatedColumnCount, output, false);
++this(cf, key, output, false);
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0aaf67a7/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
index 9b6db46,c64fd27..43e3aa5
--- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
@@@ -240,13 -236,12 +240,13 @@@ public class SSTableWriter extends SSTa
// deserialize each column to obtain maxTimestamp and immediately
serialize it.
long minTimestamp = Long.MAX_VALUE;
long maxTimestamp = Long.MIN_VALUE;
+int maxLocalDeletionTime = Integer.MIN_VALUE;
StreamingHistogram tombstones = new
StreamingHistogram(TOMBSTONE_HISTOGRAM_BIN_SIZE);
-ColumnFamily cf = ColumnFamily.create(metadata,
ArrayBackedSortedColumns.factory());
+ColumnFamily cf = ArrayBackedSortedColumns.factory.create(metadata);
cf.delete(deletionInfo);
- ColumnIndex.Builder columnIndexer = new ColumnIndex.Builder(cf,
key.key, dataFile.stream);
-ColumnIndex.Builder columnIndexer = new ColumnIndex.Builder(cf,
key.key, columnCount, dataFile.stream, true);
-OnDiskAtom.Serializer atomSerializer = cf.getOnDiskSerializer();
++ColumnIndex.Builder columnIndexer = new ColumnIndex.Builder(cf,
key.key, dataFile.stream, true);
+OnDiskAtom.Serializer atomSerializer = Column.onDiskSerializer();
for (int i = 0; i columnCount; i++)
{
// deserialize column with PRESERVE_SIZE because we've written
the dataSize based on the
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0aaf67a7/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
--
diff --cc test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
index 46e0e6c,2befe45..335f98c
---
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f479eb0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f479eb0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f479eb0 Branch: refs/heads/trunk Commit: 0f479eb0f139f690e130a021191ba31be4f8efe7 Parents: b27c61b 1533f12 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Apr 5 09:54:06 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Apr 5 09:54:06 2013 -0500 -- .../apache/cassandra/service/CassandraDaemon.java |4 ++-- .../apache/cassandra/service/StorageService.java |2 +- src/java/org/apache/cassandra/tools/NodeCmd.java |4 src/java/org/apache/cassandra/tools/NodeProbe.java | 10 ++ .../org/apache/cassandra/transport/Server.java |3 ++- .../org/apache/cassandra/tools/NodeToolHelp.yaml |6 ++ 6 files changed, 25 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f479eb0/src/java/org/apache/cassandra/service/CassandraDaemon.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f479eb0/src/java/org/apache/cassandra/service/StorageService.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f479eb0/src/java/org/apache/cassandra/tools/NodeProbe.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d0eb623
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d0eb623
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d0eb623
Branch: refs/heads/trunk
Commit: 3d0eb62313cc2ce1c58f5b0380a7641dbf4e25a8
Parents: 0f479eb 7039168
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Apr 5 19:38:59 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Apr 5 19:38:59 2013 +0300
--
CHANGES.txt|1 +
conf/cassandra.yaml|5 +-
.../auth/AllowAllInternodeAuthenticator.java | 36
.../cassandra/auth/IInternodeAuthenticator.java| 44 +++
src/java/org/apache/cassandra/config/Config.java |1 +
.../cassandra/config/DatabaseDescriptor.java | 12
.../org/apache/cassandra/net/MessagingService.java | 10 +++-
7 files changed, 107 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d0eb623/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d0eb623/conf/cassandra.yaml
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d0eb623/src/java/org/apache/cassandra/config/Config.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d0eb623/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 8bde2cc,a57ce9b..3ed7b81
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -85,388 -92,425 +86,394 @@@ public class DatabaseDescripto
private static String localDC;
private static ComparatorInetAddress localComparator;
-/**
- * Inspect the classpath to find storage configuration file
- */
-static URL getStorageConfigURL() throws ConfigurationException
+static
{
-String configUrl = System.getProperty(cassandra.config);
-if (configUrl == null)
-configUrl = DEFAULT_CONFIGURATION;
-
-URL url;
-try
-{
-url = new URL(configUrl);
-url.openStream().close(); // catches well-formed but bogus URLs
-}
-catch (Exception e)
+// In client mode, we use a default configuration. Note that the
fields of this class will be
+// left unconfigured however (the partitioner or localDC will be null
for instance) so this
+// should be used with care.
+if (Config.isClientMode())
{
-ClassLoader loader = DatabaseDescriptor.class.getClassLoader();
-url = loader.getResource(configUrl);
-if (url == null)
-throw new ConfigurationException(Cannot locate +
configUrl);
+conf = new Config();
}
-
-return url;
-}
-
-static
-{
-if (Config.getLoadYaml())
-loadYaml();
else
-conf = new Config();
-}
-static void loadYaml()
-{
-try
{
-URL url = getStorageConfigURL();
-logger.info(Loading settings from + url);
-InputStream input;
try
{
-input = url.openStream();
+applyConfig(loadConfig());
}
-catch (IOException e)
+catch (ConfigurationException e)
{
-// getStorageConfigURL should have ruled this out
-throw new AssertionError(e);
+logger.error(Fatal configuration error, e);
+System.err.println(e.getMessage() + \nFatal configuration
error; unable to start server. See log for stacktrace.);
+System.exit(1);
}
-org.yaml.snakeyaml.constructor.Constructor constructor = new
org.yaml.snakeyaml.constructor.Constructor(Config.class);
-TypeDescription seedDesc = new
TypeDescription(SeedProviderDef.class);
-seedDesc.putMapPropertyType(parameters, String.class,
String.class);
-constructor.addTypeDescription(seedDesc);
-Yaml yaml = new Yaml(new Loader(constructor));
-conf = (Config)yaml.load(input);
-
-
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95fc4894 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95fc4894 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95fc4894 Branch: refs/heads/trunk Commit: 95fc48947beff9cb7574b314eb3e23ee1b2e4b53 Parents: 338fa9a cc6429e Author: Yuki Morishita yu...@apache.org Authored: Fri Mar 29 09:58:16 2013 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Fri Mar 29 09:58:16 2013 -0500 -- CHANGES.txt|1 + .../compress/CompressedFileStreamTask.java |4 2 files changed, 5 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95fc4894/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95fc4894/src/java/org/apache/cassandra/streaming/compress/CompressedFileStreamTask.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1527fabf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1527fabf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1527fabf Branch: refs/heads/trunk Commit: 1527fabfce29483cdc62bd98ffeaff7fc7d40903 Parents: f6106a1 61e329f Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Mar 27 11:42:26 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Mar 27 11:42:26 2013 +0100 -- CHANGES.txt|2 + src/java/org/apache/cassandra/cql3/ResultSet.java | 11 +++--- .../cassandra/cql3/statements/SelectStatement.java | 25 -- 3 files changed, 28 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1527fabf/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1527fabf/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1d60f61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1d60f61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1d60f61 Branch: refs/heads/trunk Commit: e1d60f6192fd0aaa2962e0753497097d96f95f0b Parents: dda7b2b 08e7f4c Author: Aleksey Yeschenko alek...@apache.org Authored: Sun Mar 24 18:04:50 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sun Mar 24 18:05:50 2013 +0300 -- CHANGES.txt |3 ++- src/java/org/apache/cassandra/cli/CliClient.java |6 +++--- src/java/org/apache/cassandra/cli/CliUtils.java |6 ++ 3 files changed, 11 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1d60f61/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1d60f61/src/java/org/apache/cassandra/cli/CliClient.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17b51691 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17b51691 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17b51691 Branch: refs/heads/trunk Commit: 17b51691371b95ed4113bd98280e3dc80c9cd53f Parents: ae80948 0d51a54 Author: Jonathan Ellis jbel...@apache.org Authored: Sat Mar 23 18:07:55 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Sat Mar 23 18:07:55 2013 -0500 -- CHANGES.txt|1 + src/java/org/apache/cassandra/gms/Gossiper.java|4 ++-- .../org/apache/cassandra/tools/NodeToolHelp.yaml |2 +- 3 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17b51691/CHANGES.txt -- diff --cc CHANGES.txt index 12d4a04,c9bc5d7..e940f7b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,27 -1,5 +1,28 @@@ +2.0 + * Improve LeveledScanner work estimation (CASSANDRA-5250) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command (CASSANDRA-5331) + + 1.2.4 + * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187) * Fix mixing prepared statements between keyspaces (CASSANDRA-5352) * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354) * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362) http://git-wip-us.apache.org/repos/asf/cassandra/blob/17b51691/src/java/org/apache/cassandra/gms/Gossiper.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d2d07f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d2d07f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d2d07f5 Branch: refs/heads/trunk Commit: 5d2d07f5a67a8006fa52e35f70dfdddbf2259ca4 Parents: 3672731 f3a93f9 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Mar 20 10:46:30 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Mar 20 10:46:30 2013 -0500 -- src/java/org/apache/cassandra/tools/NodeCmd.java | 33 - 1 files changed, 31 insertions(+), 2 deletions(-) --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08721da2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08721da2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08721da2 Branch: refs/heads/trunk Commit: 08721da28d148b1825d7252d71955eacd211abd3 Parents: 5d2d07f 87d9362 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Mar 20 11:39:54 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Mar 20 11:39:54 2013 -0500 -- .../org/apache/cassandra/net/MessagingService.java |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08721da2/src/java/org/apache/cassandra/net/MessagingService.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/35543915 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35543915 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35543915 Branch: refs/heads/trunk Commit: 35543915bb7ca494b1e2c6ef188fb0288ff5f3f9 Parents: 076a0e4 4b88b5b Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Mar 20 14:03:21 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Mar 20 14:03:21 2013 -0500 -- debian/cassandra.install |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/35543915/debian/cassandra.install --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 e4b3d403f - c688125ba refs/heads/trunk c7230f2e2 - b88867ffa Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b88867ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b88867ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b88867ff Branch: refs/heads/trunk Commit: b88867ffa934bbcfc1abe6df4c8c18da62e7a9a0 Parents: c7230f2 c688125 Author: Jonathan Ellis jbel...@apache.org Authored: Wed Mar 13 13:34:28 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Mar 13 13:34:28 2013 -0500 -- CHANGES.txt|1 + .../apache/cassandra/io/sstable/Descriptor.java|4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b88867ff/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b88867ff/src/java/org/apache/cassandra/io/sstable/Descriptor.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk 23da64c81 - c7230f2e2 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7230f2e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7230f2e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7230f2e Branch: refs/heads/trunk Commit: c7230f2e287bc0358e6bba6c2b9879b8fa209863 Parents: 23da64c e4b3d40 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Mar 12 19:03:51 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Mar 12 19:03:51 2013 +0100 -- CHANGES.txt|1 + .../cassandra/service/AntiEntropyService.java |2 +- .../org/apache/cassandra/utils/MerkleTree.java |3 +++ 3 files changed, 5 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7230f2e/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7230f2e/src/java/org/apache/cassandra/service/AntiEntropyService.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk e79d9fbf8 - 1c017e0d8 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c017e0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c017e0d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c017e0d Branch: refs/heads/trunk Commit: 1c017e0d8a7c2dde08347b89b109c4a99d19bb00 Parents: e79d9fb feb7f29 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Mar 11 19:43:54 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Mar 11 19:43:54 2013 +0300 -- .../cassandra/config/DatabaseDescriptor.java | 14 -- 1 files changed, 0 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c017e0d/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 8d03008c2 - b5f172624 refs/heads/trunk 191296c53 - ba3430cb9 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba3430cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba3430cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba3430cb Branch: refs/heads/trunk Commit: ba3430cb969e1eb3a759bffa4ee501b64fc89573 Parents: 191296c b5f1726 Author: Yuki Morishita yu...@apache.org Authored: Mon Mar 11 16:22:51 2013 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Mon Mar 11 16:22:51 2013 -0500 -- CHANGES.txt|1 + .../apache/cassandra/service/StorageService.java |2 +- 2 files changed, 2 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba3430cb/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba3430cb/src/java/org/apache/cassandra/service/StorageService.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 b5f172624 - 09ee5db73 refs/heads/trunk ba3430cb9 - ff86f3f9a Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff86f3f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff86f3f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff86f3f9 Branch: refs/heads/trunk Commit: ff86f3f9a7db5cfbbd37ae096316fcb3bb94efba Parents: ba3430c 09ee5db Author: Jonathan Ellis jbel...@apache.org Authored: Mon Mar 11 17:19:45 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Mar 11 17:19:45 2013 -0500 -- conf/cassandra-env.sh |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff86f3f9/conf/cassandra-env.sh -- diff --cc conf/cassandra-env.sh index 4cda06a,f98bdb8..b532c32 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@@ -216,12 -216,13 +216,18 @@@ f # JVM_OPTS=$JVM_OPTS -XX:+PrintPromotionFailure # JVM_OPTS=$JVM_OPTS -XX:PrintFLSStatistics=1 # JVM_OPTS=$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log + # If you are using JDK 6u34 7u2 or later you can enable GC log rotation + # don't stick the date in the log name if rotation is on. + # JVM_OPTS=$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log + # JVM_OPTS=$JVM_OPTS -XX:+UseGCLogFileRotation + # JVM_OPTS=$JVM_OPTS -XX:NumberOfGCLogFiles=10 + # JVM_OPTS=$JVM_OPTS -XX:GCLogFileSize=10M +# Configure the following for JEMallocAllocator and if jemalloc is not available in the system +# library path (Example: /usr/local/lib/). Usually make install will do the right thing. +# export LD_LIBRARY_PATH=JEMALLOC_HOME/lib/ +# JVM_OPTS=-Djava.library.path=JEMALLOC_HOME/lib/ + # uncomment to have Cassandra JVM listen for remote debuggers/profilers on port 1414 # JVM_OPTS=$JVM_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1414
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 8261aa083 - 3a3f1d947 refs/heads/trunk 1a473094c - 25a31be4f Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25a31be4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25a31be4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25a31be4 Branch: refs/heads/trunk Commit: 25a31be4fe076ba36bd6a44cc3b3d2ba8134c7a9 Parents: 1a47309 3a3f1d9 Author: Jonathan Ellis jbel...@apache.org Authored: Mon Mar 4 11:45:23 2013 +0100 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Mar 4 11:45:23 2013 +0100 -- CHANGES.txt|1 + .../cassandra/metrics/ConnectionMetrics.java |4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25a31be4/CHANGES.txt -- diff --cc CHANGES.txt index 120f8a4,a6b2cff..9d7ed1d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,5 +1,19 @@@ +1.3 + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_tim_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace from user-defined compaction API (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + + 1.2.3 + * replace ipv6 colons in jmx object names (CASSANDRA-5298) * Avoid allocating SSTableBoundedScanner during repair when the range does not intersect the sstable (CASSANDRA-5249) * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292)
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches:
refs/heads/trunk 25a31be4f - 306a565a4
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/306a565a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/306a565a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/306a565a
Branch: refs/heads/trunk
Commit: 306a565a4e3bf41d52958a7924f47834a1e0206d
Parents: 25a31be 3c6f87e
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Mar 4 18:26:44 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Mar 4 18:26:44 2013 +0100
--
CHANGES.txt|2 +
build.xml |1 +
src/java/org/apache/cassandra/cql3/Constants.java | 20 ++--
src/java/org/apache/cassandra/cql3/Lists.java | 18 ++-
src/java/org/apache/cassandra/cql3/Maps.java | 15 -
src/java/org/apache/cassandra/cql3/Sets.java |7 ++-
.../cassandra/cql3/functions/FunctionCall.java |9 +++-
.../cassandra/cql3/statements/SelectStatement.java | 40 --
.../cassandra/cql3/statements/UpdateStatement.java | 15 -
9 files changed, 105 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/306a565a/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/306a565a/build.xml
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/306a565a/src/java/org/apache/cassandra/cql3/Constants.java
--
diff --cc src/java/org/apache/cassandra/cql3/Constants.java
index 896bd94,f630869..9904f05
--- a/src/java/org/apache/cassandra/cql3/Constants.java
+++ b/src/java/org/apache/cassandra/cql3/Constants.java
@@@ -277,9 -295,12 +280,12 @@@ public abstract class Constant
public void execute(ByteBuffer rowKey, ColumnFamily cf,
ColumnNameBuilder prefix, UpdateParameters params) throws
InvalidRequestException
{
- long increment =
ByteBufferUtil.toLong(t.bindAndGet(params.variables));
+ ByteBuffer bytes = t.bindAndGet(params.variables);
+ if (bytes == null)
+ throw new InvalidRequestException(Invalid null value for
counter increment);
+ long increment = ByteBufferUtil.toLong(bytes);
ByteBuffer cname = columnName == null ? prefix.build() :
prefix.add(columnName.key).build();
-cf.addCounter(new QueryPath(cf.metadata().cfName, null, cname),
increment);
+cf.addCounter(cname, increment);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/306a565a/src/java/org/apache/cassandra/cql3/Lists.java
--
diff --cc src/java/org/apache/cassandra/cql3/Lists.java
index 3eab387,76f947c..caa84b4
--- a/src/java/org/apache/cassandra/cql3/Lists.java
+++ b/src/java/org/apache/cassandra/cql3/Lists.java
@@@ -368,9 -377,12 +377,12 @@@ public abstract class List
public void execute(ByteBuffer rowKey, ColumnFamily cf,
ColumnNameBuilder prefix, UpdateParameters params) throws
InvalidRequestException
{
Term.Terminal index = t.bind(params.variables);
+ if (index == null)
+ throw new InvalidRequestException(Invalid null value for
list index);
+
assert index instanceof Constants.Value;
-ListPairByteBuffer, IColumn existingList =
params.getPrefetchedList(rowKey, columnName.key);
+ListPairByteBuffer, Column existingList =
params.getPrefetchedList(rowKey, columnName.key);
int idx = ByteBufferUtil.toInt(((Constants.Value)index).bytes);
if (idx 0 || idx = existingList.size())
throw new InvalidRequestException(String.format(List index
%d out of bound, list has size %d, idx, existingList.size()));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/306a565a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/306a565a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
--
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 500c3f315 - 4b2a9c1b0 refs/heads/trunk e8fa7edc8 - 772540830 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77254083 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77254083 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77254083 Branch: refs/heads/trunk Commit: 772540830ba4bc7a690345a0f302fe473e2d100d Parents: e8fa7ed 4b2a9c1 Author: Jonathan Ellis jbel...@apache.org Authored: Thu Feb 28 09:33:13 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Feb 28 09:33:13 2013 -0600 -- src/java/org/apache/cassandra/db/RowMutation.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/77254083/src/java/org/apache/cassandra/db/RowMutation.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk b096d0bf4 - 7d5490b58 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d5490b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d5490b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d5490b5 Branch: refs/heads/trunk Commit: 7d5490b585fd018119a8a4085ca2a572424165f4 Parents: b096d0b 88b9d95 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Feb 26 11:02:46 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Feb 26 11:02:46 2013 +0100 -- CHANGES.txt|5 + .../apache/cassandra/db/SliceFromReadCommand.java |3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d5490b5/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d5490b5/src/java/org/apache/cassandra/db/SliceFromReadCommand.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 457b546e6 - 686f516cc refs/heads/trunk 89e250b8b - 4042ef2dc Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4042ef2d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4042ef2d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4042ef2d Branch: refs/heads/trunk Commit: 4042ef2dccd0fa8cec3cdc8f94439fdf9795ac8d Parents: 89e250b 686f516 Author: Jonathan Ellis jbel...@apache.org Authored: Wed Feb 20 05:39:14 2013 -0800 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Feb 20 05:39:14 2013 -0800 -- CHANGES.txt|2 + .../org/apache/cassandra/db/ColumnFamilyStore.java |1 - .../db/compaction/AbstractCompactionStrategy.java |8 ++ .../db/compaction/AbstractCompactionTask.java | 34 ++-- .../cassandra/db/compaction/CompactionManager.java | 67 +++--- .../cassandra/db/compaction/CompactionTask.java|8 +-- .../db/compaction/LeveledCompactionStrategy.java | 43 +- .../compaction/SizeTieredCompactionStrategy.java | 42 +++--- .../LongLeveledCompactionStrategyTest.java |9 +-- test/unit/org/apache/cassandra/Util.java |4 +- .../db/compaction/CompactionsPurgeTest.java|4 +- 11 files changed, 114 insertions(+), 108 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4042ef2d/CHANGES.txt -- diff --cc CHANGES.txt index 6f9d076,0489968..30a861f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,19 @@@ +1.3 + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_tim_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace from user-defined compaction API (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + + 1.2.2 + * fix potential for multiple concurrent compactions of the same sstables +(CASSANDRA-5256) * avoid no-op caching of byte[] on commitlog append (CASSANDRA-5199) * fix symlinks under data dir not working (CASSANDRA-5185) * fix bug in compact storage metadata handling (CASSANDRA-5189) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4042ef2d/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4042ef2d/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4042ef2d/src/java/org/apache/cassandra/db/compaction/CompactionManager.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4042ef2d/src/java/org/apache/cassandra/db/compaction/CompactionTask.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4042ef2d/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4042ef2d/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4042ef2d/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4042ef2d/test/unit/org/apache/cassandra/Util.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4042ef2d/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java -- diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java index 6bc6e8b,827257f..9344ec3 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java @@@ -132,20 -134,20 +132,20 @@@ public class
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk 4042ef2dc - b6062a5ca Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6062a5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6062a5c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6062a5c Branch: refs/heads/trunk Commit: b6062a5ca5068453ee67afc711a8953ab78bfa91 Parents: 4042ef2 89ab670 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Feb 20 17:52:56 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Feb 20 17:52:56 2013 +0100 -- CHANGES.txt|2 + .../cassandra/cql3/statements/SelectStatement.java | 32 ++ 2 files changed, 25 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6062a5c/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6062a5c/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk abb94957f - 7fab776f0 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fab776f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fab776f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fab776f Branch: refs/heads/trunk Commit: 7fab776f0b442b58f3baa97eeae91edcd2de5f20 Parents: abb9495 0981e9a Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Feb 15 22:53:24 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Feb 15 22:53:24 2013 +0300 -- CHANGES.txt|2 ++ src/java/org/apache/cassandra/cli/CliOptions.java | 14 ++ .../org/apache/cassandra/cli/CliSessionState.java |8 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fab776f/CHANGES.txt --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 3925f5606 - 694e3a74a refs/heads/trunk 7242a0054 - 5673ab3b6 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5673ab3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5673ab3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5673ab3b Branch: refs/heads/trunk Commit: 5673ab3b618ca4c2fb0c739ad4cd48d6d7d757d5 Parents: 7242a00 694e3a7 Author: Jonathan Ellis jbel...@apache.org Authored: Thu Feb 14 11:17:55 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Feb 14 11:17:55 2013 -0600 -- .../cassandra/locator/DynamicEndpointSnitch.java |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 694e3a74a - 7ff2805c7 refs/heads/trunk 5673ab3b6 - 0411d5a2b Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0411d5a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0411d5a2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0411d5a2 Branch: refs/heads/trunk Commit: 0411d5a2b29c8dc2f2e202c6daa1cc38978537a9 Parents: 5673ab3 7ff2805 Author: Yuki Morishita yu...@apache.org Authored: Thu Feb 14 11:27:32 2013 -0600 Committer: Yuki Morishita yu...@apache.org Committed: Thu Feb 14 11:27:32 2013 -0600 -- CHANGES.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0411d5a2/CHANGES.txt -- diff --cc CHANGES.txt index ff0a9ba,aa25b63..6047e66 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,16 @@@ +1.3 + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_tim_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace from user-defined compaction API (CASSANDRA-5139) ++ * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + + 1.2.2 * avoid no-op caching of byte[] on commitlog append (CASSANDRA-5199) - * more robust solution to incomplete compactions + counters (CASSANDRA-5151) * fix symlinks under data dir not working (CASSANDRA-5185) * fix bug in compact storage metadata handling (CASSANDRA-5189) * Validate login for USE queries (CASSANDRA-5207)
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 7ff2805c7 - bc428351e refs/heads/trunk 0411d5a2b - 8caedfc2c Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8caedfc2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8caedfc2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8caedfc2 Branch: refs/heads/trunk Commit: 8caedfc2c02fe587aff94f73b5b5bf0f621a9884 Parents: 0411d5a bc42835 Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Feb 14 11:56:47 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Feb 14 11:56:47 2013 -0600 -- .../locator/DynamicEndpointSnitchMBean.java|2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 bc428351e - ee0be0624 refs/heads/trunk 8caedfc2c - 12e4c524b Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12e4c524 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12e4c524 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12e4c524 Branch: refs/heads/trunk Commit: 12e4c524badccfb13fe5c4a28c9ec2f65571403c Parents: 8caedfc ee0be06 Author: Yuki Morishita yu...@apache.org Authored: Thu Feb 14 13:43:15 2013 -0600 Committer: Yuki Morishita yu...@apache.org Committed: Thu Feb 14 13:43:15 2013 -0600 -- CHANGES.txt|1 + .../cassandra/io/compress/CompressionMetadata.java |1 + .../compress/CompressedInputStreamTest.java| 106 +++ 3 files changed, 108 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/12e4c524/CHANGES.txt --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 0b83682b4 - f2a57f04c refs/heads/trunk 36f632c9e - 7049ab44d Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7049ab44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7049ab44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7049ab44 Branch: refs/heads/trunk Commit: 7049ab44df7ac89229c16973ddedb772ee23db16 Parents: 36f632c f2a57f0 Author: Jonathan Ellis jbel...@apache.org Authored: Thu Feb 14 19:06:24 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Feb 14 19:06:24 2013 -0600 -- .../compaction/SizeTieredCompactionStrategy.java |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7049ab44/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk 22609801d - ae87a1f13 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae87a1f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae87a1f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae87a1f1 Branch: refs/heads/trunk Commit: ae87a1f130155685cbbeab27a36c7dd98f5a7c7b Parents: 2260980 361aca5 Author: Dave Brosius dbros...@apache.org Authored: Fri Feb 15 01:37:49 2013 -0500 Committer: Dave Brosius dbros...@apache.org Committed: Fri Feb 15 01:37:49 2013 -0500 -- .../cassandra/db/compaction/CompactionTask.java| 49 --- 1 files changed, 26 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae87a1f1/src/java/org/apache/cassandra/db/compaction/CompactionTask.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches:
refs/heads/trunk 5df067418 - c6204b595
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6204b59
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6204b59
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6204b59
Branch: refs/heads/trunk
Commit: c6204b595dc8bdc8484f97d8aca0e235cafeaa89
Parents: 5df0674 2659640
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Feb 14 01:20:47 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Feb 14 01:20:47 2013 +0300
--
CHANGES.txt|1 +
bin/cqlsh |2 +-
pylib/cqlshlib/cql3handling.py | 12 +-
src/java/org/apache/cassandra/auth/Auth.java | 132 +--
.../org/apache/cassandra/config/CFMetaData.java|8 +-
.../cassandra/config/DatabaseDescriptor.java |4 +-
.../org/apache/cassandra/config/KSMetaData.java|7 -
src/java/org/apache/cassandra/config/Schema.java |3 +-
.../org/apache/cassandra/cql3/QueryProcessor.java |4 +-
.../cql3/statements/ListUsersStatement.java|2 +-
.../apache/cassandra/service/CassandraDaemon.java |4 -
.../org/apache/cassandra/service/ClientState.java | 14 ++-
.../apache/cassandra/service/MigrationManager.java |7 +-
.../apache/cassandra/service/StorageService.java | 10 +-
.../cassandra/db/compaction/CompactionsTest.java |3 +
15 files changed, 156 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/pylib/cqlshlib/cql3handling.py
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/config/CFMetaData.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/config/KSMetaData.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/config/Schema.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/service/MigrationManager.java
--
diff --cc src/java/org/apache/cassandra/service/MigrationManager.java
index 2f41743,82d56e3..967ea44
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@@ -197,9 -198,14 +197,14 @@@ public class MigrationManager implement
public static void announceNewKeyspace(KSMetaData ksm) throws
ConfigurationException
{
+ announceNewKeyspace(ksm, FBUtilities.timestampMicros());
+ }
+
+ public static void announceNewKeyspace(KSMetaData ksm, long timestamp)
throws ConfigurationException
+ {
ksm.validate();
-if (Schema.instance.getTableDefinition(ksm.name) != null)
+if (Schema.instance.getKSMetaData(ksm.name) != null)
throw new AlreadyExistsException(ksm.name);
logger.info(String.format(Create new Keyspace: %s, ksm));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/service/StorageService.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
--
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 265964064 - 828572acd refs/heads/trunk c6204b595 - e9777087f Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9777087 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9777087 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9777087 Branch: refs/heads/trunk Commit: e9777087fa2244e98c5dbf9681e558ec404a9e85 Parents: c6204b5 828572a Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Feb 13 17:01:14 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Feb 13 17:01:14 2013 -0600 -- .../apache/cassandra/service/StorageService.java |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9777087/src/java/org/apache/cassandra/service/StorageService.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 99b3963b7 - 3925f5606 refs/heads/trunk 59af0b9c4 - 7242a0054 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7242a005 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7242a005 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7242a005 Branch: refs/heads/trunk Commit: 7242a0054d6d2499f621d6b128bdc39e7ec97f5c Parents: 59af0b9 3925f56 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Feb 13 22:56:49 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Feb 13 22:56:49 2013 -0600 -- CHANGES.txt|1 + .../apache/cassandra/service/StorageService.java |8 +--- 2 files changed, 6 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7242a005/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7242a005/src/java/org/apache/cassandra/service/StorageService.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 d0f7e9e14 - aa7c7d9cd refs/heads/trunk f425c9251 - 06d9bda83 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/06d9bda8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06d9bda8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06d9bda8 Branch: refs/heads/trunk Commit: 06d9bda8322e4d4d267668f3bf8dded109e2b473 Parents: f425c92 aa7c7d9 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Feb 12 12:25:41 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Feb 12 12:25:41 2013 -0600 -- CHANGES.txt |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/06d9bda8/CHANGES.txt -- diff --cc CHANGES.txt index a850c6b,0621c79..fe6d19e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -23,8 -15,8 +23,9 @@@ * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366) * CQL3 refactor to allow conversion function (CASSANDRA-5226) * Fix drop of sstables in some circumstance (CASSANDRA-5232) + * Add support for LZ4 compression (CASSANDRA-5038) * Implement caching of authorization results (CASSANDRA-4295) + * Add support for LZ4 compression (CASSANDRA-5038) 1.2.1
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 aa7c7d9cd - 85cfd383b refs/heads/trunk c1e5b0ffa - 7d81f8cb5 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d81f8cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d81f8cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d81f8cb Branch: refs/heads/trunk Commit: 7d81f8cb565f5d1aab278062e44e95729e12f6da Parents: c1e5b0f 85cfd38 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Feb 12 16:55:39 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Feb 12 16:55:39 2013 -0600 -- src/java/org/apache/cassandra/db/SystemTable.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d81f8cb/src/java/org/apache/cassandra/db/SystemTable.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk aae62a76c - 850440900 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85044090 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85044090 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85044090 Branch: refs/heads/trunk Commit: 850440900b2674146aeb88286e30269d8387f962 Parents: aae62a7 7347d96 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Feb 8 21:54:10 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Feb 8 21:54:10 2013 +0300 -- bin/cqlsh | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 7347d968d - 6bef66bce refs/heads/trunk 850440900 - 5f36ece0f Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f36ece0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f36ece0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f36ece0 Branch: refs/heads/trunk Commit: 5f36ece0fcfafa51c4b7283d367c6baecbbb2c80 Parents: 8504409 6bef66b Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Feb 8 18:02:49 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Feb 8 18:02:49 2013 -0600 -- conf/cassandra-env.sh |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f36ece0/conf/cassandra-env.sh --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 6bef66bce - 0820b20fb refs/heads/trunk 5f36ece0f - 4e9d01f50 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e9d01f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e9d01f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e9d01f5 Branch: refs/heads/trunk Commit: 4e9d01f506bf289c3ce4ac644ddea7519f16e112 Parents: 5f36ece 0820b20 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Feb 8 18:19:50 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Feb 8 18:19:50 2013 -0600 -- conf/cassandra-env.sh |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e9d01f5/conf/cassandra-env.sh --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches:
refs/heads/cassandra-1.2 f3091835e - cef8eb07d
refs/heads/trunk 95ffb5d2d - ed79a59d9
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed79a59d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed79a59d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed79a59d
Branch: refs/heads/trunk
Commit: ed79a59d95578502ae3ff087dcaccb8abc9dba40
Parents: 95ffb5d cef8eb0
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Feb 6 08:34:03 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Feb 6 08:34:03 2013 -0600
--
CHANGES.txt|1 +
.../cassandra/db/compaction/CompactionManager.java |1 -
.../apache/cassandra/service/StorageService.java | 67 ---
src/java/org/apache/cassandra/tools/NodeCmd.java |7 ++-
src/java/org/apache/cassandra/tools/NodeProbe.java | 69 --
5 files changed, 122 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed79a59d/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed79a59d/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed79a59d/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 1eca2b9,5f00c88..ef3237d
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2240,9 -2285,9 +2285,9 @@@ public class StorageService extends Not
public void forceTableFlush(final String tableName, final String...
columnFamilies)
throws IOException, ExecutionException, InterruptedException
{
- for (ColumnFamilyStore cfStore : getValidColumnFamilies(tableName,
columnFamilies))
+ for (ColumnFamilyStore cfStore : getValidColumnFamilies(true, false,
tableName, columnFamilies))
{
-logger.debug(Forcing flush on keyspace + tableName + , CF +
cfStore.getColumnFamilyName());
+logger.debug(Forcing flush on keyspace + tableName + , CF +
cfStore.name);
cfStore.forceBlockingFlush();
}
}
@@@ -2367,9 -2412,9 +2412,9 @@@
public AntiEntropyService.RepairFuture forceTableRepair(final
RangeToken range, final String tableName, boolean isSequential, boolean
isLocal, final String... columnFamilies) throws IOException
{
ArrayListString names = new ArrayListString();
- for (ColumnFamilyStore cfStore : getValidColumnFamilies(tableName,
columnFamilies))
+ for (ColumnFamilyStore cfStore : getValidColumnFamilies(false, false,
tableName, columnFamilies))
{
-names.add(cfStore.getColumnFamilyName());
+names.add(cfStore.name);
}
if (names.isEmpty())
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 7a90c7466 - f3091835e refs/heads/trunk 1f8b9e37f - 95ffb5d2d Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95ffb5d2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95ffb5d2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95ffb5d2 Branch: refs/heads/trunk Commit: 95ffb5d2dd62a4902745aa0401467d7bcb6687fb Parents: 1f8b9e3 f309183 Author: Yuki Morishita yu...@apache.org Authored: Tue Feb 5 22:09:53 2013 -0600 Committer: Yuki Morishita yu...@apache.org Committed: Tue Feb 5 22:09:53 2013 -0600 -- .../cassandra/db/compaction/CompactionsTest.java |8 +++- 1 files changed, 3 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95ffb5d2/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 b251e7aec - 82de0ec75 refs/heads/trunk 2dd226875 - 6d364f4a3 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d364f4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d364f4a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d364f4a Branch: refs/heads/trunk Commit: 6d364f4a324fd31f530bb1e91a9c16452ddff581 Parents: 2dd2268 82de0ec Author: Jonathan Ellis jbel...@apache.org Authored: Mon Feb 4 17:50:43 2013 +0100 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Feb 4 17:50:43 2013 +0100 -- .../compaction/SizeTieredCompactionStrategy.java | 10 +++--- 1 files changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d364f4a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 82de0ec75 - 75d0f7a3f refs/heads/trunk 58db3ce98 - d216b0d28 Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d216b0d2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d216b0d2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d216b0d2 Branch: refs/heads/trunk Commit: d216b0d28b82efc42608fc249a6d212152271c14 Parents: 58db3ce 75d0f7a Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Feb 4 13:07:38 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Feb 4 13:07:38 2013 -0600 -- CHANGES.txt |1 - 1 files changed, 0 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d216b0d2/CHANGES.txt --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 aa90c88be - 0d4923f24 refs/heads/trunk f112f992b - d52e12a86 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d52e12a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d52e12a8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d52e12a8 Branch: refs/heads/trunk Commit: d52e12a86bb600cd90254f4ebd80af27f4f63432 Parents: f112f99 0d4923f Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Feb 1 06:00:13 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Feb 1 06:00:13 2013 -0600 -- CHANGES.txt|1 + conf/cassandra.yaml|4 src/java/org/apache/cassandra/config/Config.java |2 ++ .../cassandra/config/DatabaseDescriptor.java | 10 ++ .../cassandra/net/IncomingTcpConnection.java | 12 .../cassandra/net/OutboundTcpConnection.java | 12 6 files changed, 41 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d52e12a8/CHANGES.txt -- diff --cc CHANGES.txt index 004bd3e,43eb1f5..09df85e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -12,8 -5,8 +12,9 @@@ * Validate login for USE queries (CASSANDRA-5207) * cli: remove default username and password (CASSANDRA-5208) * configure populate_io_cache_on_flush per-CF (CASSANDRA-4694) + * allow configuration of internode socket buffer (CASSANDRA-3378) + 1.2.1 * stream undelivered hints on decommission (CASSANDRA-5128) * GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d52e12a8/conf/cassandra.yaml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d52e12a8/src/java/org/apache/cassandra/config/Config.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d52e12a8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 f4a941e49 - 7752f018b refs/heads/trunk b7ba0a917 - 34f08529e Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34f08529 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34f08529 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34f08529 Branch: refs/heads/trunk Commit: 34f08529ee17b6f5e5f6c740a7dc66a2e856254a Parents: b7ba0a9 7752f01 Author: Yuki Morishita yu...@apache.org Authored: Mon Jan 28 10:12:43 2013 -0600 Committer: Yuki Morishita yu...@apache.org Committed: Mon Jan 28 10:12:43 2013 -0600 -- CHANGES.txt |4 src/java/org/apache/cassandra/db/Directories.java |2 +- 2 files changed, 5 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/34f08529/CHANGES.txt -- diff --cc CHANGES.txt index 9876e37,3a4ebe7..5ae58fe --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,6 +1,14 @@@ +1.3 + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_tim_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + + 1.2.2 + * fix symlinks under data dir not working (CASSANDRA-5185) + ++ 1.2.1 * stream undelivered hints on decommission (CASSANDRA-5128) * GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133)
