[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 5467fb52f -> 2821490b1 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2821490b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2821490b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2821490b Branch: refs/heads/trunk Commit: 2821490b1011b92aff58ec0ec76647818df6 Parents: 5467fb5 77ee310 Author: Sylvain Lebresne Authored: Tue Nov 6 11:22:55 2012 +0100 Committer: Sylvain Lebresne Committed: Tue Nov 6 11:22:55 2012 +0100 -- CHANGES.txt |1 - 1 files changed, 0 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2821490b/CHANGES.txt -- diff --cc CHANGES.txt index b64237e,c033172..a84b3b0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -67,77 -12,9 +67,76 @@@ Merged from 1.1 * (CQL) fix CREATE COLUMNFAMILY permissions check (CASSANDRA-4864) * Fix DynamicCompositeType same type comparison (CASSANDRA-4711) * Fix duplicate SSTable reference when stream session failed (CASSANDRA-3306) - * Allow static CF definition with compact storage (CASSANDRA-4910) - +1.2-beta1 + * add atomic_batch_mutate (CASSANDRA-4542, -4635) + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632) + * include message initiation time to replicas so they can more + accurately drop timed-out requests (CASSANDRA-2858) + * fix clientutil.jar dependencies (CASSANDRA-4566) + * optimize WriteResponse (CASSANDRA-4548) + * new metrics (CASSANDRA-4009) + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897) + * debug tracing (CASSANDRA-1123) + * parallelize row cache loading (CASSANDRA-4282) + * Make compaction, flush JBOD-aware (CASSANDRA-4292) + * run local range scans on the read stage (CASSANDRA-3687) + * clean up ioexceptions (CASSANDRA-2116) + * add disk_failure_policy (CASSANDRA-2118) + * Introduce new json format with row level deletion (CASSANDRA-4054) + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433) + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047) + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881) + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366) + * split up rpc timeout by operation type (CASSANDRA-2819) + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762) + * update MS protocol with a version handshake + broadcast address id + (CASSANDRA-4311) + * multithreaded hint replay (CASSANDRA-4189) + * add inter-node message compression (CASSANDRA-3127) + * remove COPP (CASSANDRA-2479) + * Track tombstone expiration and compact when tombstone content is + higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234) + * update MurmurHash to version 3 (CASSANDRA-2975) + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060) + * (CLI) jline version is bumped to 1.0 to properly support + 'delete' key function (CASSANDRA-4132) + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 4289) + * Add support for range tombstones (CASSANDRA-3708) + * Improve MessagingService efficiency (CASSANDRA-3617) + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794) + * Set thrift HSHA server thread limit to unlimited by default (CASSANDRA-4277) + * Avoids double serialization of CF id in RowMutation messages + (CASSANDRA-4293) + * stream compressed sstables directly with java nio (CASSANDRA-4297) + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885) + * Add column metadata to system column families (CASSANDRA-4018) + * (cql3) Always use composite types by default (CASSANDRA-4329) + * (cql3) Add support for set, map and list (CASSANDRA-3647) + * Validate date type correctly (CASSANDRA-4441) + * (cql3) Allow definitions with only a PK (CASSANDRA-4361) + * (cql3) Add support for row key composites (CASSANDRA-4179) + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038) + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680) + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477) + * remove schema agreement checking from all external APIs (Thrift, CQL and CQL3) (CASSANDRA-4487) + * add Murmur3Partitioner and make it default for new installations (CASSANDRA-3772, 4621) + * (cql3) update pseudo-map syntax to use map syntax (CASSANDRA-4497) + * Finer grained exceptions hierarchy and provides error code with exceptions (CASSANDRA-3979) + * Adds events push to binary protocol (CASSANDRA-4480) + * Rewrite nodetool help (C
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/trunk 998131635 -> 84e1ed4c6
Merge branch 'cassandra-1.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/84e1ed4c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84e1ed4c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84e1ed4c
Branch: refs/heads/trunk
Commit: 84e1ed4c6171f3efe41f1596c1340e320ac8d710
Parents: 9981316 110f69c
Author: Brandon Williams
Authored: Fri Nov 2 08:15:27 2012 -0500
Committer: Brandon Williams
Committed: Fri Nov 2 08:15:27 2012 -0500
--
src/java/org/apache/cassandra/gms/Gossiper.java|1 +
.../org/apache/cassandra/net/MessagingService.java | 12
.../apache/cassandra/service/StorageService.java |4 +++-
3 files changed, 16 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/84e1ed4c/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index 6c4bf43,813c4c6..e49a6b3
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -276,8 -314,9 +276,9 @@@ public class Gossiper implements IFailu
unreachableEndpoints.remove(endpoint);
// do not remove endpointState until the quarantine expires
FailureDetector.instance.remove(endpoint);
-versions.remove(endpoint);
+MessagingService.instance().resetVersion(endpoint);
quarantineEndpoint(endpoint);
+ MessagingService.instance().destroyConnectionPool(endpoint);
if (logger.isDebugEnabled())
logger.debug("removing endpoint " + endpoint);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/84e1ed4c/src/java/org/apache/cassandra/net/MessagingService.java
--
diff --cc src/java/org/apache/cassandra/net/MessagingService.java
index 10de977,c8c2cc1..da894e7
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@@ -464,13 -298,25 +464,25 @@@ public final class MessagingService imp
}
}
+ public void destroyConnectionPool(InetAddress to)
+ {
+ OutboundTcpConnectionPool cp = connectionManagers_.get(to);
+ if (to == null)
+ return;
+ cp.ackCon.closeSocket();
+ cp.cmdCon.closeSocket();
+ connectionManagers_.remove(to);
+ recentTimeoutsPerHost.remove(to.getHostAddress());
+ timeoutsPerHost.remove(to.getHostAddress());
+ }
+
public OutboundTcpConnectionPool getConnectionPool(InetAddress to)
{
-OutboundTcpConnectionPool cp = connectionManagers_.get(to);
+OutboundTcpConnectionPool cp = connectionManagers.get(to);
if (cp == null)
{
-connectionManagers_.putIfAbsent(to, new
OutboundTcpConnectionPool(to));
-cp = connectionManagers_.get(to);
+connectionManagers.putIfAbsent(to, new
OutboundTcpConnectionPool(to));
+cp = connectionManagers.get(to);
}
return cp;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/84e1ed4c/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 88abadb,30da45c..6302507
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1542,14 -1269,16 +1542,16 @@@ public class StorageService implements
// find the endpoint coordinating this removal that we need
to notify when we're done
String[] coordinator =
Gossiper.instance.getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.REMOVAL_COORDINATOR).value.split(VersionedValue.DELIMITER_STR,
-1);
-Token coordtoken =
getPartitioner().getTokenFactory().fromString(coordinator[1]);
+UUID hostId = UUID.fromString(coordinator[1]);
// grab any data we are now responsible for and notify
responsible node
-restoreReplicaCount(endpoint,
tokenMetadata_.getEndpoint(coordtoken));
+restoreReplicaCount(endpoint,
tokenMetadata.getEndpointForHostId(hostId));
}
- } // not a member, nothing to do
+ }
+ else // now that the gossiper has told us about this nonexistent
member, notify the gossiper to remove it
+ Gossiper.instance.removeEndpoint(endpoint);
}
-private void excise(Token token, InetAddress end
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/trunk 95f94a4da -> c86a7f8ca
Merge branch 'cassandra-1.1' into trunk
Conflicts:
src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c86a7f8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c86a7f8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c86a7f8c
Branch: refs/heads/trunk
Commit: c86a7f8ca5cbd48f6fba94599449ed17107d8b23
Parents: 95f94a4 5d5207b
Author: Sylvain Lebresne
Authored: Wed Oct 24 20:41:08 2012 +0200
Committer: Sylvain Lebresne
Committed: Wed Oct 24 20:41:08 2012 +0200
--
CHANGES.txt|1 +
.../db/marshal/AbstractCompositeType.java | 115 ++-
.../cassandra/db/marshal/CompositeTypeTest.java| 35 +-
3 files changed, 115 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c86a7f8c/CHANGES.txt
--
diff --cc CHANGES.txt
index faf4e31,95feb9b..e6c1d1a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -43,76 -6,8 +43,77 @@@ Merged from 1.1
* fix wrong leveled compaction progress calculation (CASSANDRA-4807)
* add a close() method to CRAR to prevent leaking file descriptors
(CASSANDRA-4820)
* fix potential infinite loop in get_count (CASSANDRA-4833)
+ * fix compositeType.{get/from}String methods (CASSANDRA-4842)
+
+1.2-beta1
+ * add atomic_batch_mutate (CASSANDRA-4542, -4635)
+ * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
+ * include message initiation time to replicas so they can more
+ accurately drop timed-out requests (CASSANDRA-2858)
+ * fix clientutil.jar dependencies (CASSANDRA-4566)
+ * optimize WriteResponse (CASSANDRA-4548)
+ * new metrics (CASSANDRA-4009)
+ * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897)
+ * debug tracing (CASSANDRA-1123)
+ * parallelize row cache loading (CASSANDRA-4282)
+ * Make compaction, flush JBOD-aware (CASSANDRA-4292)
+ * run local range scans on the read stage (CASSANDRA-3687)
+ * clean up ioexceptions (CASSANDRA-2116)
+ * add disk_failure_policy (CASSANDRA-2118)
+ * Introduce new json format with row level deletion (CASSANDRA-4054)
+ * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
+ * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
+ * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
+ * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
+ * split up rpc timeout by operation type (CASSANDRA-2819)
+ * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
+ * update MS protocol with a version handshake + broadcast address id
+ (CASSANDRA-4311)
+ * multithreaded hint replay (CASSANDRA-4189)
+ * add inter-node message compression (CASSANDRA-3127)
+ * remove COPP (CASSANDRA-2479)
+ * Track tombstone expiration and compact when tombstone content is
+ higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
+ * update MurmurHash to version 3 (CASSANDRA-2975)
+ * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
+ * (CLI) jline version is bumped to 1.0 to properly support
+ 'delete' key function (CASSANDRA-4132)
+ * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392,
4289)
+ * Add support for range tombstones (CASSANDRA-3708)
+ * Improve MessagingService efficiency (CASSANDRA-3617)
+ * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794)
+ * Set thrift HSHA server thread limit to unlimited by default
(CASSANDRA-4277)
+ * Avoids double serialization of CF id in RowMutation messages
+ (CASSANDRA-4293)
+ * stream compressed sstables directly with java nio (CASSANDRA-4297)
+ * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885)
+ * Add column metadata to system column families (CASSANDRA-4018)
+ * (cql3) Always use composite types by default (CASSANDRA-4329)
+ * (cql3) Add support for set, map and list (CASSANDRA-3647)
+ * Validate date type correctly (CASSANDRA-4441)
+ * (cql3) Allow definitions with only a PK (CASSANDRA-4361)
+ * (cql3) Add support for row key composites (CASSANDRA-4179)
+ * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038)
+ * (cql3) Add support for 2ndary indexes (CASSANDRA-3680)
+ * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477)
+ * remove schema agreement checking from all external APIs (Thrift, CQL and
CQL3) (CASSANDRA-4487)
+ * add Murmur3Partitioner and make it default for new installations
(CASSANDRA-3772, 4621)
+ * (cql3) update pseudo-map syntax to use map syntax (CASSANDRA-4497)
+ * Finer graine
[1/2] git commit: merge branch cassandra-1.1 into trunk
Updated Branches: refs/heads/trunk e63a1ae1c -> ebd11d3ad merge branch cassandra-1.1 into trunk Conflicts: src/java/org/apache/cassandra/service/ClientState.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ebd11d3a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ebd11d3a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ebd11d3a Branch: refs/heads/trunk Commit: ebd11d3ada416560c2441d46f32b99cb3c6e747c Parents: e63a1ae 487c916 Author: Eric Evans Authored: Thu Oct 18 21:48:46 2012 -0500 Committer: Eric Evans Committed: Thu Oct 18 21:48:46 2012 -0500 -- --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 5e425cb15 -> 78783556b Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78783556 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78783556 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78783556 Branch: refs/heads/trunk Commit: 78783556b5707ada88a552e36f4f3803a02e9db6 Parents: 5e425cb 46fc843 Author: Dave Brosius Authored: Tue Oct 9 22:07:08 2012 -0400 Committer: Dave Brosius Committed: Tue Oct 9 22:07:08 2012 -0400 -- CHANGES.txt|1 + .../cql3/statements/ModificationStatement.java |6 + .../org/apache/cassandra/db/ExpiringColumn.java|2 + .../apache/cassandra/thrift/ThriftValidation.java | 17 ++ 4 files changed, 21 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/78783556/CHANGES.txt -- diff --cc CHANGES.txt index a321193,7863d56..7189012 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,102 -1,5 +1,103 @@@ +1.2-beta2 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 4610) + * cassandra-cli: allow Double value type to be inserted to a column (CASSANDRA-4661) + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608) + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667) + * include metadata for system keyspace itself in schema tables (CASSANDRA-4416) + * add check to PropertyFileSnitch to verify presence of location for + local node (CASSANDRA-4728) + * add PBSPredictor consistency modeler (CASSANDRA-4261) + * remove vestiges of Thrift unframed mode (CASSANDRA-4729) + * optimize single-row PK lookups (CASSANDRA-4710) + * adjust blockFor calculation to account for pending ranges due to node + movement (CASSANDRA-833) + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649) + * (CQL3) Make prepared statement global instead of per connection + (CASSANDRA-4449) + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685) + * (CQL3) Fix validation when using counter and regular columns in the same + table (CASSANDRA-4706) + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648) + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738) + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208) + * Support repairing only the local DC nodes (CASSANDRA-4747) + * Use rpc_address for binary protocol and change default port (CASSANRA-4751) + * Fix use of collections in prepared statements (CASSANDRA-4739) + * Store more information into peers table (CASSANDRA-4351) + * Configurable bucket size for size tiered compaction (CASSANDRA-4704) + + +1.2-beta1 + * add atomic_batch_mutate (CASSANDRA-4542, -4635) + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632) + * include message initiation time to replicas so they can more + accurately drop timed-out requests (CASSANDRA-2858) + * fix clientutil.jar dependencies (CASSANDRA-4566) + * optimize WriteResponse (CASSANDRA-4548) + * new metrics (CASSANDRA-4009) + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897) + * debug tracing (CASSANDRA-1123) + * parallelize row cache loading (CASSANDRA-4282) + * Make compaction, flush JBOD-aware (CASSANDRA-4292) + * run local range scans on the read stage (CASSANDRA-3687) + * clean up ioexceptions (CASSANDRA-2116) + * add disk_failure_policy (CASSANDRA-2118) + * Introduce new json format with row level deletion (CASSANDRA-4054) + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433) + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047) + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881) + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366) + * split up rpc timeout by operation type (CASSANDRA-2819) + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762) + * update MS protocol with a version handshake + broadcast address id + (CASSANDRA-4311) + * multithreaded hint replay (CASSANDRA-4189) + * add inter-node message compression (CASSANDRA-3127) + * remove COPP (CASSANDRA-2479) + * Track tombstone expiration and compact when tombstone content is + higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234) + * update MurmurHash to version 3 (CASSANDRA-2975) + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060) + * (CLI) jline version is bumped to 1.0 to properly support + 'delete' key function (CASSANDRA-4132) + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 4289)
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk e3f642b8c -> 1b56ad122 Merge branch 'cassandra-1.1' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/CFPropDefs.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b56ad12 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b56ad12 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b56ad12 Branch: refs/heads/trunk Commit: 1b56ad122ee966757865e8de589d1d93af3f3242 Parents: e3f642b 6eafeb2 Author: Sylvain Lebresne Authored: Fri Oct 5 18:55:48 2012 +0200 Committer: Sylvain Lebresne Committed: Fri Oct 5 18:55:48 2012 +0200 -- CHANGES.txt |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b56ad12/CHANGES.txt --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/trunk db36acbf1 -> 038aa6bca
Merge branch 'cassandra-1.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/038aa6bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/038aa6bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/038aa6bc
Branch: refs/heads/trunk
Commit: 038aa6bca3d1857d929764e18be71d19e6573bdc
Parents: db36acb eff4b68
Author: Sylvain Lebresne
Authored: Thu Oct 4 17:03:34 2012 +0200
Committer: Sylvain Lebresne
Committed: Thu Oct 4 17:03:34 2012 +0200
--
CHANGES.txt|2 +-
.../cassandra/cql3/statements/SelectStatement.java | 17 +-
2 files changed, 12 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/038aa6bc/CHANGES.txt
--
diff --cc CHANGES.txt
index 32d76b4,c0a252e..85ca018
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -105,9 -13,10 +105,9 @@@
* fix re-created keyspace disappering after 1.1.5 upgrade (CASSANDRA-4698)
* (CLI) display elapsed time in 2 fraction digits (CASSANDRA-3460)
* add authentication support to sstableloader (CASSANDRA-4712)
- * Fix CQL3 'is reversed' logic (CASSANDRA-4716)
+ * Fix CQL3 'is reversed' logic (CASSANDRA-4716, 4759)
* (CQL3) Don't return ReversedType in result set metadata (CASSANDRA-4717)
* Pluggable Thrift transport factories for CLI (CASSANDRA-4609)
- * Backport adding AlterKeyspace statement (CASSANDRA-4611)
Merged from 1.0:
* Switch from NBHM to CHM in MessagingService's callback map, which
prevents OOM in long-running instances (CASSANDRA-4708)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/038aa6bc/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 08b8211,92a8d67..301c7c4
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -499,8 -491,16 +499,13 @@@ public class SelectStatement implement
}
}
-private ByteBuffer getRequestedBound(Bound bound, List
variables) throws InvalidRequestException
+private ByteBuffer buildBound(Bound bound, Restriction[] restrictions,
ColumnNameBuilder builder, List variables) throws
InvalidRequestException
{
-assert isColumnRange();
-
+ // The end-of-component of composite doesn't depend on whether the
+ // component type is reversed or not (i.e. the ReversedType is applied
+ // to the component comparator but not to the end-of-component
itself),
+ // it only depends on whether the slice is reversed
+ Bound eocBound = isReversed ? Bound.reverse(bound) : bound;
-ColumnNameBuilder builder = cfDef.getColumnNameBuilder();
for (CFDefinition.Name name : cfDef.columns.values())
{
// In a restriction, we always have Bound.START < Bound.END for
the "base" comparator.
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/trunk ab13579a3 -> f3e24bd51
Merge branch 'cassandra-1.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3e24bd5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3e24bd5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3e24bd5
Branch: refs/heads/trunk
Commit: f3e24bd5162eede8ad13abc9c85c90dd971fc110
Parents: ab13579 6ddcf03
Author: Sylvain Lebresne
Authored: Tue Oct 2 18:51:58 2012 +0200
Committer: Sylvain Lebresne
Committed: Tue Oct 2 18:51:58 2012 +0200
--
CHANGES.txt|1 +
.../cassandra/cql3/statements/SelectStatement.java | 31 ++-
2 files changed, 22 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3e24bd5/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3e24bd5/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 4af9afd,fac0deb..08b8211
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -280,26 -319,19 +286,26 @@@ public class SelectStatement implement
return bounds;
}
-private SlicePredicate makeSlicePredicate(List variables)
+private IFilter makeFilter(List variables)
throws InvalidRequestException
{
-SlicePredicate thriftSlicePredicate = new SlicePredicate();
-
if (isColumnRange())
{
-SliceRange sliceRange = new SliceRange();
-sliceRange.start = getRequestedBound(isReversed ? Bound.END :
Bound.START, variables);
-sliceRange.finish = getRequestedBound(isReversed ? Bound.START :
Bound.END, variables);
-sliceRange.reversed = isReversed;
-sliceRange.count = -1; // We use this for range slices, where the
count is ignored in favor of the global column count
-thriftSlicePredicate.slice_range = sliceRange;
+// For sparse, we used to ask for 'defined columns' * 'asked
limit' (where defined columns includes the row marker)
+// to account for the grouping of columns.
+// Since that doesn't work for maps/sets/lists, we now use the
compositesToGroup option of SliceQueryFilter.
+// But we must preserve backward compatibility too (for mixed
version cluster that is).
+int multiplier = cfDef.isCompact ? 1 : (cfDef.metadata.size() +
1);
+int toGroup = cfDef.isCompact ? -1 : cfDef.columns.size();
- ColumnSlice slice = new ColumnSlice(getRequestedBound(isReversed
? Bound.END : Bound.START, variables),
- getRequestedBound(isReversed
? Bound.START : Bound.END, variables));
++ColumnSlice slice = new
ColumnSlice(getRequestedBound(Bound.START, variables),
++getRequestedBound(Bound.END,
variables));
+SliceQueryFilter filter = new SliceQueryFilter(new
ColumnSlice[]{slice},
+ isReversed,
+ getLimit(),
+ toGroup,
+ multiplier);
+QueryProcessor.validateSliceFilter(cfDef.cfm, filter);
+return filter;
}
else
{
@@@ -493,10 -484,18 +499,15 @@@
}
}
- private ByteBuffer buildBound(Bound b, Restriction[] restrictions,
ColumnNameBuilder builder, List variables) throws
InvalidRequestException
-private ByteBuffer getRequestedBound(Bound bound, List
variables) throws InvalidRequestException
++private ByteBuffer buildBound(Bound bound, Restriction[] restrictions,
ColumnNameBuilder builder, List variables) throws
InvalidRequestException
{
- for (Restriction r : restrictions)
-assert isColumnRange();
-
-ColumnNameBuilder builder = cfDef.getColumnNameBuilder();
+ for (CFDefinition.Name name : cfDef.columns.values())
{
+ // In a restriction, we always have Bound.START < Bound.END for
the "base" comparator.
+ // So if we're doing a reverse slice, we must inverse the bounds
when giving them as start and end of the slice filter.
+ // But if the actual
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 208d77b7a -> 55df844e0 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55df844e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55df844e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55df844e Branch: refs/heads/trunk Commit: 55df844e0793782f23a5f760989a362786058681 Parents: 208d77b 9eba7ab Author: Sylvain Lebresne Authored: Tue Sep 11 17:34:22 2012 +0200 Committer: Sylvain Lebresne Committed: Tue Sep 11 17:34:22 2012 +0200 -- CHANGES.txt |1 + debian/cassandra.install |1 + 2 files changed, 2 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/55df844e/CHANGES.txt --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 42c55896b -> d5fc1932e Merge branch 'cassandra-1.1' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java src/java/org/apache/cassandra/service/StorageProxy.java src/java/org/apache/cassandra/service/WriteResponseHandler.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5fc1932 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5fc1932 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5fc1932 Branch: refs/heads/trunk Commit: d5fc1932e965a32c944efcdf95fd0236624949fc Parents: 42c5589 7371e10 Author: Sylvain Lebresne Authored: Fri Sep 7 10:50:38 2012 +0200 Committer: Sylvain Lebresne Committed: Fri Sep 7 10:50:38 2012 +0200 -- CHANGES.txt|6 .../org/apache/cassandra/db/CounterColumn.java |2 +- .../cassandra/db/CounterMutationVerbHandler.java | 23 +++ .../locator/AbstractReplicationStrategy.java |8 ++-- .../service/AbstractWriteResponseHandler.java | 17 +- .../DatacenterSyncWriteResponseHandler.java| 10 +++--- .../service/DatacenterWriteResponseHandler.java| 10 +++--- .../org/apache/cassandra/service/StorageProxy.java | 17 ++ .../cassandra/service/WriteResponseHandler.java| 12 9 files changed, 69 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5fc1932/CHANGES.txt -- diff --cc CHANGES.txt index ec4992c,f192be2..0905cf9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,58 -1,9 +1,64 @@@ +1.2-beta1 + * include message initiation time to replicas so they can more + accurately drop timed-out requests (CASSANDRA-2858) + * fix clientutil.jar dependencies (CASSANDRA-4566) + * optimize WriteResponse (CASSANDRA-4548) + * new metrics (CASSANDRA-4009) + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897) + * debug tracing (CASSANDRA-1123) + * parallelize row cache loading (CASSANDRA-4282) + * Make compaction, flush JBOD-aware (CASSANDRA-4292) + * run local range scans on the read stage (CASSANDRA-3687) + * clean up ioexceptions (CASSANDRA-2116) + * add disk_failure_policy (CASSANDRA-2118) + * Introduce new json format with row level deletion (CASSANDRA-4054) + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433) + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047) + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881) + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366) + * split up rpc timeout by operation type (CASSANDRA-2819) + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762) + * update MS protocol with a version handshake + broadcast address id + (CASSANDRA-4311) + * multithreaded hint replay (CASSANDRA-4189) + * add inter-node message compression (CASSANDRA-3127) + * remove COPP (CASSANDRA-2479) + * Track tombstone expiration and compact when tombstone content is + higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234) + * update MurmurHash to version 3 (CASSANDRA-2975) + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060) + * (CLI) jline version is bumped to 1.0 to properly support + 'delete' key function (CASSANDRA-4132) + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 4289) + * Add support for range tombstones (CASSANDRA-3708) + * Improve MessagingService efficiency (CASSANDRA-3617) + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794) + * Set thrift HSHA server thread limit to unlimited by default (CASSANDRA-4277) + * Avoids double serialization of CF id in RowMutation messages + (CASSANDRA-4293) + * stream compressed sstables directly with java nio (CASSANDRA-4297) + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885) + * Add column metadata to system column families (CASSANDRA-4018) + * (cql3) Always use composite types by default (CASSANDRA-4329) + * (cql3) Add support for set, map and list (CASSANDRA-3647) + * Validate date type correctly (CASSANDRA-4441) + * (cql3) Allow definitions with only a PK (CASSANDRA-4361) + * (cql3) Add support for row key composites (CASSANDRA-4179) + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038) + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680) + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477) + * remove schema agreement checking from all external APIs (Thrift, CQL and CQL3) (CASSANDRA-4487) + * add Murmur3Partitioner and make it default for new instal
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk ca5318d37 -> acedc3438 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/acedc343 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/acedc343 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/acedc343 Branch: refs/heads/trunk Commit: acedc343821be16c4119400b4ac4e246b890a8ce Parents: ca5318d 96075b3 Author: Brandon Williams Authored: Fri Jul 27 13:46:06 2012 -0500 Committer: Brandon Williams Committed: Fri Jul 27 13:46:06 2012 -0500 -- .../org/apache/cassandra/cli/CliHelp.yaml |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk d080f6f10 -> ca5318d37 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca5318d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca5318d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca5318d3 Branch: refs/heads/trunk Commit: ca5318d37d352a4422fcc23008b4c839ea43e58c Parents: d080f6f 8227f43 Author: Brandon Williams Authored: Fri Jul 27 12:08:07 2012 -0500 Committer: Brandon Williams Committed: Fri Jul 27 12:08:07 2012 -0500 -- --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 1507ce8cd -> 94e413f5a Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94e413f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94e413f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94e413f5 Branch: refs/heads/trunk Commit: 94e413f5a127f374728a0b9ade931acc1d442c84 Parents: 1507ce8 10372c2 Author: Brandon Williams Authored: Thu Jul 26 12:39:41 2012 -0500 Committer: Brandon Williams Committed: Thu Jul 26 12:39:41 2012 -0500 -- bin/cqlsh |9 - 1 files changed, 8 insertions(+), 1 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 111f6c939 -> 1507ce8cd Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/io/sstable/Descriptor.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1507ce8c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1507ce8c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1507ce8c Branch: refs/heads/trunk Commit: 1507ce8cd4c5c9896a4923d9e0a74d85b6a83184 Parents: 111f6c9 bb37a0f Author: Sylvain Lebresne Authored: Thu Jul 26 18:05:54 2012 +0200 Committer: Sylvain Lebresne Committed: Thu Jul 26 18:05:54 2012 +0200 -- --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/trunk f650d3e82 -> 111f6c939
Merge branch 'cassandra-1.1' into trunk
Conflicts:
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
src/java/org/apache/cassandra/io/sstable/Descriptor.java
src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java
src/java/org/apache/cassandra/io/sstable/SSTableReader.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/111f6c93
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/111f6c93
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/111f6c93
Branch: refs/heads/trunk
Commit: 111f6c9392766205823e326422f3dffae826cf97
Parents: f650d3e 6a6b7ec
Author: Sylvain Lebresne
Authored: Thu Jul 26 18:04:14 2012 +0200
Committer: Sylvain Lebresne
Committed: Thu Jul 26 18:04:14 2012 +0200
--
CHANGES.txt|1 +
.../org/apache/cassandra/db/ColumnFamilyStore.java | 34 +++--
src/java/org/apache/cassandra/db/Directories.java | 11
.../org/apache/cassandra/io/sstable/Component.java |2 +
.../apache/cassandra/io/sstable/Descriptor.java|8 +++
.../org/apache/cassandra/io/sstable/SSTable.java |2 +
.../cassandra/io/sstable/SSTableMetadata.java | 33 +---
.../apache/cassandra/io/sstable/SSTableReader.java | 40 ---
.../apache/cassandra/tools/StandaloneScrubber.java |2 +-
.../org/apache/cassandra/db/DirectoriesTest.java | 21 ++--
10 files changed, 84 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/111f6c93/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/111f6c93/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 7692e59,a39530a..695e480
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -229,13 -231,28 +229,28 @@@ public class ColumnFamilyStore implemen
if (loadSSTables)
{
- Directories.SSTableLister sstables =
directories.sstableLister().skipCompacted(true).skipTemporary(true);
-
data.addInitialSSTables(SSTableReader.batchOpen(sstables.list().entrySet(),
data, metadata, this.partitioner));
-Directories.SSTableLister sstableFiles =
directories.sstableLister().skipCompacted(true).skipTemporary(true);
-Collection sstables =
SSTableReader.batchOpen(sstableFiles.list().entrySet(), savedKeys, data,
metadata, this.partitioner);
++Directories.SSTableLister sstableFiles =
directories.sstableLister().skipTemporary(true);
++Collection sstables =
SSTableReader.batchOpen(sstableFiles.list().entrySet(), data, metadata,
this.partitioner);
+
+ // Filter non-compacted sstables, remove compacted ones
+ Set compactedSSTables = new HashSet();
+ for (SSTableReader sstable : sstables)
+ compactedSSTables.addAll(sstable.getAncestors());
+
+ Set liveSSTables = new HashSet();
+ for (SSTableReader sstable : sstables)
+ {
+ if (compactedSSTables.contains(sstable.descriptor.generation))
+ sstable.releaseReference(); // this amount to deleting
the sstable
+ else
+ liveSSTables.add(sstable);
+ }
+ data.addInitialSSTables(liveSSTables);
}
+if (caching == Caching.ALL || caching == Caching.KEYS_ONLY)
+CacheService.instance.keyCache.loadSaved(this);
+
// compaction strategy should be created after the CFS has been
prepared
this.compactionStrategy =
metadata.createCompactionStrategyInstance(this);
@@@ -451,7 -480,7 +466,7 @@@
currentDescriptors.add(sstable.descriptor);
Set newSSTables = new HashSet();
--Directories.SSTableLister lister =
directories.sstableLister().skipCompacted(true).skipTemporary(true);
++Directories.SSTableLister lister =
directories.sstableLister().skipTemporary(true);
for (Map.Entry> entry :
lister.list().entrySet())
{
Descriptor descriptor = entry.getKey();
@@@ -478,7 -507,7 +493,7 @@@
SSTableReader reader;
try
{
- reader = SSTableReader.open(newDescriptor, entry.getValue(),
data, metadata, partitioner);
-reader = SSTableReader.open(newDescriptor, entry.getValue(),
Collections.emptySet(), metadata, partitioner);
++
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/trunk d6b7dd60f -> 49f297417
Merge branch 'cassandra-1.1' into trunk
Conflicts:
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49f29741
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49f29741
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49f29741
Branch: refs/heads/trunk
Commit: 49f297417d121354851faf7a820e56243e49f15c
Parents: d6b7dd6 aba1f16
Author: Sylvain Lebresne
Authored: Mon Jul 23 19:21:12 2012 +0200
Committer: Sylvain Lebresne
Committed: Mon Jul 23 19:21:12 2012 +0200
--
CHANGES.txt|1 +
.../cassandra/db/compaction/CompactionManager.java | 24 ++-
2 files changed, 24 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/49f29741/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/49f29741/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 6a1c850,4b39280..c9a3823
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -844,7 -834,31 +844,29 @@@ public class CompactionManager implemen
{
super(OperationType.VALIDATION,
cfs.getCompactionStrategy().getScanners(sstables, range),
- new CompactionController(cfs, sstables,
getDefaultGcBefore(cfs), true));
+ new ValidationCompactionController(cfs, sstables));
+ }
+ }
+
+ /*
+ * Controller for validation compaction that never purges.
+ * Note that we should not call cfs.getOverlappingSSTables on the provided
+ * sstables because those sstables are not guaranteed to be active
sstables
+ * (since we can run repair on a snapshot).
+ */
+ private static class ValidationCompactionController extends
CompactionController
+ {
+ public ValidationCompactionController(ColumnFamilyStore cfs,
Collection sstables)
+ {
+ super(cfs,
+ Integer.MAX_VALUE,
- true,
- null,
-
cfs.getCompactionStrategy().isKeyExistenceExpensive(ImmutableSet.copyOf(sstables)));
++ null);
+ }
+
+ @Override
+ public boolean shouldPurge(DecoratedKey key)
+ {
+ return false;
}
}
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 3eff5455d -> 6d5d91eec Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d5d91ee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d5d91ee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d5d91ee Branch: refs/heads/trunk Commit: 6d5d91eece057e18812210cdd12dcce2ac2a25ae Parents: 3eff545 fffccd6 Author: Sylvain Lebresne Authored: Fri Jun 29 13:54:27 2012 +0200 Committer: Sylvain Lebresne Committed: Fri Jun 29 13:54:27 2012 +0200 -- doc/cql3/CQL.textile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 682a34f36 -> 749522b7f Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/749522b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/749522b7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/749522b7 Branch: refs/heads/trunk Commit: 749522b7f96cb8f18ce4ce9aef69a7ad8037c309 Parents: 682a34f 5cbdf13 Author: Vijay Parthasarathy Authored: Tue Jun 12 11:41:05 2012 -0700 Committer: Vijay Parthasarathy Committed: Tue Jun 12 11:41:05 2012 -0700 -- build.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/749522b7/build.xml --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 72a74c3cb -> 63b6c029f Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63b6c029 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63b6c029 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63b6c029 Branch: refs/heads/trunk Commit: 63b6c029f0e853e1e9977be5daa3942b50aa937c Parents: 72a74c3 8fd3f49 Author: Dave Brosius Authored: Fri Jun 8 19:33:11 2012 -0400 Committer: Dave Brosius Committed: Fri Jun 8 19:33:11 2012 -0400 -- CHANGES.txt|2 ++ .../cassandra/cql3/statements/SelectStatement.java |2 +- 2 files changed, 3 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63b6c029/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63b6c029/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/trunk 90869e251 -> 770c20127
Merge branch 'cassandra-1.1' into trunk
Conflicts:
src/java/org/apache/cassandra/service/MigrationManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/770c2012
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/770c2012
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/770c2012
Branch: refs/heads/trunk
Commit: 770c20127257970af8637884f7849e4eabeced3a
Parents: 90869e2 2247054
Author: Sylvain Lebresne
Authored: Fri Jun 1 14:39:32 2012 +0200
Committer: Sylvain Lebresne
Committed: Fri Jun 1 14:39:32 2012 +0200
--
CHANGES.txt|1 +
.../apache/cassandra/service/MigrationManager.java |2 -
.../apache/cassandra/service/MigrationTask.java| 163 ---
3 files changed, 90 insertions(+), 76 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/770c2012/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/770c2012/src/java/org/apache/cassandra/service/MigrationManager.java
--
diff --cc src/java/org/apache/cassandra/service/MigrationManager.java
index 81af159,18ef298..cc1c136
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@@ -52,8 -60,8 +52,6 @@@ public class MigrationManager implement
{
private static final Logger logger =
LoggerFactory.getLogger(MigrationManager.class);
--// try that many times to send migration request to the node before
giving up
- static final int MIGRATION_REQUEST_RETRIES = 3;
-private static final int MIGRATION_REQUEST_RETRIES = 3;
private static final ByteBuffer LAST_MIGRATION_KEY =
ByteBufferUtil.bytes("Last Migration");
public void onJoin(InetAddress endpoint, EndpointState epState)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/770c2012/src/java/org/apache/cassandra/service/MigrationTask.java
--
diff --cc src/java/org/apache/cassandra/service/MigrationTask.java
index 28945b1,000..7124f16
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/service/MigrationTask.java
+++ b/src/java/org/apache/cassandra/service/MigrationTask.java
@@@ -1,74 -1,0 +1,89 @@@
- /*
- * 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.net.InetAddress;
- import java.util.Collection;
- import java.util.concurrent.TimeUnit;
- import java.util.concurrent.TimeoutException;
-
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
-
- import org.apache.cassandra.config.DatabaseDescriptor;
- import org.apache.cassandra.db.DefsTable;
- import org.apache.cassandra.db.RowMutation;
- import org.apache.cassandra.gms.FailureDetector;
- import org.apache.cassandra.net.IAsyncResult;
- import org.apache.cassandra.net.MessageOut;
- import org.apache.cassandra.net.MessagingService;
- import org.apache.cassandra.utils.WrappedRunnable;
-
- class MigrationTask extends WrappedRunnable
- {
- private static final Logger logger =
LoggerFactory.getLogger(MigrationTask.class);
-
- private final InetAddress endpoint;
-
- MigrationTask(InetAddress endpoint)
- {
- this.endpoint = endpoint;
- }
-
- public void runMayThrow() throws Exception
- {
- MessageOut message = new
MessageOut(MessagingService.Verb.MIGRATION_REQUEST, null,
MigrationManager.MigrationsSerializer.instance);
-
- int retries = 0;
- while (retries < MigrationManager.MIGRATION_REQUEST_RETRIES)
- {
- if (!FailureDetector.instance.isAlive(endpoint))
- {
- logger.error("Can't send migration request: node {} is
down.", endpoint);
- return;
- }
-
-
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 8a2afef95 -> dc920ab63 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc920ab6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc920ab6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc920ab6 Branch: refs/heads/trunk Commit: dc920ab63ef59489980e30b78156b1b5675e1781 Parents: 8a2afef 3fdc86c Author: Sylvain Lebresne Authored: Wed May 30 16:05:51 2012 +0200 Committer: Sylvain Lebresne Committed: Wed May 30 16:05:51 2012 +0200 -- CHANGES.txt|1 + .../cql3/statements/SchemaAlteringStatement.java |2 +- .../org/apache/cassandra/service/ClientState.java | 15 ++- 3 files changed, 12 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc920ab6/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc920ab6/src/java/org/apache/cassandra/cql3/statements/SchemaAlteringStatement.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc920ab6/src/java/org/apache/cassandra/service/ClientState.java --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk b4d94c0e7 -> 9118804b5 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9118804b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9118804b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9118804b Branch: refs/heads/trunk Commit: 9118804b536a0d45c26be2bd683e61360292f780 Parents: b4d94c0 5177d56 Author: Sylvain Lebresne Authored: Tue May 29 21:59:11 2012 +0200 Committer: Sylvain Lebresne Committed: Tue May 29 21:59:11 2012 +0200 -- CHANGES.txt|1 + src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +- src/java/org/apache/cassandra/cql3/Cql.g |8 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9118804b/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9118804b/src/java/org/apache/cassandra/cql3/CFPropDefs.java --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 48b6df95b -> 9aa8c0f47 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9aa8c0f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9aa8c0f4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9aa8c0f4 Branch: refs/heads/trunk Commit: 9aa8c0f471a3ae76508eb11c71cae26e4a7bb0d7 Parents: 48b6df9 2d72056 Author: Dave Brosius Authored: Sat May 26 12:02:38 2012 -0400 Committer: Dave Brosius Committed: Sat May 26 12:02:38 2012 -0400 -- src/java/org/apache/cassandra/cli/Cli.g | 15 --- 1 files changed, 4 insertions(+), 11 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1.' into trunk
Updated Branches:
refs/heads/trunk cc112ae30 -> bc783baab
Merge branch 'cassandra-1.1.' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc783baa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc783baa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc783baa
Branch: refs/heads/trunk
Commit: bc783baab505fd317897f372c86d40b2102329a9
Parents: cc112ae 512d97f
Author: Jonathan Ellis
Authored: Wed May 23 16:11:49 2012 -0500
Committer: Jonathan Ellis
Committed: Wed May 23 16:11:49 2012 -0500
--
.../cassandra/db/compaction/CompactionInfo.java|8
.../cassandra/db/compaction/CompactionManager.java |6 +++---
.../cassandra/db/compaction/CompactionTask.java|2 +-
.../cassandra/db/index/SecondaryIndexBuilder.java |2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc783baa/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index 594b639,937557f..acd8fcb
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@@ -103,36 -102,17 +103,36 @@@ public final class CompactionInfo imple
public static abstract class Holder
{
- private volatile boolean isStopped = false;
+ private volatile boolean stopRequested = false;
public abstract CompactionInfo getCompactionInfo();
+double load = StorageService.instance.getLoad();
+boolean reportedSeverity = false;
public void stop()
{
- isStopped = true;
+ stopRequested = true;
}
- public boolean isStopped()
+ public boolean isStopRequested()
{
- return isStopped;
+ return stopRequested;
}
+/**
+ * report event on the size of the compaction.
+ */
+public void started()
+{
+reportedSeverity =
StorageService.instance.reportSeverity(getCompactionInfo().getTotalBytes()/load);
+}
+
+/**
+ * remove the event complete
+ */
+public void finished()
+{
+if (reportedSeverity)
+
StorageService.instance.reportSeverity(-(getCompactionInfo().getTotalBytes()/load));
+reportedSeverity = false;
+}
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc783baa/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc783baa/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc783baa/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
--
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
index dfe1a56,5cdd26a..a434fa8
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
@@@ -59,9 -59,9 +59,9 @@@ public class SecondaryIndexBuilder exte
{
while (iter.hasNext())
{
- if (isStopped())
+ if (isStopRequested())
throw new CompactionInterruptedException(getCompactionInfo());
-DecoratedKey key = iter.next();
+DecoratedKey key = iter.next();
Table.indexRow(key, cfs, columns);
}
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 2ed977a3c -> 09ff86140 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09ff8614 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09ff8614 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09ff8614 Branch: refs/heads/trunk Commit: 09ff861408759f86c0ae007e30fe956691c1875a Parents: 2ed977a a7ed01c Author: Sylvain Lebresne Authored: Tue May 22 17:15:09 2012 +0200 Committer: Sylvain Lebresne Committed: Tue May 22 17:15:09 2012 +0200 -- CHANGES.txt|1 + .../org/apache/cassandra/cql3/CFDefinition.java| 10 +- .../apache/cassandra/cql3/ColumnIdentifier.java| 14 -- 3 files changed, 10 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/09ff8614/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/09ff8614/src/java/org/apache/cassandra/cql3/CFDefinition.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/09ff8614/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk a0f5dc515 -> fb2bfc984 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb2bfc98 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb2bfc98 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb2bfc98 Branch: refs/heads/trunk Commit: fb2bfc9846fa12211adf45e1bac23814fe099740 Parents: a0f5dc5 a75b708 Author: Sylvain Lebresne Authored: Thu May 3 10:00:36 2012 +0200 Committer: Sylvain Lebresne Committed: Thu May 3 10:00:36 2012 +0200 -- .../cassandra/cql3/statements/SelectStatement.java | 14 +- 1 files changed, 9 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb2bfc98/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk b2cb52d8a -> 372708461 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37270846 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37270846 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37270846 Branch: refs/heads/trunk Commit: 37270846182873f6433887418e2f08bd3bb1d533 Parents: b2cb52d 4884c1f Author: Sylvain Lebresne Authored: Mon Apr 9 19:09:57 2012 +0200 Committer: Sylvain Lebresne Committed: Mon Apr 9 19:09:57 2012 +0200 -- .../apache/cassandra/config/ColumnDefinition.java |5 - 1 files changed, 0 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/37270846/src/java/org/apache/cassandra/config/ColumnDefinition.java --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk fe507e305 -> e571ec2c6 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e571ec2c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e571ec2c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e571ec2c Branch: refs/heads/trunk Commit: e571ec2c6fe0a18d5c88671e2a560c199ef93eea Parents: fe507e3 11bdcd6 Author: Sylvain Lebresne Authored: Thu Mar 22 16:54:53 2012 +0100 Committer: Sylvain Lebresne Committed: Thu Mar 22 16:54:53 2012 +0100 -- .../org/apache/cassandra/config/CFMetaData.java| 11 ++- .../apache/cassandra/config/ColumnDefinition.java |5 + 2 files changed, 15 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e571ec2c/src/java/org/apache/cassandra/config/CFMetaData.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e571ec2c/src/java/org/apache/cassandra/config/ColumnDefinition.java --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 23b1c5249 -> c5649e072 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5649e07 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5649e07 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5649e07 Branch: refs/heads/trunk Commit: c5649e072c448f4683aab94c821152faf26745f1 Parents: 23b1c52 d4eaf3c Author: Sylvain Lebresne Authored: Fri Mar 16 11:27:41 2012 +0100 Committer: Sylvain Lebresne Committed: Fri Mar 16 11:27:41 2012 +0100 -- .../io/sstable/SSTableIdentityIterator.java|3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5649e07/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 927356e0c -> 27fb2bffb Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27fb2bff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27fb2bff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27fb2bff Branch: refs/heads/trunk Commit: 27fb2bffb835d3f7c3027146664f3ed730efc1e5 Parents: 927356e 49e134c Author: Peter Schuller Authored: Wed Feb 29 02:10:16 2012 -0800 Committer: Peter Schuller Committed: Wed Feb 29 02:10:16 2012 -0800 -- .../cassandra/io/util/RandomAccessReader.java |4 ++-- .../apache/cassandra/io/util/SequentialWriter.java |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27fb2bff/src/java/org/apache/cassandra/io/util/RandomAccessReader.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27fb2bff/src/java/org/apache/cassandra/io/util/SequentialWriter.java --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 130b8656b -> 590661faf Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/590661fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/590661fa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/590661fa Branch: refs/heads/trunk Commit: 590661faf23764732aac919baeb350f4d6594299 Parents: 130b865 a47d4cb Author: Chris Goffinet Authored: Wed Feb 22 00:02:30 2012 -0800 Committer: Chris Goffinet Committed: Wed Feb 22 00:02:30 2012 -0800 -- CHANGES.txt|1 + .../apache/cassandra/hadoop/BulkRecordWriter.java | 17 -- 2 files changed, 11 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/590661fa/CHANGES.txt -- diff --cc CHANGES.txt index 46e009f,842b603..d7e5e3f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -4,8 -4,8 +4,9 @@@ * fix concurrency issues with CQL keyspace creation (CASSANDRA-3903) * Show Effective Owership via Nodetool ring (CASSANDRA-3412) * Update ORDER BY syntax for CQL3 (CASSANDRA-3925) + * Fix BulkRecordWriter to not throw NPE if reducer gets no map data from Hadoop (CASSANDRA-3944) + 1.1-beta1 * add nodetool rebuild_index (CASSANDRA-3583) * add nodetool rangekeysample (CASSANDRA-2917)
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 182a36bc4 -> 6642d0f95 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6642d0f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6642d0f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6642d0f9 Branch: refs/heads/trunk Commit: 6642d0f956eadf7ac75cad0a544ceb567dd9a6b6 Parents: 182a36b 212fd41 Author: Peter Schuller Authored: Wed Feb 15 00:40:27 2012 +0100 Committer: Peter Schuller Committed: Wed Feb 15 00:40:27 2012 +0100 -- .../org/apache/cassandra/net/MessagingService.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 418d27a1e -> e533b9fd8 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e533b9fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e533b9fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e533b9fd Branch: refs/heads/trunk Commit: e533b9fd83e75c6340b5f46376f2a57b4c4ca725 Parents: 418d27a 5dac208 Author: Chris Goffinet Authored: Tue Feb 14 09:59:20 2012 -0800 Committer: Chris Goffinet Committed: Tue Feb 14 09:59:20 2012 -0800 -- CHANGES.txt|1 + .../apache/cassandra/hadoop/BulkRecordWriter.java |3 +- .../org/apache/cassandra/hadoop/ConfigHelper.java | 40 +++ .../io/sstable/SSTableSimpleUnsortedWriter.java| 17 ++- 4 files changed, 58 insertions(+), 3 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 887c7f9c2 -> 418d27a1e Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/418d27a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/418d27a1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/418d27a1 Branch: refs/heads/trunk Commit: 418d27a1e2c0f6312e5be24a6d4263b97848789f Parents: 887c7f9 648e62e Author: Chris Goffinet Authored: Tue Feb 14 09:13:18 2012 -0800 Committer: Chris Goffinet Committed: Tue Feb 14 09:13:18 2012 -0800 -- CHANGES.txt|2 +- .../apache/cassandra/hadoop/BulkRecordWriter.java | 15 --- 2 files changed, 9 insertions(+), 8 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 2170f1e80 -> 887c7f9c2 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/887c7f9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/887c7f9c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/887c7f9c Branch: refs/heads/trunk Commit: 887c7f9c25c8ac4830b12454af95e78745670195 Parents: 2170f1e d2c22a8 Author: Brandon Williams Authored: Tue Feb 14 07:31:24 2012 -0600 Committer: Brandon Williams Committed: Tue Feb 14 07:31:24 2012 -0600 -- src/java/org/apache/cassandra/config/Config.java | 11 +++ .../cassandra/config/DatabaseDescriptor.java | 68 +++ .../apache/cassandra/hadoop/BulkRecordWriter.java | 10 +- .../io/sstable/AbstractSSTableSimpleWriter.java| 10 ++- .../apache/cassandra/io/sstable/SSTableLoader.java |8 ++ .../io/sstable/SSTableSimpleUnsortedWriter.java|5 +- .../cassandra/io/sstable/SSTableSimpleWriter.java |9 ++- .../apache/cassandra/service/StorageService.java | 31 +++ .../io/sstable/SSTableSimpleWriterTest.java|5 +- 9 files changed, 92 insertions(+), 65 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk c738e564f -> 2170f1e80 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2170f1e8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2170f1e8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2170f1e8 Branch: refs/heads/trunk Commit: 2170f1e80daf25e75b9cc15226a4d5ed9cd4c7fa Parents: c738e56 e0c655d Author: Sylvain Lebresne Authored: Tue Feb 14 14:15:07 2012 +0100 Committer: Sylvain Lebresne Committed: Tue Feb 14 14:15:07 2012 +0100 -- CHANGES.txt|1 + .../apache/cassandra/streaming/FileStreamTask.java |8 +++- .../cassandra/streaming/StreamOutSession.java |3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk d19182a50 -> c738e564f Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c738e564 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c738e564 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c738e564 Branch: refs/heads/trunk Commit: c738e564f07371062a73e76093decf0e0592bbb7 Parents: d19182a 82a75d4 Author: Sylvain Lebresne Authored: Tue Feb 14 12:01:38 2012 +0100 Committer: Sylvain Lebresne Committed: Tue Feb 14 12:01:38 2012 +0100 -- CHANGES.txt|1 + .../db/AbstractThreadUnsafeSortedColumns.java |2 +- .../apache/cassandra/db/AtomicSortedColumns.java |4 ++-- .../org/apache/cassandra/db/ColumnFamilyStore.java |4 ++-- .../org/apache/cassandra/db/ISortedColumns.java|8 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 30ee8337e -> ddc771dc5 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddc771dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddc771dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddc771dc Branch: refs/heads/trunk Commit: ddc771dc5f1af98dde42d494f91cc398929c8515 Parents: 30ee833 6a6bf3c Author: Sylvain Lebresne Authored: Mon Feb 13 12:27:00 2012 +0100 Committer: Sylvain Lebresne Committed: Mon Feb 13 12:27:00 2012 +0100 -- CHANGES.txt|5 + .../org/apache/cassandra/config/CFMetaData.java| 15 --- .../cassandra/db/index/SecondaryIndexManager.java |6 ++ 3 files changed, 23 insertions(+), 3 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 9f668caed -> 45e4484cc Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45e4484c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45e4484c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45e4484c Branch: refs/heads/trunk Commit: 45e4484ccca04872cafd9aa5e5e4174603c90580 Parents: 9f668ca 3459c38 Author: Sylvain Lebresne Authored: Tue Feb 7 11:21:25 2012 +0100 Committer: Sylvain Lebresne Committed: Tue Feb 7 11:21:25 2012 +0100 -- .../org/apache/cassandra/cql3/CFDefinition.java|4 +- .../cassandra/cql3/statements/SelectStatement.java | 435 +-- 2 files changed, 270 insertions(+), 169 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 8fa285c8b -> 9f668caed Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f668cae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f668cae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f668cae Branch: refs/heads/trunk Commit: 9f668caed2421e27855adfa54a0dc93459398bc4 Parents: 8fa285c abd4555 Author: Chris Goffinet Authored: Mon Feb 6 18:26:28 2012 -0800 Committer: Chris Goffinet Committed: Mon Feb 6 18:26:28 2012 -0800 -- CHANGES.txt |2 +- conf/cassandra-env.sh |1 - 2 files changed, 1 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f668cae/CHANGES.txt --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 0ba454168 -> 76736edc6 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76736edc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76736edc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76736edc Branch: refs/heads/trunk Commit: 76736edc69d6961f8fa9d3527ad78ee1830a05d8 Parents: 0ba4541 270850d Author: Jonathan Ellis Authored: Sun Feb 5 17:57:50 2012 -0600 Committer: Jonathan Ellis Committed: Sun Feb 5 17:57:50 2012 -0600 -- CHANGES.txt|2 +- .../apache/cassandra/service/MigrationManager.java |9 + 2 files changed, 6 insertions(+), 5 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk e12d4430e -> 0ba454168 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ba45416 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ba45416 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ba45416 Branch: refs/heads/trunk Commit: 0ba4541685640043a4e555d049261e36ca8d8e3b Parents: e12d443 cbac7af Author: Sylvain Lebresne Authored: Sat Feb 4 15:26:58 2012 +0100 Committer: Sylvain Lebresne Committed: Sat Feb 4 15:26:58 2012 +0100 -- .../apache/cassandra/thrift/CassandraServer.java |1 + 1 files changed, 1 insertions(+), 0 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 332e5a511 -> e12d4430e Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e12d4430 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e12d4430 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e12d4430 Branch: refs/heads/trunk Commit: e12d4430edeeabf00b3c76eead36d4b4af8f3ff6 Parents: 332e5a5 35aad40 Author: Brandon Williams Authored: Thu Feb 2 18:02:53 2012 -0600 Committer: Brandon Williams Committed: Thu Feb 2 18:02:53 2012 -0600 -- .../apache/cassandra/hadoop/BulkRecordWriter.java | 84 +++ 1 files changed, 65 insertions(+), 19 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk e36926b8b -> 6592bc9a9 Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6592bc9a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6592bc9a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6592bc9a Branch: refs/heads/trunk Commit: 6592bc9a95c08acc936f324f84b7d0c6a212fdf8 Parents: e36926b 3c35bf4 Author: Brandon Williams Authored: Wed Feb 1 12:14:56 2012 -0600 Committer: Brandon Williams Committed: Wed Feb 1 12:14:56 2012 -0600 -- 0 files changed, 0 insertions(+), 0 deletions(-) --
[1/2] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 3e0f09028 -> e36926b8b Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e36926b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e36926b8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e36926b8 Branch: refs/heads/trunk Commit: e36926b8ba753b674b2023ef3b14f16f74486472 Parents: 3e0f090 e6b3cbb Author: Sylvain Lebresne Authored: Wed Feb 1 08:46:36 2012 +0100 Committer: Sylvain Lebresne Committed: Wed Feb 1 08:46:36 2012 +0100 -- src/java/org/apache/cassandra/tools/NodeCmd.java |1 + 1 files changed, 1 insertions(+), 0 deletions(-) --
