[7/9] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-04-02 Thread brandonwilliams 
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/service/StorageService.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05b2ae84
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05b2ae84
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05b2ae84

Branch: refs/heads/cassandra-2.0
Commit: 05b2ae84c07f906d0e66cb0718b165381c9898aa
Parents: 133cfd3 a4d7e22
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Apr 2 16:45:54 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Apr 2 16:45:54 2014 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/05b2ae84/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 53bbb77,6929100..94671f1
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -677,16 -648,20 +677,18 @@@ public class StorageService extends Not
  // to get schema info from gossip which defeats the purpose.  See 
CASSANDRA-4427 for the gory details.
  SetInetAddress current = new HashSetInetAddress();
  logger.debug(Bootstrap variables: {} {} {} {},
 -  new Object[]{ DatabaseDescriptor.isAutoBootstrap(),
 -SystemTable.bootstrapInProgress(),
 -SystemTable.bootstrapComplete(),
 -
DatabaseDescriptor.getSeeds().contains(FBUtilities.getBroadcastAddress())});
 -if (DatabaseDescriptor.isAutoBootstrap()  
!SystemTable.bootstrapComplete()  
DatabaseDescriptor.getSeeds().contains(FBUtilities.getLocalAddress()))
 + DatabaseDescriptor.isAutoBootstrap(),
 + SystemKeyspace.bootstrapInProgress(),
 + SystemKeyspace.bootstrapComplete(),
 + 
DatabaseDescriptor.getSeeds().contains(FBUtilities.getBroadcastAddress()));
++if (DatabaseDescriptor.isAutoBootstrap()  
!SystemKeyspace.bootstrapComplete()  
DatabaseDescriptor.getSeeds().contains(FBUtilities.getBroadcastAddress()))
+ logger.info(This node will not auto bootstrap because it is 
configured to be a seed node.);
 -if (DatabaseDescriptor.isAutoBootstrap()
 - !SystemTable.bootstrapComplete()
 - 
!DatabaseDescriptor.getSeeds().contains(FBUtilities.getBroadcastAddress()))
 +if (shouldBootstrap())
  {
 -if (SystemTable.bootstrapInProgress())
 +if (SystemKeyspace.bootstrapInProgress())
  logger.warn(Detected previous bootstrap failure; retrying);
  else
 -
SystemTable.setBootstrapState(SystemTable.BootstrapState.IN_PROGRESS);
 +
SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.IN_PROGRESS);
  setMode(Mode.JOINING, waiting for ring information, true);
  // first sleep the delay to make sure we see all our peers
  for (int i = 0; i  delay; i += 1000)

[7/9] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-17 Thread yukim 
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/service/AntiEntropyService.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b50b2b2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b50b2b2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b50b2b2

Branch: refs/heads/cassandra-2.0
Commit: 4b50b2b2e41aeda86c166059826e8eb1498b24fc
Parents: 44cf4a6 6dfca3d
Author: Yuki Morishita yu...@apache.org
Authored: Mon Feb 17 11:12:26 2014 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Mon Feb 17 11:12:26 2014 -0600

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/repair/RepairJob.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b50b2b2/CHANGES.txt
--
diff --cc CHANGES.txt
index c9fabd2,f146166..bdfec11
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -25,33 -9,24 +25,34 @@@ Merged from 1.2
   * Use real node messaging versions for schema exchange decisions 
(CASSANDRA-6700)
   * IN on the last clustering columns + ORDER BY DESC yield no results 
(CASSANDRA-6701)
   * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711)
+  * Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713)
  
 -
 -1.2.15
 - * Move handling of migration event source to solve bootstrap race 
(CASSANDRA-6648)
 - * Make sure compaction throughput value doesn't overflow with int math 
(CASSANDRA-6647)
 -
 -
 -1.2.14
 - * Reverted code to limit CQL prepared statement cache by size 
(CASSANDRA-6592)
 - * add cassandra.default_messaging_version property to allow easier
 -   upgrading from 1.1 (CASSANDRA-6619)
 - * Allow executing CREATE statements multiple times (CASSANDRA-6471)
 - * Don't send confusing info with timeouts (CASSANDRA-6491)
 - * Don't resubmit counter mutation runnables internally (CASSANDRA-6427)
 - * Don't drop local mutations without a hint (CASSANDRA-6510)
 - * Don't allow null max_hint_window_in_ms (CASSANDRA-6419)
 - * Validate SliceRange start and finish lengths (CASSANDRA-6521)
 +2.0.5
 + * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609)
 + * Add ks.cf names to tombstone logging (CASSANDRA-6597)
 + * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495)
 + * Wait for gossip to settle before accepting client connections 
(CASSANDRA-4288)
 + * Delete unfinished compaction incrementally (CASSANDRA-6086)
 + * Allow specifying custom secondary index options in CQL3 (CASSANDRA-6480)
 + * Improve replica pinning for cache efficiency in DES (CASSANDRA-6485)
 + * Fix LOCAL_SERIAL from thrift (CASSANDRA-6584)
 + * Don't special case received counts in CAS timeout exceptions 
(CASSANDRA-6595)
 + * Add support for 2.1 global counter shards (CASSANDRA-6505)
 + * Fix NPE when streaming connection is not yet established (CASSANDRA-6210)
 + * Avoid rare duplicate read repair triggering (CASSANDRA-6606)
 + * Fix paging discardFirst (CASSANDRA-6555)
 + * Fix ArrayIndexOutOfBoundsException in 2ndary index query (CASSANDRA-6470)
 + * Release sstables upon rebuilding 2i (CASSANDRA-6635)
 + * Add AbstractCompactionStrategy.startup() method (CASSANDRA-6637)
 + * SSTableScanner may skip rows during cleanup (CASSANDRA-6638)
 + * sstables from stalled repair sessions can resurrect deleted data 
(CASSANDRA-6503)
 + * Switch stress to use ITransportFactory (CASSANDRA-6641)
 + * Fix IllegalArgumentException during prepare (CASSANDRA-6592)
 + * Fix possible loss of 2ndary index entries during compaction 
(CASSANDRA-6517)
 + * Fix direct Memory on architectures that do not support unaligned long 
access
 +   (CASSANDRA-6628)
 + * Let scrub optionally skip broken counter partitions (CASSANDRA-5930)
 +Merged from 1.2:
   * fsync compression metadata (CASSANDRA-6531)
   * Validate CF existence on execution for prepared statement (CASSANDRA-6535)
   * Add ability to throttle batchlog replay (CASSANDRA-6550)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b50b2b2/src/java/org/apache/cassandra/repair/RepairJob.java
--
diff --cc src/java/org/apache/cassandra/repair/RepairJob.java
index 16daf4e,000..6705c95
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/repair/RepairJob.java
+++ b/src/java/org/apache/cassandra/repair/RepairJob.java
@@@ -1,224 -1,0 +1,224 @@@
 +/*
 + * 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

[7/9] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-01-31 Thread brandonwilliams 
Merge branch 'cassandra-1.2' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d76ad2e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d76ad2e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d76ad2e2

Branch: refs/heads/trunk
Commit: d76ad2e2443d1884473c845ab77d69025560d03c
Parents: bcb294d 5f6c5ce
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jan 31 09:40:17 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jan 31 09:40:17 2014 -0600

--
 .../org/apache/cassandra/locator/DynamicEndpointSnitchTest.java| 2 +-
 test/unit/org/apache/cassandra/service/InitClientTest.java | 2 +-
 .../org/apache/cassandra/service/StorageServiceClientTest.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d76ad2e2/test/unit/org/apache/cassandra/locator/DynamicEndpointSnitchTest.java
--

[7/9] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-22 Thread brandonwilliams 
Merge branch 'cassandra-1.2' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a069587
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a069587
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a069587

Branch: refs/heads/trunk
Commit: 8a069587d5f67d64d99e9d391e5f6a733616ab97
Parents: b6147c1 59bf44d
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Oct 22 15:29:24 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Oct 22 15:29:24 2013 -0500

--
 src/java/org/apache/cassandra/db/HintedHandOffManager.java  | 8 ++--
 src/java/org/apache/cassandra/service/MigrationManager.java | 5 -
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a069587/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 67a5c68,ede49e4..f1e751f
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@@ -249,22 -209,38 +249,24 @@@ public class HintedHandOffManager imple
  Gossiper gossiper = Gossiper.instance;
  int waited = 0;
  // first, wait for schema to be gossiped.
- while 
(gossiper.getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.SCHEMA)
 == null)
+ while (gossiper.getEndpointStateForEndpoint(endpoint) != null  
gossiper.getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.SCHEMA)
 == null)
  {
 -try
 -{
 -Thread.sleep(1000);
 -}
 -catch (InterruptedException e)
 -{
 -throw new AssertionError(e);
 -}
 +Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
  waited += 1000;
  if (waited  2 * StorageService.RING_DELAY)
  throw new TimeoutException(Didin't receive gossiped schema 
from  + endpoint +  in  + 2 * StorageService.RING_DELAY + ms);
  }
+ if (gossiper.getEndpointStateForEndpoint(endpoint) == null)
+ throw new TimeoutException(Node  + endpoint +  vanished while 
waiting for agreement);
  waited = 0;
  // then wait for the correct schema version.
 -// usually we use DD.getDefsVersion, which checks the local schema 
uuid as stored in the system table.
 +// usually we use DD.getDefsVersion, which checks the local schema 
uuid as stored in the system keyspace.
  // here we check the one in gossip instead; this serves as a canary 
to warn us if we introduce a bug that
  // causes the two to diverge (see CASSANDRA-2946)
- while 
(!gossiper.getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.SCHEMA).value.equals(
+ while (gossiper.getEndpointStateForEndpoint(endpoint) != null  
!gossiper.getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.SCHEMA).value.equals(
  
gossiper.getEndpointStateForEndpoint(FBUtilities.getBroadcastAddress()).getApplicationState(ApplicationState.SCHEMA).value))
  {
 -try
 -{
 -Thread.sleep(1000);
 -}
 -catch (InterruptedException e)
 -{
 -throw new AssertionError(e);
 -}
 +Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
  waited += 1000;
  if (waited  2 * StorageService.RING_DELAY)
  throw new TimeoutException(Could not reach schema agreement 
with  + endpoint +  in  + 2 * StorageService.RING_DELAY + ms);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a069587/src/java/org/apache/cassandra/service/MigrationManager.java
--

[7/9] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-09-11 Thread brandonwilliams 
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f117da0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f117da0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f117da0

Branch: refs/heads/trunk
Commit: 7f117da0caf66715a82417b3f7e3a2b30d0f279e
Parents: 1ae996d f5618e3
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Sep 11 10:18:40 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Sep 11 10:18:40 2013 -0500

--
 .../hadoop/pig/AbstractCassandraStorage.java| 170 +++
 .../cassandra/hadoop/pig/CassandraStorage.java  |   8 +-
 .../apache/cassandra/hadoop/pig/CqlStorage.java |  10 +-
 3 files changed, 147 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f117da0/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
--
diff --cc src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
index 19361e4,68e18c8..b770ed6
--- a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
@@@ -29,7 -29,11 +29,10 @@@ import java.util.*
  import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.exceptions.SyntaxException;
  import org.apache.cassandra.auth.IAuthenticator;
+ import org.apache.cassandra.config.CFMetaData;
+ import org.apache.cassandra.cql3.CFDefinition;
+ import org.apache.cassandra.cql3.ColumnIdentifier;
  import org.apache.cassandra.db.Column;
 -import org.apache.cassandra.db.IColumn;
  import org.apache.cassandra.db.marshal.*;
  import 
org.apache.cassandra.db.marshal.AbstractCompositeType.CompositeComponent;
  import org.apache.cassandra.hadoop.*;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f117da0/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
--
diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index e3c8a67,dbdd5e9..577fd38
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@@ -23,25 -23,11 +23,26 @@@ import java.nio.charset.CharacterCoding
  import java.util.*;
  
  
 -import org.apache.cassandra.db.IColumn;
 +import org.apache.cassandra.db.Column;
  import org.apache.cassandra.db.marshal.*;
+ import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.hadoop.*;
 -import org.apache.cassandra.thrift.*;
 +import org.apache.cassandra.thrift.Cassandra;
 +import org.apache.cassandra.thrift.CfDef;
 +import org.apache.cassandra.thrift.ColumnDef;
 +import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 +import org.apache.cassandra.thrift.Deletion;
 +import org.apache.cassandra.thrift.IndexClause;
 +import org.apache.cassandra.thrift.IndexExpression;
 +import org.apache.cassandra.thrift.IndexOperator;
 +import org.apache.cassandra.thrift.InvalidRequestException;
 +import org.apache.cassandra.thrift.Mutation;
 +import org.apache.cassandra.thrift.SchemaDisagreementException;
 +import org.apache.cassandra.thrift.SlicePredicate;
 +import org.apache.cassandra.thrift.SliceRange;
 +import org.apache.cassandra.thrift.SuperColumn;
 +import org.apache.cassandra.thrift.TimedOutException;
 +import org.apache.cassandra.thrift.UnavailableException;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.FBUtilities;
  import org.apache.cassandra.utils.Hex;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f117da0/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
--
diff --cc src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
index 2b76b83,b35e13a..1ef69b7
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
@@@ -23,8 -23,10 +23,9 @@@ import java.nio.charset.CharacterCoding
  import java.util.*;
  
  
 -import org.apache.cassandra.db.IColumn;
  import org.apache.cassandra.db.Column;
  import org.apache.cassandra.db.marshal.*;
+ import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.hadoop.*;
  import org.apache.cassandra.hadoop.cql3.CqlConfigHelper;
  import org.apache.cassandra.thrift.*;