Repository: accumulo Updated Branches: refs/heads/1.4.5-SNAPSHOT 88761e05b -> 4ee0f6494
Fix recent warnings introduced by several tickets ACCUMULO-2005 ACCUMULO-2182 ACCUMULO-2224 ACCUMULO-2234 ACCUMULO-2539 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4ee0f649 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4ee0f649 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4ee0f649 Branch: refs/heads/1.4.5-SNAPSHOT Commit: 4ee0f6494ea0d2265d930bce962ebcc3c7dbfe5c Parents: 88761e0 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Mar 26 12:45:35 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Mar 26 12:47:05 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/client/impl/OfflineScanner.java | 2 -- .../main/java/org/apache/accumulo/core/iterators/Combiner.java | 4 ++-- .../main/java/org/apache/accumulo/core/util/AddressUtil.java | 5 ++--- .../java/org/apache/accumulo/core/util/AddressUtilTest.java | 2 +- .../org/apache/accumulo/server/test/functional/RunTests.java | 2 +- .../java/org/apache/accumulo/server/test/randomwalk/State.java | 1 - 6 files changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4ee0f649/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java ---------------------------------------------------------------------- diff --git a/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java b/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java index 244bfef..cc83230 100644 --- a/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java +++ b/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java @@ -22,12 +22,10 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Map.Entry; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.AccumuloException; -import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.RowIterator; http://git-wip-us.apache.org/repos/asf/accumulo/blob/4ee0f649/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java ---------------------------------------------------------------------- diff --git a/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java b/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java index 083e93e..e8e0d8c 100644 --- a/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java +++ b/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java @@ -38,8 +38,8 @@ import org.apache.log4j.Logger; /** * A SortedKeyValueIterator that combines the Values for different versions (timestamp) of a Key within a row into a single Value. Combiner will replace one or - * more versions of a Key and their Values with the most recent Key and a Value which is the result of the reduce method. An {@link IteratorSetting.Column} - * which only specifies a column family will combine all Keys in that column family individually. Similarly, a {@link IteratorSetting.Column} which specifies a + * more versions of a Key and their Values with the most recent Key and a Value which is the result of the reduce method. An {@link Column} + * which only specifies a column family will combine all Keys in that column family individually. Similarly, a {@link Column} which specifies a * column family and column qualifier will combine all Keys in column family and qualifier individually. Combination is only ever performed on multiple versions * and not across column qualifiers or column visibilities. * http://git-wip-us.apache.org/repos/asf/accumulo/blob/4ee0f649/src/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java ---------------------------------------------------------------------- diff --git a/src/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java b/src/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java index 96c2e18..05b7198 100644 --- a/src/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java +++ b/src/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java @@ -16,14 +16,13 @@ */ package org.apache.accumulo.core.util; -import java.net.InetAddress; // workaround to enable @see/@link hyperlink +import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.security.Security; import org.apache.hadoop.io.Text; import org.apache.thrift.transport.TSocket; - import org.apache.log4j.Logger; public class AddressUtil { @@ -60,7 +59,7 @@ public class AddressUtil { * * @param originalException the host lookup that is the source of needing this lookup. maybe be null. * @return positive integer number of seconds - * @see java.net.InetAddress + * @see InetAddress * @throws IllegalArgumentException if dns failures are cached forever */ static public int getAddressCacheNegativeTtl(UnknownHostException originalException) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/4ee0f649/src/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java ---------------------------------------------------------------------- diff --git a/src/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java b/src/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java index 6268fe9..a8f1ded 100644 --- a/src/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java +++ b/src/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java @@ -113,7 +113,7 @@ public class AddressUtilTest extends TestCase { } try { log.info("AddressUtil is (hopefully) going to spit out an error about DNS lookups. you can ignore it."); - int result = AddressUtil.getAddressCacheNegativeTtl(null); + AddressUtil.getAddressCacheNegativeTtl(null); fail("The JVM Security settings cache DNS failures forever, this should cause an exception."); } catch(IllegalArgumentException exception) { assertTrue(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/4ee0f649/src/server/src/main/java/org/apache/accumulo/server/test/functional/RunTests.java ---------------------------------------------------------------------- diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/functional/RunTests.java b/src/server/src/main/java/org/apache/accumulo/server/test/functional/RunTests.java index 31e3198..7a7e7d3 100644 --- a/src/server/src/main/java/org/apache/accumulo/server/test/functional/RunTests.java +++ b/src/server/src/main/java/org/apache/accumulo/server/test/functional/RunTests.java @@ -134,7 +134,7 @@ public class RunTests extends Configured implements Tool { } @Override - protected void setup(Mapper.Context context) throws IOException, InterruptedException { + protected void setup(Mapper<LongWritable,Text,Text,Text>.Context context) throws IOException, InterruptedException { mapperTimeoutFactor = Integer.toString(context.getConfiguration().getInt(TIMEOUT_FACTOR, timeoutFactor)); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/4ee0f649/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java ---------------------------------------------------------------------- diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java index 5a53340..a94436a 100644 --- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java +++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java @@ -24,7 +24,6 @@ import java.util.Properties; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.MultiTableBatchWriter; -import org.apache.accumulo.core.client.MutationsRejectedException; import org.apache.accumulo.core.client.ZooKeeperInstance; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.log4j.Logger;
