[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2 Conflicts: CHANGES.txt NEWS.txt build.xml conf/cassandra.yaml debian/changelog src/java/org/apache/cassandra/config/Config.java src/java/org/apache/cassandra/config/DatabaseDescriptor.java src/java/org/apache/cassandra/thrift/CassandraDaemon.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e771b079 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e771b079 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e771b079 Branch: refs/heads/trunk Commit: e771b07952ef3643ede5cf90226093de95397a41 Parents: 1b5edee 2dd73d1 Author: Sylvain Lebresne Authored: Sun May 26 13:17:15 2013 +0200 Committer: Sylvain Lebresne Committed: Sun May 26 13:17:15 2013 +0200 -- CHANGES.txt|1 + .../cassandra/hadoop/pig/CassandraStorage.java | 34 ++- 2 files changed, 24 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e771b079/CHANGES.txt -- diff --cc CHANGES.txt index 7b1970c,69df3de..f49a6f7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,123 -1,14 +1,124 @@@ -1.1.12 +1.2.6 + * 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) + * 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) + * Exclude localTimestamp from validation for tombstones (CASSANDRA-5398) + * cqlsh: add custom prompt support (CASSANDRA-5539) + * Reuse prepared statements in hot auth queries (CASSANDRA-5594) +Merged from 1.1: + * Remove buggy thrift max message length option (CASSANDRA-5529) + * Fix NPE in Pig's widerow mode (CASSANDRA-5488) + + +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) + * reduce memory consumption of IndexSummary (CASSANDRA-5506) + * remove per-row column name bloom filters (CASSANDRA-5492) + * Include fatal errors in trace events (CASSANDRA-5447) + * Ensure that PerRowSecondaryIndex is notified of row-level deletes + (CASSANDRA-5445) + * Allow empty blob literals in CQL3 (CASSANDRA-5452) + * Fix streaming RangeTombstones at column index boundary (CASSANDRA-5418) + * Fix preparing statements when current keyspace is not set (CASSANDRA-5468) + * Fix SemanticVersion.isSupportedBy minor/patch handling (CASSANDRA-5496) + * Don't provide oldCfId for post-1.1 system cfs (CASSANDRA-5490) + * Fix primary range ignores replication strategy (CASSANDRA-5424) + * Fix shutdown of binary protocol server (CASSANDRA-5507) + * Fix repair -snapshot not working (CASSANDRA-5512) + * Set isRunning flag later in binary protocol server (CASSANDRA-5467) + * Fix use of CQL3 functions with descending clustering order (CASSANDRA-5472) + * Disallow renaming columns one at a time for thrift table in CQL3 + (CASSANDRA-5531) + * cqlsh: add CLUSTERING ORDER BY support to DESCRIBE (CASSANDRA-5528) + * Add custom secondary index support to CQL3 (CASSANDRA-5484) + * Fix repair hanging silently on unexpected error (CASSANDRA-5229) + * Fix Ec2Snitch regression introduced by CASSANDRA-5171 (CASSANDRA-5432) + * Add nodetool enablebackup/disablebackup (CASSANDRA-5556) + * cqlsh: fix DESCRIBE after case insensitive USE (CASSANDRA-5567) +Merged from 1.1 + * Remove buggy thrift max message length option (CASSANDRA-5529) * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393) - * Use allocator information to improve memtable memory usage estimate + * Use allocator information to improve memtable memory usage estimate (CASSANDRA-5497) + * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) * fsync leveled manifest to avoid corruption (CASSANDRA-5535) * Fix Bound intersection computation (CASSANDRA-5551) - * Fix NPE in Pig's widerow mode (CASSANDRA-5488) + * sstablescrub now respects max memory size in cassandra.in.sh (CASSANDRA-5562) + + +1.2.4 + * Ensure that PerRowSecondaryIndex updates see the most recent values + (CASSANDRA-5397) + * avoid duplicate index entries ind PrecompactedRow and + ParallelCompactionIterable (CASSANDRA-5395) + * remove the index entry on oldColumn when new column is a tombstone + (CASSANDRA-5
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2 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/9d0eec21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d0eec21 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d0eec21 Branch: refs/heads/cassandra-1.2 Commit: 9d0eec217181e472faf4dcf720fe30f04296804a Parents: b69c1aa 7d2ce5f Author: Brandon Williams Authored: Tue May 21 11:10:47 2013 -0500 Committer: Brandon Williams Committed: Tue May 21 11:10:47 2013 -0500 -- CHANGES.txt|2 + examples/pig/test/test_storage.pig |2 +- .../cassandra/hadoop/pig/CassandraStorage.java | 23 ++ 3 files changed, 13 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d0eec21/CHANGES.txt -- diff --cc CHANGES.txt index 619e415,256e69a..24e9163 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,113 -1,13 +1,115 @@@ -1.1.12 +1.2.6 + * Write row markers when serializing schema (CASSANDRA-5572) + * Check only SSTables for the requested range when streaming (CASSANDRA-5569) ++Merged from 1.1 ++ * Fix NPE in Pig's widerow mode (CASSANDRA-5488) + + +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) + * reduce memory consumption of IndexSummary (CASSANDRA-5506) + * remove per-row column name bloom filters (CASSANDRA-5492) + * Include fatal errors in trace events (CASSANDRA-5447) + * Ensure that PerRowSecondaryIndex is notified of row-level deletes + (CASSANDRA-5445) + * Allow empty blob literals in CQL3 (CASSANDRA-5452) + * Fix streaming RangeTombstones at column index boundary (CASSANDRA-5418) + * Fix preparing statements when current keyspace is not set (CASSANDRA-5468) + * Fix SemanticVersion.isSupportedBy minor/patch handling (CASSANDRA-5496) + * Don't provide oldCfId for post-1.1 system cfs (CASSANDRA-5490) + * Fix primary range ignores replication strategy (CASSANDRA-5424) + * Fix shutdown of binary protocol server (CASSANDRA-5507) + * Fix repair -snapshot not working (CASSANDRA-5512) + * Set isRunning flag later in binary protocol server (CASSANDRA-5467) + * Fix use of CQL3 functions with descending clustering order (CASSANDRA-5472) + * Disallow renaming columns one at a time for thrift table in CQL3 + (CASSANDRA-5531) + * cqlsh: add CLUSTERING ORDER BY support to DESCRIBE (CASSANDRA-5528) + * Add custom secondary index support to CQL3 (CASSANDRA-5484) + * Fix repair hanging silently on unexpected error (CASSANDRA-5229) + * Fix Ec2Snitch regression introduced by CASSANDRA-5171 (CASSANDRA-5432) + * Add nodetool enablebackup/disablebackup (CASSANDRA-5556) + * cqlsh: fix DESCRIBE after case insensitive USE (CASSANDRA-5567) +Merged from 1.1 * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393) - * Use allocator information to improve memtable memory usage estimate + * Use allocator information to improve memtable memory usage estimate (CASSANDRA-5497) + * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) * fsync leveled manifest to avoid corruption (CASSANDRA-5535) * Fix Bound intersection computation (CASSANDRA-5551) - * Fix NPE in Pig's widerow mode (CASSANDRA-5488) + * sstablescrub now respects max memory size in cassandra.in.sh (CASSANDRA-5562) + + +1.2.4 + * Ensure that PerRowSecondaryIndex updates see the most recent values + (CASSANDRA-5397) + * avoid duplicate index entries ind PrecompactedRow and + ParallelCompactionIterable (CASSANDRA-5395) + * remove the index entry on oldColumn when new column is a tombstone + (CASSANDRA-5395) + * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036) + * 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) + * Improve asynchronous hint delivery (CASSANDRA-5179) + * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364) + * Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355) + * Make upgradeSSTable skip current version sstables by default (CASSANDRA-5366) + * Optimize min/max timestamp collection (CASSANDRA-5373) + * Invalid streamId in cql binary protocol when using invalid CL + (CASSANDRA-5164) + * Fix validation
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/927c4a4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/927c4a4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/927c4a4f Branch: refs/heads/cassandra-1.2 Commit: 927c4a4f98c9517eb84dbbdc8d500670332e79c1 Parents: fbc4bbc b6730aa Author: Brandon Williams Authored: Tue Apr 30 15:20:14 2013 -0500 Committer: Brandon Williams Committed: Tue Apr 30 15:20:14 2013 -0500 -- NEWS.txt |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/927c4a4f/NEWS.txt --
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2 Conflicts: CHANGES.txt build.xml debian/changelog src/java/org/apache/cassandra/net/OutboundTcpConnection.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83ff1da8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83ff1da8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83ff1da8 Branch: refs/heads/trunk Commit: 83ff1da821272e8a498775d6cbef28622882f82d Parents: a89b219 36f8a5d Author: Jason Brown Authored: Fri Apr 19 06:07:32 2013 -0700 Committer: Jason Brown Committed: Fri Apr 19 06:07:32 2013 -0700 -- CHANGES.txt|3 ++- .../cassandra/net/OutboundTcpConnection.java |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83ff1da8/CHANGES.txt -- diff --cc CHANGES.txt index 9929edf,203a00d..80c9b44 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,82 -1,8 +1,83 @@@ -1.1.12 +1.2.5 + * Include fatal errors in trace events (CASSANDRA-5447) + * Ensure that PerRowSecondaryIndex is notified of row-level deletes + (CASSANDRA-5445) + * Allow empty blob literals in CQL3 (CASSANDRA-5452) + * Fix streaming RangeTombstones at column index boundary (CASSANDRA-5418) + * Fix preparing statements when current keyspace is not set (CASSANDRA-5468) + * Fix SemanticVersion.isSupportedBy minor/patch handling (CASSANDRA-5496) - Merged from 1.1: ++Merged from 1.1 + * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393) - -1.1.11 * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) + + +1.2.4 + * Ensure that PerRowSecondaryIndex updates see the most recent values + (CASSANDRA-5397) + * avoid duplicate index entries ind PrecompactedRow and + ParallelCompactionIterable (CASSANDRA-5395) + * remove the index entry on oldColumn when new column is a tombstone + (CASSANDRA-5395) + * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036) + * 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) + * Improve asynchronous hint delivery (CASSANDRA-5179) + * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364) + * Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355) + * Make upgradeSSTable skip current version sstables by default (CASSANDRA-5366) + * Optimize min/max timestamp collection (CASSANDRA-5373) + * Invalid streamId in cql binary protocol when using invalid CL + (CASSANDRA-5164) + * Fix validation for IN where clauses with collections (CASSANDRA-5376) + * Copy resultSet on count query to avoid ConcurrentModificationException + (CASSANDRA-5382) + * Correctly typecheck in CQL3 even with ReversedType (CASSANDRA-5386) + * Fix streaming compressed files when using encryption (CASSANDRA-5391) + * cassandra-all 1.2.0 pom missing netty dependency (CASSANDRA-5392) + * Fix writetime/ttl functions on null values (CASSANDRA-5341) + * Fix NPE during cql3 select with token() (CASSANDRA-5404) + * IndexHelper.skipBloomFilters won't skip non-SHA filters (CASSANDRA-5385) + * cqlsh: Print maps ordered by key, sort sets (CASSANDRA-5413) + * Add null syntax support in CQL3 for inserts (CASSANDRA-3783) + * Allow unauthenticated set_keyspace() calls (CASSANDRA-5423) + * Fix potential incremental backups race (CASSANDRA-5410) + * Fix prepared BATCH statements with batch-level timestamps (CASSANDRA-5415) + * Allow overriding superuser setup delay (CASSANDRA-5430) + * cassandra-shuffle with JMX usernames and passwords (CASSANDRA-5431) +Merged from 1.1: + * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052) + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372) + * Fix cf name extraction from manifest in Directories.migrateFile() + (CASSANDRA-5242) + * Support pluggable internode authentication (CASSANDRA-5401) + + +1.2.3 + * add check for sstable overlap within a level on startup (CASSANDRA-5327) + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328) + * 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) + * Fix composite comparator with super columns (CASSANDRA-5287) + * Fix insufficient validation of UPDATE queries against counter cfs + (CASSANDRA-5300) + * Fix PropertyFileSnit
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f3c2071
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f3c2071
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f3c2071
Branch: refs/heads/cassandra-1.2
Commit: 9f3c2071bdd54c90a00392f10678819cf5c84847
Parents: d551382 4260413
Author: Jonathan Ellis
Authored: Fri Mar 22 09:25:54 2013 -0500
Committer: Jonathan Ellis
Committed: Fri Mar 22 09:25:54 2013 -0500
--
src/java/org/apache/cassandra/db/DefsTable.java|2 ++
.../apache/cassandra/tools/StandaloneScrubber.java |4 +++-
2 files changed, 5 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f3c2071/src/java/org/apache/cassandra/db/DefsTable.java
--
diff --cc src/java/org/apache/cassandra/db/DefsTable.java
index 914789b,88d184e..e64f3c9
--- a/src/java/org/apache/cassandra/db/DefsTable.java
+++ b/src/java/org/apache/cassandra/db/DefsTable.java
@@@ -313,11 -321,13 +313,13 @@@ public class DefsTabl
}
// store deserialized keyspaces into new place
-dumpToStorage(keyspaces);
+save(keyspaces);
+ flushSchemaCFs();
+
logger.info("Truncating deprecated system column families
(migrations, schema)...");
-dropColumnFamily(Table.SYSTEM_TABLE, OLD_MIGRATIONS_CF);
-dropColumnFamily(Table.SYSTEM_TABLE, OLD_SCHEMA_CF);
+dropColumnFamily(Table.SYSTEM_KS, OLD_MIGRATIONS_CF);
+dropColumnFamily(Table.SYSTEM_KS, OLD_SCHEMA_CF);
}
return keyspaces;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f3c2071/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
--
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d0571ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d0571ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d0571ac
Branch: refs/heads/cassandra-1.2
Commit: 9d0571acf4c60437d4685dad90f30172a5c2355d
Parents: d055df7 3b98e63
Author: Brandon Williams
Authored: Sat Feb 23 10:24:31 2013 -0600
Committer: Brandon Williams
Committed: Sat Feb 23 10:24:31 2013 -0600
--
src/java/org/apache/cassandra/tools/NodeCmd.java | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d0571ac/src/java/org/apache/cassandra/tools/NodeCmd.java
--
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 9b844b1,3582f6b..8cd8b56
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -1362,12 -1056,12 +1362,12 @@@ public class NodeCm
break;
case COMPACT :
try { probe.forceTableCompaction(keyspace,
columnFamilies); }
- catch (ExecutionException ee) { err(ee, "Error occured
during compaction"); }
+ catch (ExecutionException ee) { err(ee, "Error occurred
during compaction"); }
break;
case CLEANUP :
-if (keyspace.equals("system")) { break; } // Skip cleanup
on system cfs.
+if (keyspace.equals(Table.SYSTEM_KS)) { break; } // Skip
cleanup on system cfs.
try { probe.forceTableCleanup(keyspace, columnFamilies); }
- catch (ExecutionException ee) { err(ee, "Error occured
during cleanup"); }
+ catch (ExecutionException ee) { err(ee, "Error occurred
during cleanup"); }
break;
case SCRUB :
try { probe.scrub(keyspace, columnFamilies); }
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
src/java/org/apache/cassandra/db/HintedHandOffManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d3ef440
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d3ef440
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d3ef440
Branch: refs/heads/cassandra-1.2
Commit: 6d3ef440d127d6fe81d21b85357ebe6ccb43b747
Parents: 0820b20 577cb2c
Author: Brandon Williams
Authored: Mon Feb 11 13:05:51 2013 -0600
Committer: Brandon Williams
Committed: Mon Feb 11 13:05:51 2013 -0600
--
CHANGES.txt|1 +
.../apache/cassandra/db/HintedHandOffManager.java | 15 ++-
2 files changed, 7 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d3ef440/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d3ef440/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 483d8cd,eea4ec4..58e6ef0
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@@ -397,23 -377,16 +397,20 @@@ public class HintedHandOffManager imple
}
}
- if (rowsReplayed.get() > 0)
+ try
{
- try
- {
- compact().get();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
+ compact().get();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
}
-logger_.info(String.format("Finished hinted handoff of %s rows to
endpoint %s", rowsReplayed, endpoint));
+logger.info(String.format("Finished hinted handoff of %s rows to
endpoint %s", rowsReplayed, endpoint));
+if (hintedHandOffPaused)
+{
+logger.info("Hints delivery process is paused, not delivering
further hints");
+}
}
/**
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
src/java/org/apache/cassandra/tools/NodeProbe.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15214fee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15214fee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15214fee
Branch: refs/heads/cassandra-1.2
Commit: 15214fee107ba27aa9cc7f74524e071f31085257
Parents: fa1f9ba 6bddbb2
Author: Yuki Morishita
Authored: Fri Feb 1 15:34:44 2013 -0600
Committer: Yuki Morishita
Committed: Fri Feb 1 15:34:44 2013 -0600
--
CHANGES.txt|1 +
.../cassandra/service/AntiEntropyService.java |5 ++-
src/java/org/apache/cassandra/tools/NodeCmd.java |2 +-
src/java/org/apache/cassandra/tools/NodeProbe.java | 17 --
4 files changed, 19 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15214fee/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15214fee/src/java/org/apache/cassandra/service/AntiEntropyService.java
--
diff --cc src/java/org/apache/cassandra/service/AntiEntropyService.java
index a4af6b9,f3ca1c2..704ff86
--- a/src/java/org/apache/cassandra/service/AntiEntropyService.java
+++ b/src/java/org/apache/cassandra/service/AntiEntropyService.java
@@@ -663,12 -687,13 +663,13 @@@ public class AntiEntropyServic
{
if (!FailureDetector.instance.isAlive(endpoint))
{
+ String message = String.format("Cannot proceed on repair
because a neighbor (%s) is dead: session failed", endpoint);
differencingDone.signalAll();
- logger.info(String.format("[repair #%s] Cannot proceed on
repair because a neighbor (%s) is dead: session failed", getName(), endpoint));
- return;
+ logger.error(String.format("[repair #%s] ", getName()) +
message);
+ throw new IOException(message);
}
-if (Gossiper.instance.getVersion(endpoint) <
MessagingService.VERSION_11 && isSequential)
+if (MessagingService.instance().getVersion(endpoint) <
MessagingService.VERSION_11 && isSequential)
{
logger.info(String.format("[repair #%s] Cannot repair
using snapshots as node %s is pre-1.1", getName(), endpoint));
return;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15214fee/src/java/org/apache/cassandra/tools/NodeCmd.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15214fee/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java
index 7a7c60c,036d653..80abb87
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@@ -77,9 -79,8 +77,10 @@@ public class NodeProb
public MessagingServiceMBean msProxy;
private FailureDetectorMBean fdProxy;
private CacheServiceMBean cacheService;
+private PBSPredictorMBean PBSPredictorProxy;
private StorageProxyMBean spProxy;
+private HintedHandOffManagerMBean hhProxy;
+ private boolean failed;
/**
* Creates a NodeProbe using the specified JMX host, port, username, and
password.
@@@ -217,7 -214,8 +218,8 @@@
try
{
ssProxy.addNotificationListener(runner, null, null);
- runner.repairAndWait(ssProxy, isSequential, isLocal,
primaryRange);
-if (!runner.repairAndWait(ssProxy, isSequential, primaryRange))
++if (!runner.repairAndWait(ssProxy, isSequential, isLocal,
primaryRange))
+ failed = true;
}
catch (Exception e)
{
@@@ -864,9 -820,9 +872,9 @@@ class RepairRunner implements Notificat
this.columnFamilies = columnFamilies;
}
- public void repairAndWait(StorageServiceMBean ssProxy, boolean
isSequential, boolean isLocal, boolean primaryRangeOnly) throws
InterruptedException
-public boolean repairAndWait(StorageServiceMBean ssProxy, boolean
isSequential, boolean primaryRangeOnly) throws InterruptedException
++public boolean repairAndWait(StorageServiceMBean ssProxy, boolean
isSequential, boolean isLocal, boolean primaryRangeOnly) throws
InterruptedException
{
-cmd = ssProxy.forceRepairAsync(keyspace, isSequential,
primaryRangeOnly, columnFamilies);
+
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2 Conflicts: conf/cassandra.yaml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1559b497 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1559b497 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1559b497 Branch: refs/heads/cassandra-1.2 Commit: 1559b49713e40d306a2afeae821bc8a6c6e6f685 Parents: 3d9d517 3b36864 Author: Brandon Williams Authored: Tue Jan 22 19:26:20 2013 -0600 Committer: Brandon Williams Committed: Tue Jan 22 19:26:20 2013 -0600 -- conf/cassandra.yaml |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1559b497/conf/cassandra.yaml -- diff --cc conf/cassandra.yaml index cfe01a6,aa4db1c..bfc65d8 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@@ -39,14 -24,11 +39,15 @@@ initial_token # See http://wiki.apache.org/cassandra/HintedHandoff hinted_handoff_enabled: true # this defines the maximum amount of time a dead host will have hints - # generated. After it has been dead this long, hints will be dropped. + # generated. After it has been dead this long, new hints for it will not be + # created until it has been seen alive and gone down again. -max_hint_window_in_ms: 360 # one hour -# Sleep this long after delivering each hint -hinted_handoff_throttle_delay_in_ms: 1 +max_hint_window_in_ms: 1080 # 3 hours +# throttle in KB's per second, per delivery thread +hinted_handoff_throttle_in_kb: 1024 +# Number of threads with which to deliver hints; +# Consider increasing this number when you have multi-dc deployments, since +# cross-dc handoff tends to be slower +max_hints_delivery_threads: 2 # The following setting populates the page cache on memtable flush and compaction # WARNING: Enable this setting only when the whole node's data fits in memory.
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43123d1c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43123d1c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43123d1c Branch: refs/heads/cassandra-1.2 Commit: 43123d1cc3d3f60ecdd90a7ce588cb71517bc9ff Parents: a71e526 be01197 Author: Yuki Morishita Authored: Fri Jan 18 13:18:25 2013 -0600 Committer: Yuki Morishita Committed: Fri Jan 18 13:18:25 2013 -0600 -- --
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4df8fdcd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4df8fdcd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4df8fdcd Branch: refs/heads/cassandra-1.2 Commit: 4df8fdcdeed627885608dd43f397d40f2e1074c3 Parents: e6b6eaa f930eb7 Author: Yuki Morishita Authored: Fri Jan 18 11:47:46 2013 -0600 Committer: Yuki Morishita Committed: Fri Jan 18 11:47:46 2013 -0600 -- --
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c320d75 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c320d75 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c320d75 Branch: refs/heads/cassandra-1.2 Commit: 9c320d751279e9348b7772b59b55eb9e801181ca Parents: 5e57ad3 4ff5b0f Author: Brandon Williams Authored: Mon Jan 14 08:17:04 2013 -0600 Committer: Brandon Williams Committed: Mon Jan 14 08:17:04 2013 -0600 -- --
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2 Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionTask.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d9510ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d9510ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d9510ae Branch: refs/heads/cassandra-1.2 Commit: 8d9510ae40b22b5874fd16259c5c3c8a184ccb8d Parents: 18a1a4b 3cc8656 Author: Yuki Morishita Authored: Fri Jan 11 12:56:24 2013 -0600 Committer: Yuki Morishita Committed: Fri Jan 11 12:56:24 2013 -0600 -- CHANGES.txt|1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 35 ++- .../cassandra/db/compaction/CompactionTask.java| 33 -- 3 files changed, 44 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d9510ae/CHANGES.txt -- diff --cc CHANGES.txt index b34a97c,6c76151..3dfc756 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -41,158 -9,30 +41,159 @@@ Merged from 1.1 * fix user defined compaction to run against 1.1 data directory (CASSANDRA-5118) * Fix CQL3 BATCH authorization caching (CASSANDRA-5145) * fix get_count returns incorrect value with TTL (CASSANDRA-5099) + * better handling for amid compaction failure (CASSANDRA-5137) -1.1.8 - * reset getRangeSlice filter after finishing a row for get_paged_slice - (CASSANDRA-4919) +1.2.0 + * Disallow counters in collections (CASSANDRA-5082) + * cqlsh: add unit tests (CASSANDRA-3920) + * fix default bloom_filter_fp_chance for LeveledCompactionStrategy (CASSANDRA-5093) +Merged from 1.1: + * add validation for get_range_slices with start_key and end_token (CASSANDRA-5089) + + +1.2.0-rc2 + * fix nodetool ownership display with vnodes (CASSANDRA-5065) + * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060) + * Fix potential infinite loop when reloading CFS (CASSANDRA-5064) + * Fix SimpleAuthorizer example (CASSANDRA-5072) + * cqlsh: force CL.ONE for tracing and system.schema* queries (CASSANDRA-5070) + * Includes cassandra-shuffle in the debian package (CASSANDRA-5058) +Merged from 1.1: + * fix multithreaded compaction deadlock (CASSANDRA-4492) * fix temporarily missing schema after upgrade from pre-1.1.5 (CASSANDRA-5061) + * Fix ALTER TABLE overriding compression options with defaults + (CASSANDRA-4996, 5066) + * fix specifying and altering crc_check_chance (CASSANDRA-5053) + * fix Murmur3Partitioner ownership% calculation (CASSANDRA-5076) + * Don't expire columns sooner than they should in 2ndary indexes (CASSANDRA-5079) + + +1.2-rc1 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027) + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029) + * Fix preparing insert queries (CASSANDRA-5016) + * Fix preparing queries with counter increment (CASSANDRA-5022) + * Fix preparing updates with collections (CASSANDRA-5017) + * Don't generate UUID based on other node address (CASSANDRA-5002) + * Fix message when trying to alter a clustering key type (CASSANDRA-5012) + * Update IAuthenticator to match the new IAuthorizer (CASSANDRA-5003) + * Fix inserting only a key in CQL3 (CASSANDRA-5040) + * Fix CQL3 token() function when used with strings (CASSANDRA-5050) +Merged from 1.1: * reduce log spam from invalid counter shards (CASSANDRA-5026) * Improve schema propagation performance (CASSANDRA-5025) - * Fall back to old describe_splits if d_s_ex is not available (CASSANDRA-4803) - * Improve error reporting when streaming ranges fail (CASSANDRA-5009) + * Fix for IndexHelper.IndexFor throws OOB Exception (CASSANDRA-5030) + * cqlsh: make it possible to describe thrift CFs (CASSANDRA-4827) * cqlsh: fix timestamp formatting on some platforms (CASSANDRA-5046) - * Fix ALTER TABLE overriding compression options with defaults (CASSANDRA-4996, 5066) - * Avoid error opening data file on startup (CASSANDRA-4984) - * Fix wrong index_options in cli 'show schema' (CASSANDRA-5008) - * Allow overriding number of available processor (CASSANDRA-4790) -1.1.7 - * cqlsh: improve COPY FROM performance (CASSANDRA-4921) +1.2-beta3 + * make consistency level configurable in cqlsh (CASSANDRA-4829) + * fix cqlsh rendering of blob fields (CASSANDRA-4970) + * fix cqlsh DESCRIBE command (CASSANDRA-4913) + * save truncation position in system table (CASSANDRA-4906) + * Move CompressionMetadata off-heap (CASSANDRA-4937) + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924) + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402) + * acquire references to overlapping sstables during compaction so bloom filter + does
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
src/java/org/apache/cassandra/thrift/CassandraServer.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/18a1a4b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18a1a4b9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18a1a4b9
Branch: refs/heads/cassandra-1.2
Commit: 18a1a4b93e50d3b11ca570039dafa186f1624f41
Parents: 1891316 1cbbba0
Author: Yuki Morishita
Authored: Fri Jan 11 11:03:13 2013 -0600
Committer: Yuki Morishita
Committed: Fri Jan 11 11:03:13 2013 -0600
--
CHANGES.txt|1 +
.../apache/cassandra/thrift/CassandraServer.java |4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/18a1a4b9/CHANGES.txt
--
diff --cc CHANGES.txt
index b3d5dd7,82f503c..b34a97c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,197 -1,37 +1,198 @@@
-1.1.9
+1.2.1
+ * re-allow wrapping ranges for start_token/end_token range pairing
(CASSANDRA-5106)
+ * fix validation compaction of empty rows (CASSADRA-5136)
+ * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
+ * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
+ * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and
+ CompactionManagerMBean (CASSANDRA-5044)
+ * fix hinting for dropped local writes (CASSANDRA-4753)
+ * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
+ * apply disk_failure_policy to bad disks on initial directory creation
+ (CASSANDRA-4847)
+ * Optimize name-based queries to use ArrayBackedSortedColumns
(CASSANDRA-5043)
+ * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041)
+ * pool [Compressed]RandomAccessReader objects on the partitioned read path
+ (CASSANDRA-4942)
+ * Add debug logging to list filenames processed by Directories.migrateFile
+ method (CASSANDRA-4939)
+ * Expose black-listed directories via JMX (CASSANDRA-4848)
+ * Log compaction merge counts (CASSANDRA-4894)
+ * Minimize byte array allocation by AbstractData{Input,Output}
(CASSANDRA-5090)
+ * Add SSL support for the binary protocol (CASSANDRA-5031)
+ * Allow non-schema system ks modification for shuffle to work
(CASSANDRA-5097)
+ * cqlsh: Add default limit to SELECT statements (CASSANDRA-4972)
+ * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101)
+ * Correctly gossip with nodes >= 1.1.7 (CASSANDRA-5102)
+ * Ensure CL guarantees on digest mismatch (CASSANDRA-5113)
+ * Validate correctly selects on composite partition key (CASSANDRA-5122)
+ * Fix exception when adding collection (CASSANDRA-5117)
+ * Handle states for non-vnode clusters correctly (CASSANDRA-5127)
+ * Refuse unrecognized replication strategy options (CASSANDRA-4795)
+ * Pick the correct value validator in sstable2json for cql3 tables
(CASSANDRA-5134)
+ * Validate login for describe_keyspace, describe_keyspaces and set_keyspace
+ (CASSANDRA-5144)
+ * Fix inserting empty maps (CASSANDRA-5141)
+Merged from 1.1:
* Simplify CompressedRandomAccessReader to work around JDK FD bug
(CASSANDRA-5088)
* Improve handling a changing target throttle rate mid-compaction
(CASSANDRA-5087)
- * fix multithreaded compaction deadlock (CASSANDRA-4492)
- * fix specifying and altering crc_check_chance (CASSANDRA-5053)
- * Don't expire columns sooner than they should in 2ndary indexes
(CASSANDRA-5079)
* Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
* nodetool repair command now prints progress (CASSANDRA-4767)
+ * Ensure Jackson dependency matches lib (CASSANDRA-5126)
* fix user defined compaction to run against 1.1 data directory
(CASSANDRA-5118)
* Fix CQL3 BATCH authorization caching (CASSANDRA-5145)
+ * fix get_count returns incorrect value with TTL (CASSANDRA-5099)
-1.1.8
- * reset getRangeSlice filter after finishing a row for get_paged_slice
- (CASSANDRA-4919)
+1.2.0
+ * Disallow counters in collections (CASSANDRA-5082)
+ * cqlsh: add unit tests (CASSANDRA-3920)
+ * fix default bloom_filter_fp_chance for LeveledCompactionStrategy
(CASSANDRA-5093)
+Merged from 1.1:
+ * add validation for get_range_slices with start_key and end_token
(CASSANDRA-5089)
+
+
+1.2.0-rc2
+ * fix nodetool ownership display with vnodes (CASSANDRA-5065)
+ * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
+ * Fix potential infinite loop when reloading CFS (CASSANDRA-5064)
+ * Fix SimpleAuthorizer example (CASSANDRA-5072)
+ * cqlsh: force CL.ONE for tracing and system.schema* queries (CASSANDRA-5070)
+ * Includes cassandra-shuffle in the debian package (CAS
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2
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/1b41d6fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b41d6fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b41d6fe
Branch: refs/heads/cassandra-1.2
Commit: 1b41d6feabd612448025e8f4004e02a17198dc22
Parents: 94f0b85 f481a39
Author: Yuki Morishita
Authored: Thu Jan 10 11:49:44 2013 -0600
Committer: Yuki Morishita
Committed: Thu Jan 10 11:49:44 2013 -0600
--
CHANGES.txt|1 +
.../cassandra/db/compaction/CompactionManager.java | 19 --
.../cassandra/db/compaction/CompactionsTest.java | 46 +-
3 files changed, 55 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b41d6fe/CHANGES.txt
--
diff --cc CHANGES.txt
index a4d7963,58dbc7b..5100c1a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,191 -1,35 +1,192 @@@
-1.1.9
+1.2.1
+ * fix validation compaction of empty rows (CASSADRA-5136)
+ * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
+ * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
+ * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and
+ CompactionManagerMBean (CASSANDRA-5044)
+ * fix hinting for dropped local writes (CASSANDRA-4753)
+ * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
+ * apply disk_failure_policy to bad disks on initial directory creation
+ (CASSANDRA-4847)
+ * Optimize name-based queries to use ArrayBackedSortedColumns
(CASSANDRA-5043)
+ * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041)
+ * pool [Compressed]RandomAccessReader objects on the partitioned read path
+ (CASSANDRA-4942)
+ * Add debug logging to list filenames processed by Directories.migrateFile
+ method (CASSANDRA-4939)
+ * Expose black-listed directories via JMX (CASSANDRA-4848)
+ * Log compaction merge counts (CASSANDRA-4894)
+ * Minimize byte array allocation by AbstractData{Input,Output}
(CASSANDRA-5090)
+ * Add SSL support for the binary protocol (CASSANDRA-5031)
+ * Allow non-schema system ks modification for shuffle to work
(CASSANDRA-5097)
+ * cqlsh: Add default limit to SELECT statements (CASSANDRA-4972)
+ * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101)
+ * Correctly gossip with nodes >= 1.1.7 (CASSANDRA-5102)
+ * Ensure CL guarantees on digest mismatch (CASSANDRA-5113)
+ * Validate correctly selects on composite partition key (CASSANDRA-5122)
+ * Fix exception when adding collection (CASSANDRA-5117)
+ * Handle states for non-vnode clusters correctly (CASSANDRA-5127)
+ * Refuse unrecognized replication strategy options (CASSANDRA-4795)
+ * Pick the correct value validator in sstable2json for cql3 tables
(CASSANDRA-5134)
+Merged from 1.1:
* Simplify CompressedRandomAccessReader to work around JDK FD bug
(CASSANDRA-5088)
* Improve handling a changing target throttle rate mid-compaction
(CASSANDRA-5087)
- * fix multithreaded compaction deadlock (CASSANDRA-4492)
- * fix specifying and altering crc_check_chance (CASSANDRA-5053)
- * Don't expire columns sooner than they should in 2ndary indexes
(CASSANDRA-5079)
* Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
* nodetool repair command now prints progress (CASSANDRA-4767)
+ * Ensure Jackson dependency matches lib (CASSANDRA-5126)
+ * fix user defined compaction to run against 1.1 data directory
(CASSANDRA-5118)
-1.1.8
- * reset getRangeSlice filter after finishing a row for get_paged_slice
- (CASSANDRA-4919)
+1.2.0
+ * Disallow counters in collections (CASSANDRA-5082)
+ * cqlsh: add unit tests (CASSANDRA-3920)
+ * fix default bloom_filter_fp_chance for LeveledCompactionStrategy
(CASSANDRA-5093)
+Merged from 1.1:
+ * add validation for get_range_slices with start_key and end_token
(CASSANDRA-5089)
+
+
+1.2.0-rc2
+ * fix nodetool ownership display with vnodes (CASSANDRA-5065)
+ * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
+ * Fix potential infinite loop when reloading CFS (CASSANDRA-5064)
+ * Fix SimpleAuthorizer example (CASSANDRA-5072)
+ * cqlsh: force CL.ONE for tracing and system.schema* queries (CASSANDRA-5070)
+ * Includes cassandra-shuffle in the debian package (CASSANDRA-5058)
+Merged from 1.1:
+ * fix multithreaded compaction deadlock (CASSANDRA-4492)
* fix temporarily missing schema after upgrade from pre-1.1.5
(CASSANDRA-5061)
+ * Fix ALTER TABLE overriding compression options with defaults
+ (CASSANDRA-4996, 5066)
+ * fix specifying and altering crc_check_chance (CASSANDRA-50
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af8a477c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af8a477c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af8a477c Branch: refs/heads/cassandra-1.2 Commit: af8a477ccc9d771f1d8e05298bc92d3d98062bd4 Parents: 9852a93 bf1ed40 Author: Brandon Williams Authored: Fri Jan 4 12:14:18 2013 -0600 Committer: Brandon Williams Committed: Fri Jan 4 12:14:18 2013 -0600 -- --
[5/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9342dddc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9342dddc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9342dddc
Branch: refs/heads/cassandra-1.2
Commit: 9342dddc5c95c222536ebc4efd420493d2820e29
Parents: 1df03b3 e1206f3
Author: Brandon Williams
Authored: Fri Jan 4 07:39:26 2013 -0600
Committer: Brandon Williams
Committed: Fri Jan 4 07:39:26 2013 -0600
--
.../org/apache/cassandra/service/MoveTest.java | 147 ---
1 files changed, 76 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9342dddc/test/unit/org/apache/cassandra/service/MoveTest.java
--
diff --cc test/unit/org/apache/cassandra/service/MoveTest.java
index 65d934b,1a33d7f..e30bbde
--- a/test/unit/org/apache/cassandra/service/MoveTest.java
+++ b/test/unit/org/apache/cassandra/service/MoveTest.java
@@@ -88,23 -86,19 +88,20 @@@ public class MoveTes
ArrayList endpointTokens = new ArrayList();
ArrayList keyTokens = new ArrayList();
List hosts = new ArrayList();
+List hostIds = new ArrayList();
-Util.createInitialRing(ss, partitioner, endpointTokens, keyTokens,
hosts, RING_SIZE);
+Util.createInitialRing(ss, partitioner, endpointTokens, keyTokens,
hosts, hostIds, RING_SIZE);
Map> expectedEndpoints = new HashMap>();
- for (String table : Schema.instance.getNonSystemTables())
+ for (Token token : keyTokens)
{
- for (Token token : keyTokens)
+ List endpoints = new ArrayList();
+ Iterator tokenIter =
TokenMetadata.ringIterator(tmd.sortedTokens(), token, false);
+ while (tokenIter.hasNext())
{
- List endpoints = new ArrayList();
- Iterator tokenIter =
TokenMetadata.ringIterator(tmd.sortedTokens(), token, false);
- while (tokenIter.hasNext())
- {
- endpoints.add(tmd.getEndpoint(tokenIter.next()));
- }
- expectedEndpoints.put(token, endpoints);
+ endpoints.add(tmd.getEndpoint(tokenIter.next()));
}
+ expectedEndpoints.put(token, endpoints);
}
// node LEAVING_NODE should move to this token
