You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2011/12/01 23:04:08 UTC
svn commit: r1209271 - in /incubator/accumulo/trunk: ./
src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/
test/system/auto/simple/
Author: billie
Date: Thu Dec 1 22:04:06 2011
New Revision: 1209271
URL: http://svn.apache.org/viewvc?rev=1209271&view=rev
Log:
ACCUMULO-148 merged to trunk
Added:
incubator/accumulo/trunk/test/system/auto/simple/combiner.py
- copied unchanged from r1209269, incubator/accumulo/branches/1.4/test/system/auto/simple/combiner.py
Modified:
incubator/accumulo/trunk/ (props changed)
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 1 22:04:06 2011
@@ -1,2 +1,2 @@
/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124
-/incubator/accumulo/branches/1.4:1201902-1209129
+/incubator/accumulo/branches/1.4:1201902-1209269
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java?rev=1209271&r1=1209270&r2=1209271&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java Thu Dec 1 22:04:06 2011
@@ -76,6 +76,7 @@ public class CreateTableCommand extends
boolean decode = cl.hasOption(base64Opt.getOpt());
if (cl.hasOption(createTableOptAgg.getOpt())) {
+ Shell.log.warn("aggregators are deprecated");
String agg = cl.getOptionValue(createTableOptAgg.getOpt());
EscapeTokenizer st = new EscapeTokenizer(agg, "=,");
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java?rev=1209271&r1=1209270&r2=1209271&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java Thu Dec 1 22:04:06 2011
@@ -75,6 +75,7 @@ public class SetIterCommand extends Comm
Map<String,String> options = new HashMap<String,String>();
String classname = cl.getOptionValue(classnameTypeOpt.getOpt());
if (cl.hasOption(aggTypeOpt.getOpt())) {
+ Shell.log.warn("aggregators are deprecated");
classname = AggregatingIterator.class.getName();
} else if (cl.hasOption(regexTypeOpt.getOpt()))
classname = RegExFilter.class.getName();
@@ -148,7 +149,7 @@ public class SetIterCommand extends Comm
String shortClassName = className;
if (className.contains("."))
shortClassName = className.substring(className.lastIndexOf('.') + 1);
-
+
Map<String,String> localOptions = new HashMap<String,String>();
do {
// clean up the overall options that caused things to fail
@@ -234,7 +235,7 @@ public class SetIterCommand extends Comm
aggTypeOpt = new Option("agg", "aggregator", false, "an aggregating type");
regexTypeOpt = new Option("regex", "regular-expression", false, "a regex matching type");
versionTypeOpt = new Option("vers", "version", false, "a versioning type");
- nolabelTypeOpt = new Option("nolabel", "no-label", false, "a no-labeling type");
+ nolabelTypeOpt = new Option("nolabel", "no-label", false, "a blank visibility omitting type");
ageoffTypeOpt = new Option("ageoff", "ageoff", false, "an aging off type");
typeGroup.addOption(classnameTypeOpt);