Updated Branches: refs/heads/trunk 435f1b72c -> d276d0a06
remove dead code Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d276d0a0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d276d0a0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d276d0a0 Branch: refs/heads/trunk Commit: d276d0a0638ff6d80ce8749d2afc1eaa5cfbb14a Parents: 435f1b7 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Dec 18 23:27:47 2013 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Dec 18 23:27:47 2013 -0500 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/SchemaLoader.java | 11 ++++------- .../unit/org/apache/cassandra/db/SerializationsTest.java | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d276d0a0/test/unit/org/apache/cassandra/SchemaLoader.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java index 90dc629..df74108 100644 --- a/test/unit/org/apache/cassandra/SchemaLoader.java +++ b/test/unit/org/apache/cassandra/SchemaLoader.java @@ -34,7 +34,6 @@ import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.*; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.compaction.LeveledCompactionStrategy; -import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.gms.Gossiper; @@ -51,12 +50,12 @@ public class SchemaLoader private static Logger logger = LoggerFactory.getLogger(SchemaLoader.class); @BeforeClass - public static void loadSchema() throws IOException, ConfigurationException + public static void loadSchema() throws ConfigurationException { loadSchema(false); } - public static void loadSchema(boolean withOldCfIds) throws IOException, ConfigurationException + public static void loadSchema(boolean withOldCfIds) throws ConfigurationException { // Cleanup first cleanupAndLeaveDirs(); @@ -115,8 +114,6 @@ public class SchemaLoader Map<String, String> opts_rf3 = KSMetaData.optsWithRF(3); Map<String, String> opts_rf5 = KSMetaData.optsWithRF(5); - ColumnFamilyType st = ColumnFamilyType.Standard; - ColumnFamilyType su = ColumnFamilyType.Super; AbstractType bytes = BytesType.instance; AbstractType<?> composite = CompositeType.getInstance(Arrays.asList(new AbstractType<?>[]{BytesType.instance, TimeUUIDType.instance, IntegerType.instance})); @@ -397,7 +394,7 @@ public class SchemaLoader DatabaseDescriptor.createAllDirectories(); } - protected void insertData(String keyspace, String columnFamily, int offset, int numberOfRows) throws IOException + protected void insertData(String keyspace, String columnFamily, int offset, int numberOfRows) { for (int i = offset; i < offset + numberOfRows; i++) { @@ -409,7 +406,7 @@ public class SchemaLoader } /* usually used to populate the cache */ - protected void readData(String keyspace, String columnFamily, int offset, int numberOfRows) throws IOException + protected void readData(String keyspace, String columnFamily, int offset, int numberOfRows) { ColumnFamilyStore store = Keyspace.open(keyspace).getColumnFamilyStore(columnFamily); for (int i = offset; i < offset + numberOfRows; i++) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d276d0a0/test/unit/org/apache/cassandra/db/SerializationsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/SerializationsTest.java b/test/unit/org/apache/cassandra/db/SerializationsTest.java index e3a6077..983a8f7 100644 --- a/test/unit/org/apache/cassandra/db/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/db/SerializationsTest.java @@ -50,7 +50,7 @@ public class SerializationsTest extends AbstractSerializationsTester Statics statics = new Statics(); @BeforeClass - public static void loadSchema() throws IOException, ConfigurationException + public static void loadSchema() throws ConfigurationException { loadSchema(true); }
