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 BAAE4E5E4 for ; Thu, 10 Jan 2013 15:31:48 +0000 (UTC) Received: (qmail 8363 invoked by uid 500); 10 Jan 2013 15:31:48 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 8340 invoked by uid 500); 10 Jan 2013 15:31:48 -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 8328 invoked by uid 99); 10 Jan 2013 15:31:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jan 2013 15:31:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jan 2013 15:31:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 417662388980; Thu, 10 Jan 2013 15:31:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1431428 - in /accumulo/branches/1.4: ./ src/ src/core/ src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java src/server/ Date: Thu, 10 Jan 2013 15:31:28 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130110153128.417662388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Thu Jan 10 15:31:27 2013 New Revision: 1431428 URL: http://svn.apache.org/viewvc?rev=1431428&view=rev Log: ACCUMULO-952 merge to 1.4 Modified: accumulo/branches/1.4/ (props changed) accumulo/branches/1.4/src/ (props changed) accumulo/branches/1.4/src/core/ (props changed) accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java accumulo/branches/1.4/src/server/ (props changed) Propchange: accumulo/branches/1.4/ ------------------------------------------------------------------------------ Merged /accumulo/trunk:r1431410,1431413 Propchange: accumulo/branches/1.4/src/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/src:r1431410,1431413 Merged /accumulo/trunk:r1431410,1431413 Propchange: accumulo/branches/1.4/src/core/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/src/core:r1431410,1431413 Merged /accumulo/trunk/core:r1431410,1431413 Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java?rev=1431428&r1=1431427&r2=1431428&view=diff ============================================================================== --- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java (original) +++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java Thu Jan 10 15:31:27 2013 @@ -58,9 +58,17 @@ public class MergeCommand extends Comman if (cl.hasOption(sizeOpt.getOpt())) { size = AccumuloConfiguration.getMemoryInBytes(cl.getOptionValue(sizeOpt.getOpt())); } - if (size < 0) + if (startRow == null && endRow == null && size < 0) { + shellState.getReader().flushConsole(); + String line = shellState.getReader().readLine("Merge the entire table { " + tableName + " } into one tablet (yes|no)? "); + if (line == null) + return 0; + if (!line.equalsIgnoreCase("y") && !line.equalsIgnoreCase("yes")) + return 0; + } + if (size < 0) { shellState.getConnector().tableOperations().merge(tableName, startRow, endRow); - else { + } else { final boolean finalVerbose = verbose; Merge merge = new Merge() { protected void message(String fmt, Object... args) { Propchange: accumulo/branches/1.4/src/server/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/src/server:r1431410,1431413 Merged /accumulo/trunk/server:r1431410,1431413