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 35EDB11907 for ; Wed, 14 May 2014 19:37:06 +0000 (UTC) Received: (qmail 53295 invoked by uid 500); 14 May 2014 19:30:26 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 53252 invoked by uid 500); 14 May 2014 19:30:26 -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 53243 invoked by uid 99); 14 May 2014 19:30:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 19:30:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E25498C4EBF; Wed, 14 May 2014 19:30:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mdrob@apache.org To: commits@accumulo.apache.org Date: Wed, 14 May 2014 19:30:25 -0000 Message-Id: <2cdce7ba870e4b288af65e9543c08a3a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: ACCUMULO-2807 Use deprecated SequenceFile.Reader Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 366aef1b9 -> c57bc8d5d refs/heads/master 2556be273 -> a119746bf ACCUMULO-2807 Use deprecated SequenceFile.Reader Use the old method Of creating a reader To retain compat Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c57bc8d5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c57bc8d5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c57bc8d5 Branch: refs/heads/1.6.1-SNAPSHOT Commit: c57bc8d5d509e368bc0d4a4b8e2f80503efade26 Parents: 366aef1 Author: Mike Drob Authored: Wed May 14 15:29:23 2014 -0400 Committer: Mike Drob Committed: Wed May 14 15:29:23 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/tserver/log/LocalWALRecovery.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c57bc8d5/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java index 2adb52d..31f4f14 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java @@ -145,7 +145,12 @@ public class LocalWALRecovery implements Runnable { log.info("Openning local log " + file.getAbsolutePath()); - Reader reader = new SequenceFile.Reader(fs.getConf(), SequenceFile.Reader.file(new Path(file.toURI()))); + Path localWal = new Path(file.toURI()); + FileSystem localFs = FileSystem.getLocal(fs.getConf()); + + @SuppressWarnings("deprecation") + Reader reader = new SequenceFile.Reader(localFs, localWal, localFs.getConf()); + // Reader reader = new SequenceFile.Reader(localFs.getConf(), SequenceFile.Reader.file(localWal)); Path tmp = new Path(options.destination + "/" + name + ".copy"); FSDataOutputStream writer = fs.create(tmp); while (reader.next(key, value)) {