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
