You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/05/07 07:47:50 UTC
git commit: don't declare throwing exceptions that aren't thrown
Updated Branches:
refs/heads/trunk 08df0b860 -> f1c9bc612
don't declare throwing exceptions that aren't thrown
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1c9bc61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1c9bc61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1c9bc61
Branch: refs/heads/trunk
Commit: f1c9bc612e2df5ffacec0debedb2021f1a9171e7
Parents: 08df0b8
Author: Dave Brosius <db...@apache.org>
Authored: Tue May 7 01:47:03 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Tue May 7 01:47:03 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cli/CliMain.java | 2 +-
src/java/org/apache/cassandra/cql/CFPropDefs.java | 2 +-
.../cassandra/cql/CreateColumnFamilyStatement.java | 4 ++--
.../apache/cassandra/cql/DropIndexStatement.java | 2 +-
.../org/apache/cassandra/cql/QueryProcessor.java | 4 +---
src/java/org/apache/cassandra/cql3/KSPropDefs.java | 2 +-
.../statements/CreateColumnFamilyStatement.java | 4 ++--
.../cql3/statements/DropIndexStatement.java | 2 +-
.../org/apache/cassandra/db/BatchlogManager.java | 2 +-
.../cassandra/db/ColumnFamilySerializer.java | 2 +-
src/java/org/apache/cassandra/db/DefsTable.java | 5 ++---
.../apache/cassandra/db/HintedHandOffManager.java | 2 +-
src/java/org/apache/cassandra/db/Table.java | 8 ++++----
.../cassandra/db/compaction/PrecompactedRow.java | 13 +++----------
.../apache/cassandra/db/compaction/Scrubber.java | 2 +-
.../apache/cassandra/hadoop/BulkRecordWriter.java | 6 +++---
.../cassandra/hadoop/pig/CassandraStorage.java | 2 +-
.../io/sstable/SSTableIdentityIterator.java | 2 +-
.../apache/cassandra/io/sstable/SSTableLoader.java | 6 +++---
.../cassandra/net/IncomingTcpConnection.java | 2 +-
.../apache/cassandra/service/StorageService.java | 4 ++--
.../org/apache/cassandra/streaming/StreamIn.java | 2 +-
.../cassandra/thrift/TCustomServerSocket.java | 1 -
.../org/apache/cassandra/tools/BulkLoader.java | 2 +-
src/java/org/apache/cassandra/tools/NodeCmd.java | 4 ++--
src/java/org/apache/cassandra/tools/NodeProbe.java | 12 ++++++------
.../cassandra/tools/SSTableMetadataViewer.java | 2 +-
test/unit/org/apache/cassandra/cli/CliTest.java | 2 +-
28 files changed, 46 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/cli/CliMain.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliMain.java b/src/java/org/apache/cassandra/cli/CliMain.java
index 3f6ef02..1452f6a 100644
--- a/src/java/org/apache/cassandra/cli/CliMain.java
+++ b/src/java/org/apache/cassandra/cli/CliMain.java
@@ -198,7 +198,7 @@ public class CliMain
completer.setCandidateStrings(strs);
}
- public static void processStatement(String query) throws CharacterCodingException, ClassNotFoundException, TException, TimedOutException, NotFoundException, InvalidRequestException, NoSuchFieldException, UnavailableException, IllegalAccessException, InstantiationException
+ public static void processStatement(String query) throws CharacterCodingException, TException, TimedOutException, NotFoundException, InvalidRequestException, NoSuchFieldException, UnavailableException, IllegalAccessException, InstantiationException
{
cliClient.executeCLIStatement(query);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/cql/CFPropDefs.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/CFPropDefs.java b/src/java/org/apache/cassandra/cql/CFPropDefs.java
index f3b434b..82485fc 100644
--- a/src/java/org/apache/cassandra/cql/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql/CFPropDefs.java
@@ -236,7 +236,7 @@ public class CFPropDefs {
}
// Return a property value, typed as a Boolean
- public Boolean getPropertyBoolean(String key, Boolean defaultValue) throws InvalidRequestException
+ public Boolean getPropertyBoolean(String key, Boolean defaultValue)
{
String value = properties.get(key);
return (value == null) ? defaultValue : value.toLowerCase().matches("(1|true|yes)");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
index 2f0790c..409fca8 100644
--- a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
+++ b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
@@ -161,7 +161,7 @@ public class CreateColumnFamilyStatement
* @return a CFMetaData instance corresponding to the values parsed from this statement
* @throws InvalidRequestException on failure to validate parsed parameters
*/
- public CFMetaData getCFMetaData(String keyspace, List<ByteBuffer> variables) throws InvalidRequestException, ConfigurationException
+ public CFMetaData getCFMetaData(String keyspace, List<ByteBuffer> variables) throws InvalidRequestException
{
validate(variables);
@@ -223,7 +223,7 @@ public class CreateColumnFamilyStatement
return cfProps.getPropertyString(key, defaultValue);
}
- private Boolean getPropertyBoolean(String key, Boolean defaultValue) throws InvalidRequestException
+ private Boolean getPropertyBoolean(String key, Boolean defaultValue)
{
return cfProps.getPropertyBoolean(key, defaultValue);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/cql/DropIndexStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/DropIndexStatement.java b/src/java/org/apache/cassandra/cql/DropIndexStatement.java
index b9f4e5e..bc9bbbc 100644
--- a/src/java/org/apache/cassandra/cql/DropIndexStatement.java
+++ b/src/java/org/apache/cassandra/cql/DropIndexStatement.java
@@ -45,7 +45,7 @@ public class DropIndexStatement
return updateCFMetadata(findIndexedCF());
}
- private CFMetaData updateCFMetadata(CFMetaData cfm) throws InvalidRequestException
+ private CFMetaData updateCFMetadata(CFMetaData cfm)
{
ColumnDefinition column = findIndexedColumn(cfm);
assert column != null;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/cql/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/QueryProcessor.java b/src/java/org/apache/cassandra/cql/QueryProcessor.java
index 7eaa111..2f9c5ba 100644
--- a/src/java/org/apache/cassandra/cql/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql/QueryProcessor.java
@@ -23,8 +23,6 @@ import java.nio.charset.CharacterCodingException;
import java.util.*;
import java.util.concurrent.TimeoutException;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -764,7 +762,7 @@ public class QueryProcessor
}
public static CqlPreparedResult prepare(String queryString, ThriftClientState clientState)
- throws InvalidRequestException, SyntaxException
+ throws SyntaxException
{
logger.trace("CQL QUERY: {}", queryString);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/cql3/KSPropDefs.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/KSPropDefs.java b/src/java/org/apache/cassandra/cql3/KSPropDefs.java
index 70df622..9bf4070 100644
--- a/src/java/org/apache/cassandra/cql3/KSPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/KSPropDefs.java
@@ -42,7 +42,7 @@ public class KSPropDefs extends PropertyDefinitions
private String strategyClass;
- public void validate() throws ConfigurationException, SyntaxException
+ public void validate() throws SyntaxException
{
validate(keywords, obsoleteKeywords);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
index 078f0ff..71a3545 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
@@ -79,7 +79,7 @@ public class CreateColumnFamilyStatement extends SchemaAlteringStatement
}
// Column definitions
- private Map<ByteBuffer, ColumnDefinition> getColumns() throws InvalidRequestException
+ private Map<ByteBuffer, ColumnDefinition> getColumns()
{
Map<ByteBuffer, ColumnDefinition> columnDefs = new HashMap<ByteBuffer, ColumnDefinition>();
Integer componentIndex = null;
@@ -340,7 +340,7 @@ public class CreateColumnFamilyStatement extends SchemaAlteringStatement
return new ParsedStatement.Prepared(stmt);
}
- private AbstractType<?> getTypeAndRemove(Map<ColumnIdentifier, AbstractType> columns, ColumnIdentifier t) throws InvalidRequestException, ConfigurationException
+ private AbstractType<?> getTypeAndRemove(Map<ColumnIdentifier, AbstractType> columns, ColumnIdentifier t) throws InvalidRequestException
{
AbstractType type = columns.get(t);
if (type == null)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java
index c8c34e0..7cc3b16 100644
--- a/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java
@@ -55,7 +55,7 @@ public class DropIndexStatement extends SchemaAlteringStatement
MigrationManager.announceColumnFamilyUpdate(updatedCfm, false);
}
- private CFMetaData updateCFMetadata(CFMetaData cfm) throws InvalidRequestException
+ private CFMetaData updateCFMetadata(CFMetaData cfm)
{
ColumnDefinition column = findIndexedColumn(cfm);
assert column != null;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/db/BatchlogManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/BatchlogManager.java b/src/java/org/apache/cassandra/db/BatchlogManager.java
index a5139e8..9b0c334 100644
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@ -225,7 +225,7 @@ public class BatchlogManager implements BatchlogManagerMBean
writeHintsForMutation(RowMutation.serializer.deserialize(in, VERSION));
}
- private static void writeHintsForMutation(RowMutation mutation) throws IOException
+ private static void writeHintsForMutation(RowMutation mutation)
{
String table = mutation.getTable();
Token tk = StorageService.getPartitioner().getToken(mutation.key());
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java b/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java
index 3016499..f5cf3d4 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java
@@ -170,7 +170,7 @@ public class ColumnFamilySerializer implements IVersionedSerializer<ColumnFamily
throw new UnsupportedOperationException();
}
- public void deserializeColumnsFromSSTable(DataInput in, ColumnFamily cf, int size, ColumnSerializer.Flag flag, int expireBefore, Descriptor.Version version) throws IOException
+ public void deserializeColumnsFromSSTable(DataInput in, ColumnFamily cf, int size, ColumnSerializer.Flag flag, int expireBefore, Descriptor.Version version)
{
Iterator<OnDiskAtom> iter = cf.metadata().getOnDiskIterator(in, size, flag, expireBefore, version);
while (iter.hasNext())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/db/DefsTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DefsTable.java b/src/java/org/apache/cassandra/db/DefsTable.java
index 83d9c22..482f2f9 100644
--- a/src/java/org/apache/cassandra/db/DefsTable.java
+++ b/src/java/org/apache/cassandra/db/DefsTable.java
@@ -327,7 +327,6 @@ public class DefsTable
}
private static void mergeColumnFamilies(Map<DecoratedKey, ColumnFamily> old, Map<DecoratedKey, ColumnFamily> updated)
- throws ConfigurationException, IOException
{
// calculate the difference between old and new states (note that entriesOnlyLeft() will be always empty)
MapDifference<DecoratedKey, ColumnFamily> diff = Maps.difference(old, updated);
@@ -454,7 +453,7 @@ public class DefsTable
}
}
- private static void dropKeyspace(String ksName) throws IOException
+ private static void dropKeyspace(String ksName)
{
KSMetaData ksm = Schema.instance.getKSMetaData(ksName);
String snapshotName = Table.getTimestampedSnapshotName(ksName);
@@ -485,7 +484,7 @@ public class DefsTable
}
}
- private static void dropColumnFamily(String ksName, String cfName) throws IOException
+ private static void dropColumnFamily(String ksName, String cfName)
{
KSMetaData ksm = Schema.instance.getKSMetaData(ksName);
assert ksm != null;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 0939abb..02cf090 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -210,7 +210,7 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean
}
@VisibleForTesting
- protected Future<?> compact() throws ExecutionException, InterruptedException
+ protected Future<?> compact()
{
hintStore.forceBlockingFlush();
ArrayList<Descriptor> descriptors = new ArrayList<Descriptor>();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/db/Table.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Table.java b/src/java/org/apache/cassandra/db/Table.java
index f158e4c..32920e7 100644
--- a/src/java/org/apache/cassandra/db/Table.java
+++ b/src/java/org/apache/cassandra/db/Table.java
@@ -118,12 +118,12 @@ public class Table
return tableInstance;
}
- public static Table clear(String table) throws IOException
+ public static Table clear(String table)
{
return clear(table, Schema.instance);
}
- public static Table clear(String table, Schema schema) throws IOException
+ public static Table clear(String table, Schema schema)
{
synchronized (Table.class)
{
@@ -281,7 +281,7 @@ public class Table
}
// best invoked on the compaction mananger.
- public void dropCf(UUID cfId) throws IOException
+ public void dropCf(UUID cfId)
{
assert columnFamilyStores.containsKey(cfId);
ColumnFamilyStore cfs = columnFamilyStores.remove(cfId);
@@ -292,7 +292,7 @@ public class Table
}
// disassociate a cfs from this table instance.
- private void unloadCf(ColumnFamilyStore cfs) throws IOException
+ private void unloadCf(ColumnFamilyStore cfs)
{
cfs.forceBlockingFlush();
cfs.invalidate();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
index 55a62b8..1e7285a 100644
--- a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
@@ -109,16 +109,9 @@ public class PrecompactedRow extends AbstractCompactedRow
List<CloseableIterator<Column>> data = new ArrayList<CloseableIterator<Column>>(rows.size());
for (SSTableIdentityIterator row : rows)
{
- try
- {
- ColumnFamily cf = row.getColumnFamilyWithColumns(ArrayBackedSortedColumns.factory);
- returnCF.delete(cf);
- data.add(FBUtilities.closeableIterator(cf.iterator()));
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
+ ColumnFamily cf = row.getColumnFamilyWithColumns(ArrayBackedSortedColumns.factory);
+ returnCF.delete(cf);
+ data.add(FBUtilities.closeableIterator(cf.iterator()));
}
merge(returnCF, data, controller.cfs.indexManager.updaterFor(rows.get(0).getKey()));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/db/compaction/Scrubber.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/Scrubber.java b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
index 2f194f3..421385a 100644
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@ -98,7 +98,7 @@ public class Scrubber implements Closeable
this.scrubInfo = new ScrubInfo(dataFile, sstable);
}
- public void scrub() throws IOException
+ public void scrub()
{
outputHandler.output("Scrubbing " + sstable);
try
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java b/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
index e0bd09b..977a600 100644
--- a/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
@@ -79,20 +79,20 @@ implements org.apache.hadoop.mapred.RecordWriter<ByteBuffer,List<Mutation>>
private CFType cfType;
private ColType colType;
- BulkRecordWriter(TaskAttemptContext context) throws IOException
+ BulkRecordWriter(TaskAttemptContext context)
{
this(context.getConfiguration());
this.progress = new Progressable(context);
}
- BulkRecordWriter(Configuration conf, Progressable progress) throws IOException
+ BulkRecordWriter(Configuration conf, Progressable progress)
{
this(conf);
this.progress = progress;
}
- BulkRecordWriter(Configuration conf) throws IOException
+ BulkRecordWriter(Configuration conf)
{
Config.setClientMode(true);
Config.setOutboundBindAny(true);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index 6fa085f..d4fb577 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@ -516,7 +516,7 @@ public class CassandraStorage extends LoadFunc implements StoreFuncInterface, Lo
}
}
- private void setConnectionInformation() throws IOException
+ private void setConnectionInformation()
{
if (System.getenv(PIG_RPC_PORT) != null)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
index 8170b29..8e636c5 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
@@ -200,7 +200,7 @@ public class SSTableIdentityIterator implements Comparable<SSTableIdentityIterat
}
}
- public ColumnFamily getColumnFamilyWithColumns(ColumnFamily.Factory containerFactory) throws IOException
+ public ColumnFamily getColumnFamilyWithColumns(ColumnFamily.Factory containerFactory)
{
assert inputWithTracker.getBytesRead() == headerSize();
ColumnFamily cf = columnFamily.cloneMeShallow(containerFactory, false);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
index 263f39c..4ee6768 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
@@ -107,12 +107,12 @@ public class SSTableLoader
return sstables;
}
- public LoaderFuture stream() throws IOException
+ public LoaderFuture stream()
{
return stream(Collections.<InetAddress>emptySet());
}
- public LoaderFuture stream(Set<InetAddress> toIgnore) throws IOException
+ public LoaderFuture stream(Set<InetAddress> toIgnore)
{
client.init(keyspace);
@@ -289,7 +289,7 @@ public class SSTableLoader
setPartitioner(FBUtilities.newPartitioner(partclass));
}
- protected void setPartitioner(IPartitioner partitioner) throws ConfigurationException
+ protected void setPartitioner(IPartitioner partitioner)
{
this.partitioner = partitioner;
DatabaseDescriptor.setPartitioner(partitioner);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 809d8c9..1977086 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -136,7 +136,7 @@ public class IncomingTcpConnection extends Thread
}
}
- private void handleLegacyVersion(int version) throws IOException
+ private void handleLegacyVersion(int version)
{
throw new UnsupportedOperationException("Unable to read obsolete message version " + version + "; the earliest version supported is 1.2.0");
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/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 3c508ee..27bc69d 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -374,7 +374,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return initialized;
}
- public synchronized void initClient() throws IOException, ConfigurationException
+ public synchronized void initClient() throws ConfigurationException
{
// We don't wait, because we're going to actually try to work on
initClient(0);
@@ -407,7 +407,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
}
}
- public synchronized void initClient(int ringDelay) throws IOException, ConfigurationException
+ public synchronized void initClient(int ringDelay) throws ConfigurationException
{
if (initialized)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/streaming/StreamIn.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamIn.java b/src/java/org/apache/cassandra/streaming/StreamIn.java
index 740b430..152c6c7 100644
--- a/src/java/org/apache/cassandra/streaming/StreamIn.java
+++ b/src/java/org/apache/cassandra/streaming/StreamIn.java
@@ -69,7 +69,7 @@ public class StreamIn
}
/** Translates remote files to local files by creating a local sstable per remote sstable. */
- public static PendingFile getContextMapping(PendingFile remote) throws IOException
+ public static PendingFile getContextMapping(PendingFile remote)
{
/* Create a local sstable for each remote sstable */
Descriptor remotedesc = remote.desc;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java b/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
index 6f1d496..c30cec0 100644
--- a/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
+++ b/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
@@ -81,7 +81,6 @@ public class TCustomServerSocket extends TServerTransport
}
public TCustomServerSocket(ServerSocket socket, boolean keepAlive, Integer sendBufferSize, Integer recvBufferSize)
- throws TTransportException
{
this.serverSocket = socket;
this.keepAlive = keepAlive;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/tools/BulkLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java
index c838cb0..36211bb 100644
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@ -56,7 +56,7 @@ public class BulkLoader
private static final String PASSWD_OPTION = "password";
private static final String THROTTLE_MBITS = "throttle";
- public static void main(String args[]) throws IOException
+ public static void main(String args[])
{
LoaderOptions options = LoaderOptions.parseArgs(args);
try
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 6e52f69..63a3357 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -922,7 +922,7 @@ public class NodeCmd
outs.println(probe.isThriftServerRunning() ? "running" : "not running");
}
- public static void main(String[] args) throws IOException, InterruptedException, ConfigurationException, ParseException
+ public static void main(String[] args) throws IOException, InterruptedException, ParseException
{
CommandLineParser parser = new PosixParser();
ToolCommandLine cmd = null;
@@ -1280,7 +1280,7 @@ public class NodeCmd
}
}
- private static void handleSnapshots(NodeCommand nc, String tag, String[] cmdArgs, String columnFamily, NodeProbe probe) throws InterruptedException, IOException
+ private static void handleSnapshots(NodeCommand nc, String tag, String[] cmdArgs, String columnFamily, NodeProbe probe) throws IOException
{
String[] keyspaces = Arrays.copyOfRange(cmdArgs, 0, cmdArgs.length);
System.out.print("Requested snapshot for: ");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 753a64c..0a1bc5b 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -88,7 +88,7 @@ public class NodeProbe
* @param port TCP port of the remote JMX agent
* @throws IOException on connection failures
*/
- public NodeProbe(String host, int port, String username, String password) throws IOException, InterruptedException
+ public NodeProbe(String host, int port, String username, String password) throws IOException
{
assert username != null && !username.isEmpty() && password != null && !password.isEmpty()
: "neither username nor password can be blank";
@@ -107,7 +107,7 @@ public class NodeProbe
* @param port TCP port of the remote JMX agent
* @throws IOException on connection failures
*/
- public NodeProbe(String host, int port) throws IOException, InterruptedException
+ public NodeProbe(String host, int port) throws IOException
{
this.host = host;
this.port = port;
@@ -120,7 +120,7 @@ public class NodeProbe
* @param host hostname or IP address of the JMX agent
* @throws IOException on connection failures
*/
- public NodeProbe(String host) throws IOException, InterruptedException
+ public NodeProbe(String host) throws IOException
{
this.host = host;
this.port = defaultPort;
@@ -265,12 +265,12 @@ public class NodeProbe
ssProxy.forceTableRepairRange(beginToken, endToken, tableName, isSequential, isLocal, columnFamilies);
}
- public void invalidateKeyCache() throws IOException
+ public void invalidateKeyCache()
{
cacheService.invalidateKeyCache();
}
- public void invalidateRowCache() throws IOException
+ public void invalidateRowCache()
{
cacheService.invalidateRowCache();
}
@@ -456,7 +456,7 @@ public class NodeProbe
ssProxy.decommission();
}
- public void move(String newToken) throws IOException, InterruptedException
+ public void move(String newToken) throws IOException
{
ssProxy.move(newToken);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java b/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java
index ddfe69c..4ad5a57 100644
--- a/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java
+++ b/src/java/org/apache/cassandra/tools/SSTableMetadataViewer.java
@@ -32,7 +32,7 @@ public class SSTableMetadataViewer
/**
* @param args a list of sstables whose metadata we're interested in
*/
- public static void main(String[] args) throws IOException, ConfigurationException
+ public static void main(String[] args) throws IOException
{
PrintStream out = System.out;
if (args.length == 0)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1c9bc61/test/unit/org/apache/cassandra/cli/CliTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cli/CliTest.java b/test/unit/org/apache/cassandra/cli/CliTest.java
index 886eb71..8bbfb25 100644
--- a/test/unit/org/apache/cassandra/cli/CliTest.java
+++ b/test/unit/org/apache/cassandra/cli/CliTest.java
@@ -217,7 +217,7 @@ public class CliTest extends SchemaLoader
};
@Test
- public void testCli() throws IOException, TException, ConfigurationException, ClassNotFoundException, TimedOutException, NotFoundException, SchemaDisagreementException, NoSuchFieldException, InvalidRequestException, UnavailableException, InstantiationException, IllegalAccessException
+ public void testCli() throws IOException, TException, TimedOutException, NotFoundException, SchemaDisagreementException, NoSuchFieldException, InvalidRequestException, UnavailableException, InstantiationException, IllegalAccessException
{
Schema.instance.clear(); // Schema are now written on disk and will be reloaded
new EmbeddedCassandraService().start();