Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D860E1008E for ; Tue, 28 Jan 2014 19:22:38 +0000 (UTC) Received: (qmail 90346 invoked by uid 500); 28 Jan 2014 19:22:37 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 90294 invoked by uid 500); 28 Jan 2014 19:22:37 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 90281 invoked by uid 99); 28 Jan 2014 19:22:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jan 2014 19:22:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1685E90A61B; Tue, 28 Jan 2014 19:22:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Tue, 28 Jan 2014 19:22:36 -0000 Message-Id: In-Reply-To: <8fe6b7e2267740fd802fd83fcedf1bd5@git.apache.org> References: <8fe6b7e2267740fd802fd83fcedf1bd5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: ACCUMULO-1961 removing trivial warnings ACCUMULO-1961 removing trivial warnings Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1ae5a86 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1ae5a86 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f1ae5a86 Branch: refs/heads/1.5.1-SNAPSHOT Commit: f1ae5a860bf7a32efc744adb52f54d1a394fd6b0 Parents: 772ca16 Author: Eric Newton Authored: Tue Jan 28 14:18:25 2014 -0500 Committer: Eric Newton Committed: Tue Jan 28 14:18:25 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/core/client/impl/OfflineScanner.java | 2 -- .../core/client/mapreduce/lib/util/ConfiguratorBase.java | 2 -- .../main/java/org/apache/accumulo/server/master/Master.java | 6 ++---- .../org/apache/accumulo/test/continuous/ContinuousVerify.java | 1 - .../main/java/org/apache/accumulo/test/randomwalk/State.java | 1 - 5 files changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1ae5a86/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java index 5f3069a..e00fcc8 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java +++ b/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/f1ae5a86/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java index b1ae3a5..cb54856 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java @@ -23,8 +23,6 @@ import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.ZooKeeperInstance; import org.apache.accumulo.core.client.mock.MockInstance; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; -import org.apache.accumulo.core.conf.AccumuloConfiguration; -import org.apache.accumulo.core.conf.SiteConfiguration; import org.apache.accumulo.core.security.CredentialHelper; import org.apache.accumulo.core.util.ArgumentChecker; import org.apache.commons.codec.binary.Base64; http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1ae5a86/server/src/main/java/org/apache/accumulo/server/master/Master.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/Master.java b/server/src/main/java/org/apache/accumulo/server/master/Master.java index 33919f7..396c219 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/Master.java +++ b/server/src/main/java/org/apache/accumulo/server/master/Master.java @@ -1455,9 +1455,7 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt try { Map future = new HashMap(); Map assigned = new HashMap(); - KeyExtent extent = new KeyExtent(row, new Value(new byte[]{0})); - String table = Constants.METADATA_TABLE_NAME; - Scanner scanner = getConnector().createScanner(table, Constants.NO_AUTHS); + Scanner scanner = getConnector().createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS); scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); scanner.fetchColumnFamily(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY); scanner.setRange(new Range(row)); @@ -1485,7 +1483,7 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt TServerInstance alive = tserverSet.find(entry.getValue().toString()); if (alive == null) { Master.log.info("Removing entry " + entry); - BatchWriter bw = getConnector().createBatchWriter(table, new BatchWriterConfig()); + BatchWriter bw = getConnector().createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); Mutation m = new Mutation(entry.getKey().getRow()); m.putDelete(entry.getKey().getColumnFamily(), entry.getKey().getColumnQualifier()); bw.addMutation(m); http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1ae5a86/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java index c82d03b..e0c2fe5 100644 --- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java +++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java @@ -18,7 +18,6 @@ package org.apache.accumulo.test.continuous; import java.io.IOException; import java.lang.reflect.Method; -import java.net.URI; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1ae5a86/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java index b799d04..ae100cb 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java @@ -28,7 +28,6 @@ import org.apache.accumulo.core.client.BatchWriterConfig; 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.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken;