[2/3] git commit: cleanup
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/abde62d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/abde62d0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/abde62d0
Branch: refs/heads/trunk
Commit: abde62d04a6ea333b5107e03b0e1a983f9b3b733
Parents: ba68130
Author: Jonathan Ellis jbel...@apache.org
Authored: Sat Oct 11 17:09:13 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Oct 20 11:38:43 2014 -0700
--
src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/abde62d0/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index eedaa17..d052d73 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -32,7 +32,6 @@ import com.google.common.collect.AbstractIterator;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.cassandra.hadoop.HadoopCompat;
@@ -580,7 +579,7 @@ public class CqlRecordReader extends RecordReaderLong, Row
String query = SELECT column_name, component_index, type FROM
system.schema_columns WHERE keyspace_name=' +
keyspace + ' and columnfamily_name=' + cfName + ';
ListRow rows = session.execute(query).all();
-if (CollectionUtils.isEmpty(rows))
+if (rows.isEmpty())
{
throw new RuntimeException(No table metadata found for +
keyspace + . + cfName);
}
[2/3] git commit: cleanup
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76101027
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76101027
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76101027
Branch: refs/heads/trunk
Commit: 76101027eef2fa097b2b55cdc037a3bfbe235753
Parents: 45a6373
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Mar 26 10:50:41 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Mar 26 10:50:41 2014 -0500
--
.../cassandra/service/StorageService.java | 249 ++-
1 file changed, 130 insertions(+), 119 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76101027/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 17bd514..042e2bc 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -183,9 +183,9 @@ public class StorageService extends
NotificationBroadcasterSupport implements IE
private static final AtomicInteger nextRepairCommand = new AtomicInteger();
-private static ScheduledRangeTransferExecutorService rangeXferExecutor =
new ScheduledRangeTransferExecutorService();
+private static final ScheduledRangeTransferExecutorService
rangeXferExecutor = new ScheduledRangeTransferExecutorService();
-private final ListIEndpointLifecycleSubscriber lifecycleSubscribers =
new CopyOnWriteArrayListIEndpointLifecycleSubscriber();
+private final ListIEndpointLifecycleSubscriber lifecycleSubscribers =
new CopyOnWriteArrayList();
private static final BackgroundActivityMonitor bgMonitor = new
BackgroundActivityMonitor();
@@ -564,7 +564,7 @@ public class StorageService extends
NotificationBroadcasterSupport implements IE
Thread drainOnShutdown = new Thread(new WrappedRunnable()
{
@Override
-public void runMayThrow() throws ExecutionException,
InterruptedException, IOException
+public void runMayThrow() throws InterruptedException
{
ExecutorService counterMutationStage =
StageManager.getStage(Stage.COUNTER_MUTATION);
ExecutorService mutationStage =
StageManager.getStage(Stage.MUTATION);
@@ -584,7 +584,7 @@ public class StorageService extends
NotificationBroadcasterSupport implements IE
mutationStage.awaitTermination(3600, TimeUnit.SECONDS);
StorageProxy.instance.verifyNoHintsInProgress();
-ListFuture? flushes = new ArrayListFuture?();
+ListFuture? flushes = new ArrayList();
for (Keyspace keyspace : Keyspace.all())
{
KSMetaData ksm =
Schema.instance.getKSMetaData(keyspace.getName());
@@ -634,7 +634,7 @@ public class StorageService extends
NotificationBroadcasterSupport implements IE
joined = true;
CollectionToken tokens = null;
-MapApplicationState, VersionedValue appStates = new
HashMapApplicationState, VersionedValue();
+MapApplicationState, VersionedValue appStates = new HashMap();
if (DatabaseDescriptor.getReplaceTokens().size() 0 ||
DatabaseDescriptor.getReplaceNode() != null)
throw new RuntimeException(Replace method removed; use
cassandra.replace_address instead);
@@ -684,7 +684,7 @@ public class StorageService extends
NotificationBroadcasterSupport implements IE
//
// We attempted to replace this with a schema-presence check, but you
need a meaningful sleep
// to get schema info from gossip which defeats the purpose. See
CASSANDRA-4427 for the gory details.
-SetInetAddress current = new HashSetInetAddress();
+SetInetAddress current = new HashSet();
logger.debug(Bootstrap variables: {} {} {} {},
DatabaseDescriptor.isAutoBootstrap(),
SystemKeyspace.bootstrapInProgress(),
@@ -800,7 +800,7 @@ public class StorageService extends
NotificationBroadcasterSupport implements IE
}
else
{
-tokens = new ArrayListToken(initialTokens.size());
+tokens = new ArrayList(initialTokens.size());
for (String token : initialTokens)
tokens.add(getPartitioner().getTokenFactory().fromString(token));
logger.info(Saved tokens not found. Using configuration
value: {}, tokens);
@@ -1054,7 +1054,7 @@ public class StorageService extends
[2/3] git commit: cleanup
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fae7a65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fae7a65
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fae7a65
Branch: refs/heads/trunk
Commit: 6fae7a6509c516c403c8b343ab208225669095d7
Parents: 7502474
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Oct 9 15:22:25 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Oct 9 15:22:25 2013 -0500
--
.../org/apache/cassandra/db/CounterColumn.java| 2 +-
.../apache/cassandra/net/MessagingService.java| 2 +-
.../apache/cassandra/service/StorageProxy.java| 18 --
3 files changed, 10 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fae7a65/src/java/org/apache/cassandra/db/CounterColumn.java
--
diff --git a/src/java/org/apache/cassandra/db/CounterColumn.java
b/src/java/org/apache/cassandra/db/CounterColumn.java
index 2993485..b470c5a 100644
--- a/src/java/org/apache/cassandra/db/CounterColumn.java
+++ b/src/java/org/apache/cassandra/db/CounterColumn.java
@@ -362,7 +362,7 @@ public class CounterColumn extends Column
SetInetAddress remotes =
Sets.difference(ImmutableSet.copyOf(targets), ImmutableSet.of(local));
// Fake local response to be a good lad but we won't wait on
the responseHandler
responseHandler.response(null);
-StorageProxy.sendToHintedEndpoints((RowMutation) mutation,
remotes, responseHandler, localDataCenter, consistency_level);
+StorageProxy.sendToHintedEndpoints((RowMutation) mutation,
remotes, responseHandler, localDataCenter);
}
}, null, WriteType.SIMPLE);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fae7a65/src/java/org/apache/cassandra/net/MessagingService.java
--
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java
b/src/java/org/apache/cassandra/net/MessagingService.java
index ad15dd2..bda7038 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -348,7 +348,7 @@ public final class MessagingService implements
MessagingServiceMBean
if (expiredCallbackInfo.shouldHint())
{
RowMutation rm = (RowMutation) ((WriteCallbackInfo)
expiredCallbackInfo).sentMessage.payload;
-return StorageProxy.submitHint(rm,
expiredCallbackInfo.target, null, null);
+return StorageProxy.submitHint(rm,
expiredCallbackInfo.target, null);
}
return null;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fae7a65/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java
b/src/java/org/apache/cassandra/service/StorageProxy.java
index 3c68121..cac38a3 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -116,7 +116,7 @@ public class StorageProxy implements StorageProxyMBean
throws OverloadedException
{
assert mutation instanceof RowMutation;
-sendToHintedEndpoints((RowMutation) mutation, targets,
responseHandler, localDataCenter, consistency_level);
+sendToHintedEndpoints((RowMutation) mutation, targets,
responseHandler, localDataCenter);
}
};
@@ -530,7 +530,7 @@ public class StorageProxy implements StorageProxyMBean
ListInetAddress naturalEndpoints =
StorageService.instance.getNaturalEndpoints(mutation.getKeyspaceName(), tk);
CollectionInetAddress pendingEndpoints =
StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk,
mutation.getKeyspaceName());
for (InetAddress target :
Iterables.concat(naturalEndpoints, pendingEndpoints))
-submitHint((RowMutation) mutation, target, null,
consistency_level);
+submitHint((RowMutation) mutation, target, null);
}
Tracing.trace(Wrote hint to satisfy CL.ANY after no replicas
acknowledged the write);
}
@@ -689,7 +689,7 @@ public class StorageProxy implements StorageProxyMBean
for (WriteResponseHandlerWrapper wrapper : wrappers)
{
IterableInetAddress endpoints =
Iterables.concat(wrapper.handler.naturalEndpoints,
[2/3] git commit: cleanup
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7202eff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7202eff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7202eff
Branch: refs/heads/trunk
Commit: a7202effa7067604ef23eae441caa8b9480a63f4
Parents: 7a39421
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Jul 31 18:22:49 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Jul 31 18:22:49 2013 -0500
--
.../org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java | 2 +-
src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java| 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7202eff/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
--
diff --git
a/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
b/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
index db77c9e..c6eb46d 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
@@ -674,7 +674,7 @@ public class CqlPagingRecordReader extends
RecordReaderMapString, ByteBuffer,
for (String key : keys)
partitionBoundColumns.add(new BoundColumn(key));
-if (partitionBoundColumns.size() == 0)
+if (partitionBoundColumns.isEmpty())
{
retrieveKeysForThriftTables();
return;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7202eff/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
index 76d419e..3d03486 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
@@ -340,7 +340,7 @@ final class CqlRecordWriter extends
AbstractColumnFamilyRecordWriterMapString,
logger.debug(partition keys: + keyString);
ListString keys = FBUtilities.fromJsonList(keyString);
-if (keys.size() == 0)
+if (keys.isEmpty())
{
retrieveKeysForThriftTables(client);
return;
@@ -385,6 +385,7 @@ final class CqlRecordWriter extends
AbstractColumnFamilyRecordWriterMapString,
}
}
}
+
private AbstractType? parseType(String type) throws
ConfigurationException
{
try
[2/3] git commit: cleanup
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7dc2eb95
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dc2eb95
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7dc2eb95
Branch: refs/heads/trunk
Commit: 7dc2eb95c1752eb661b93c72a831ceb783d42ce4
Parents: 998fe96
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Jun 20 15:47:06 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Jun 20 15:47:06 2013 -0500
--
.../cassandra/locator/Ec2MultiRegionSnitch.java | 42 +++-
1 file changed, 23 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dc2eb95/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java
--
diff --git a/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java
b/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java
index ea41bc0..9317941 100644
--- a/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java
+++ b/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java
@@ -49,35 +49,35 @@ public class Ec2MultiRegionSnitch extends Ec2Snitch
implements IEndpointStateCha
{
private static final String PUBLIC_IP_QUERY_URL =
http://169.254.169.254/latest/meta-data/public-ipv4;;
private static final String PRIVATE_IP_QUERY_URL =
http://169.254.169.254/latest/meta-data/local-ipv4;;
-private final InetAddress public_ip;
-private final String private_ip;
+private final InetAddress localPublicAddress;
+private final String localPrivateAddress;
public Ec2MultiRegionSnitch() throws IOException, ConfigurationException
{
super();
-public_ip = InetAddress.getByName(awsApiCall(PUBLIC_IP_QUERY_URL));
-logger.info(EC2Snitch using publicIP as identifier: + public_ip);
-private_ip = awsApiCall(PRIVATE_IP_QUERY_URL);
+localPublicAddress =
InetAddress.getByName(awsApiCall(PUBLIC_IP_QUERY_URL));
+logger.info(EC2Snitch using publicIP as identifier: +
localPublicAddress);
+localPrivateAddress = awsApiCall(PRIVATE_IP_QUERY_URL);
// use the Public IP to broadcast Address to other nodes.
-DatabaseDescriptor.setBroadcastAddress(public_ip);
+DatabaseDescriptor.setBroadcastAddress(localPublicAddress);
}
public void onJoin(InetAddress endpoint, EndpointState epState)
{
if (epState.getApplicationState(ApplicationState.INTERNAL_IP) != null)
-reConnect(endpoint,
epState.getApplicationState(ApplicationState.INTERNAL_IP));
+reconnect(endpoint,
epState.getApplicationState(ApplicationState.INTERNAL_IP));
}
public void onChange(InetAddress endpoint, ApplicationState state,
VersionedValue value)
{
if (state == ApplicationState.INTERNAL_IP)
-reConnect(endpoint, value);
+reconnect(endpoint, value);
}
public void onAlive(InetAddress endpoint, EndpointState state)
{
if (state.getApplicationState(ApplicationState.INTERNAL_IP) != null)
-reConnect(endpoint,
state.getApplicationState(ApplicationState.INTERNAL_IP));
+reconnect(endpoint,
state.getApplicationState(ApplicationState.INTERNAL_IP));
}
public void onDead(InetAddress endpoint, EndpointState state)
@@ -95,18 +95,11 @@ public class Ec2MultiRegionSnitch extends Ec2Snitch
implements IEndpointStateCha
// do nothing.
}
-private void reConnect(InetAddress endpoint, VersionedValue versionedValue)
+private void reconnect(InetAddress publicAddress, VersionedValue
localAddressValue)
{
try
{
-InetAddress localEc2IP =
InetAddress.getByName(versionedValue.value);
-if (getDatacenter(endpoint).equals(getDatacenter(public_ip))
- MessagingService.instance().getVersion(endpoint) ==
MessagingService.current_version
-
!MessagingService.instance().getConnectionPool(endpoint).endPoint().equals(localEc2IP))
-{
-
MessagingService.instance().getConnectionPool(endpoint).reset(localEc2IP);
-logger.debug(String.format(Intiated reconnect to an Internal
IP %s for the %s, localEc2IP, endpoint));
-}
+reconnect(publicAddress,
InetAddress.getByName(localAddressValue.value));
}
catch (UnknownHostException e)
{
@@ -114,11 +107,22 @@ public class Ec2MultiRegionSnitch extends Ec2Snitch
implements IEndpointStateCha
}
}
+private void reconnect(InetAddress publicAddress, InetAddress localAddress)
+{
+if
(getDatacenter(publicAddress).equals(getDatacenter(localPublicAddress))
+
[2/3] git commit: cleanup
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/994d2625
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/994d2625
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/994d2625
Branch: refs/heads/trunk
Commit: 994d2625b1eb40ded5da310f3080ce1a2d5d2ba3
Parents: 1108ede
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Jan 15 22:43:35 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Jan 16 08:51:02 2013 -0800
--
.../cassandra/config/DatabaseDescriptor.java |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/994d2625/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 88c4e38..c9b2d1e 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -128,7 +128,7 @@ public class DatabaseDescriptor
{
URL url = getStorageConfigURL();
logger.info(Loading settings from + url);
-InputStream input = null;
+InputStream input;
try
{
input = url.openStream();
@@ -206,7 +206,7 @@ public class DatabaseDescriptor
/* Authentication and authorization backend, implementing
IAuthenticator and IAuthorizer */
if (conf.authenticator != null)
-authenticator =
FBUtilities.IAuthenticatorconstruct(conf.authenticator, authenticator);
+authenticator = FBUtilities.construct(conf.authenticator,
authenticator);
if (conf.authority != null)
{
@@ -217,7 +217,7 @@ public class DatabaseDescriptor
}
if (conf.authorizer != null)
-authorizer =
FBUtilities.IAuthorizerconstruct(conf.authorizer, authorizer);
+authorizer = FBUtilities.construct(conf.authorizer,
authorizer);
authenticator.validateConfiguration();
authorizer.validateConfiguration();
