[1/3] git commit: fix build

2014-08-15 Thread jake 
Repository: cassandra
Updated Branches:
  refs/heads/trunk ff88f2376 - 7879b2fe9


fix build


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

Branch: refs/heads/trunk
Commit: 561f6ef5cfb50878dff2ea3ceb182b48f400a23e
Parents: e9d0214
Author: Jake Luciani j...@apache.org
Authored: Fri Aug 15 15:15:09 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Fri Aug 15 15:15:09 2014 -0400

--
 .../apache/cassandra/io/util/BufferedRandomAccessFileTest.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/561f6ef5/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
--
diff --git 
a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java 
b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
index cfabf62..7dbbdc2 100644
--- a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
+++ b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
@@ -530,6 +530,8 @@ public class BufferedRandomAccessFileTest
 {
 //see https://issues.apache.org/jira/browse/CASSANDRA-7756
 
+final FileCacheService.CacheKey cacheKey = new 
FileCacheService.CacheKey();
+
 final int THREAD_COUNT = 40;
 ExecutorService executorService = 
Executors.newFixedThreadPool(THREAD_COUNT);
 
@@ -550,8 +552,8 @@ public class BufferedRandomAccessFileTest
 RandomAccessReader r2 = RandomAccessReader.open(w2);
 
 
-FileCacheService.instance.put(r1);
-FileCacheService.instance.put(r2);
+FileCacheService.instance.put(cacheKey, r1);
+FileCacheService.instance.put(cacheKey, r2);
 
 final CountDownLatch finished = new CountDownLatch(THREAD_COUNT);
 final AtomicBoolean hadError = new AtomicBoolean(false);

[1/3] git commit: Fix build

2014-08-05 Thread slebresne 
Repository: cassandra
Updated Branches:
  refs/heads/trunk bf4c76e47 - 277ca64c7


Fix build


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

Branch: refs/heads/trunk
Commit: 9f1e9575cb946cf2aa4efd403606474e070c3cc9
Parents: 2d21160
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 5 15:47:35 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 5 15:47:35 2014 +0200

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f1e9575/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index bd4598f..432cf9e 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -520,6 +520,11 @@ public class CqlConfigHelper
 }
 
 @Override
+public void onSuspected(Host host)
+{
+}
+
+@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[1/3] git commit: fix build

2014-08-05 Thread brandonwilliams 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 622ae5085 - 9faf90574
  refs/heads/trunk efe57f230 - 26cd4408f


fix build


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

Branch: refs/heads/cassandra-2.1
Commit: 9faf905743696264ef0fdf6f962378ce95829e50
Parents: 622ae50
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 5 10:35:30 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 5 10:35:30 2014 -0500

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9faf9057/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 7a5fd47..af6e99e 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -518,7 +518,6 @@ public class CqlConfigHelper
 liveRemoteHosts.add(host);
 }
 
-@Override
 public void onSuspected(Host host)
 {
 }

[1/3] git commit: fix build, remove dead method again

2014-08-05 Thread brandonwilliams 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 7e71d01a0 - f75988150
  refs/heads/trunk 7dd320c9e - 8625661d5


fix build, remove dead method again


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

Branch: refs/heads/cassandra-2.1
Commit: f7598815059bad05b6c6a4af53c8f5f5c8800a04
Parents: 7e71d01
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 5 14:05:21 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 5 14:05:21 2014 -0500

--
 src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7598815/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java 
b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 7a5fd47..741f599 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -519,11 +519,6 @@ public class CqlConfigHelper
 }
 
 @Override
-public void onSuspected(Host host)
-{
-}
-
-@Override
 public HostDistance distance(Host host)
 {
 if (host.getAddress().getHostName().equals(stickHost))

[1/3] git commit: fix build

2013-11-05 Thread brandonwilliams 
Updated Branches:
  refs/heads/cassandra-2.0 3a4d6beb4 - dc71d2200
  refs/heads/trunk 2d6ab6fb5 - 82c0094a8


fix build


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

Branch: refs/heads/cassandra-2.0
Commit: dc71d2200339f9cf781346afc4b95b60dd3cd88f
Parents: 3a4d6be
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Nov 5 15:33:49 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Nov 5 15:33:49 2013 -0600

--
 .../cassandra/hadoop/AbstractColumnFamilyInputFormat.java   | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc71d220/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
--
diff --git 
a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java 
b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
index 274e43f..7876b62 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -95,9 +95,12 @@ public abstract class AbstractColumnFamilyInputFormatK, Y 
extends InputFormat
 {
 logger.debug(Creating authenticated client for CF input format);
 TTransport transport;
-try {
-transport = 
ConfigHelper.getClientTransportFactory(conf).openTransport(location, port, 
conf);
-} catch (Exception e) {
+try
+{
+transport = 
ConfigHelper.getClientTransportFactory(conf).openTransport(location, port);
+}
+catch (Exception e)
+{
 throw new TTransportException(Failed to open a transport to  + 
location + : + port + ., e);
 }
 TProtocol binaryProtocol = new TBinaryProtocol(transport, true, true);

[1/3] git commit: fix build

2013-10-08 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 241c70a37 - 102c3c123
  refs/heads/cassandra-2.0 21ab8f81a - b557f7e37


fix build


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

Branch: refs/heads/cassandra-1.2
Commit: 102c3c123ed52bff6d2e2418bb393b9fdc427f7e
Parents: 241c70a
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Oct 8 12:04:34 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Oct 8 12:04:34 2013 -0500

--
 .../apache/cassandra/db/index/composites/CompositesSearcher.java   | 2 +-
 src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/102c3c12/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
--
diff --git 
a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java 
b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
index 82e227f..5ab1df6 100644
--- a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
@@ -56,7 +56,7 @@ public class CompositesSearcher extends SecondaryIndexSearcher
 {
 IndexExpression best = null;
 int bestMeanCount = Integer.MAX_VALUE;
-MapSecondaryIndex, Integer candidates = new HashMap();
+MapSecondaryIndex, Integer candidates = new HashMapSecondaryIndex, 
Integer();
 
 for (IndexExpression expression : clause)
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/102c3c12/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
--
diff --git a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java 
b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
index 7d23e6c..bed6104 100644
--- a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
@@ -52,7 +52,7 @@ public class KeysSearcher extends SecondaryIndexSearcher
 {
 IndexExpression best = null;
 int bestMeanCount = Integer.MAX_VALUE;
-MapSecondaryIndex, Integer candidates = new HashMap();
+MapSecondaryIndex, Integer candidates = new HashMapSecondaryIndex, 
Integer();
 
 for (IndexExpression expression : clause)
 {

[1/3] git commit: fix build

2013-07-18 Thread brandonwilliams 
Updated Branches:
  refs/heads/cassandra-1.2 76ad645a3 - 373c0336e
  refs/heads/trunk ee85c8ea9 - f6fd5bab7


fix build


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

Branch: refs/heads/cassandra-1.2
Commit: 373c0336e3e902d2332765ce712546a9e1bef837
Parents: 76ad645
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Jul 18 18:46:12 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Jul 18 18:46:12 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/373c0336/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index c4ceee5..d166553 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -944,7 +944,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 }
 Tracing.instance();
 if (!Gossiper.instance.seenAnySeed())
-throw new IllegalStateException(Unable to contact any seeds!)
+throw new IllegalStateException(Unable to contact any seeds!);
 setMode(Mode.JOINING, Starting to bootstrap..., true);
 new BootStrapper(FBUtilities.getBroadcastAddress(), tokens, 
tokenMetadata).bootstrap(); // handles token update
 logger.info(Bootstrap completed! for the tokens {}, tokens);

[1/3] git commit: fix build

2013-07-15 Thread brandonwilliams 
Updated Branches:
  refs/heads/cassandra-1.2 ba6396a20 - d6145668c
  refs/heads/trunk 280284961 - 11928f7d8


fix build


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

Branch: refs/heads/cassandra-1.2
Commit: d6145668c6cee8e30246f912ee58e8cd2ffdb9ba
Parents: ba6396a
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Jul 15 16:10:23 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Jul 15 16:10:23 2013 -0500

--
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6145668/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 91ae675..55d78b8 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -728,7 +728,7 @@ public class DatabaseDescriptor
 
 public static boolean isReplacing()
 {
-return 0 != getReplaceTokens().size() || getReplaceNode() != null
+return 0 != getReplaceTokens().size() || getReplaceNode() != null;
 }
 
 public static String getClusterName()