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 99AF710322 for ; Sat, 19 Jul 2014 02:16:52 +0000 (UTC) Received: (qmail 63452 invoked by uid 500); 19 Jul 2014 02:16:52 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 63353 invoked by uid 500); 19 Jul 2014 02:16:52 -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 63111 invoked by uid 99); 19 Jul 2014 02:16:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Jul 2014 02:16:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CD80F94F8C3; Sat, 19 Jul 2014 02:16:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Sat, 19 Jul 2014 02:16:55 -0000 Message-Id: <846b902bd91948f08f24f73349d4ce59@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8bcf3469 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8bcf3469 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8bcf3469 Branch: refs/heads/1.6.1-SNAPSHOT Commit: 8bcf34698979b78a290098b18ace9923760124dc Parents: b0e090e b2fbc06 Author: Josh Elser Authored: Fri Jul 18 15:36:51 2014 -0400 Committer: Josh Elser Committed: Fri Jul 18 15:36:51 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/conf/Property.java | 4 + .../accumulo/core/iterators/IteratorUtil.java | 64 ++-- .../accumulo/core/iterators/IterUtilTest.java | 279 ----------------- .../core/iterators/IteratorUtilTest.java | 306 +++++++++++++++++++ 4 files changed, 345 insertions(+), 308 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8bcf3469/core/src/main/java/org/apache/accumulo/core/conf/Property.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java index 87a29fb,7f48184..095b25d --- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java @@@ -400,16 -329,19 +401,19 @@@ public enum Property + "with a table. These properties start with the category prefix, followed by a scope (minc, majc, scan, etc.), " + "followed by a period, followed by a name, as in table.iterator.scan.vers, or table.iterator.scan.custom. " + "The values for these properties are a number indicating the ordering in which it is applied, and a class name " - + "such as table.iterator.scan.vers = 10,org.apache.accumulo.core.iterators.VersioningIterator
" + + "such as:\n table.iterator.scan.vers = 10,org.apache.accumulo.core.iterators.VersioningIterator\n " + "These iterators can take options if additional properties are set that look like this property, " - + "but are suffixed with a period, followed by 'opt' followed by another period, and a property name.
" + + "but are suffixed with a period, followed by 'opt' followed by another period, and a property name.\n" + "For example, table.iterator.minc.vers.opt.maxVersions = 3"), + TABLE_ITERATOR_SCAN_PREFIX(TABLE_ITERATOR_PREFIX.getKey() + IteratorScope.scan.name() + ".", null, PropertyType.PREFIX, "Convenience prefix to find options for the scan iterator scope"), + TABLE_ITERATOR_MINC_PREFIX(TABLE_ITERATOR_PREFIX.getKey() + IteratorScope.minc.name() + ".", null, PropertyType.PREFIX, "Convenience prefix to find options for the minc iterator scope"), + TABLE_ITERATOR_MAJC_PREFIX(TABLE_ITERATOR_PREFIX.getKey() + IteratorScope.majc.name() + ".", null, PropertyType.PREFIX, "Convenience prefix to find options for the majc iterator scope"), TABLE_LOCALITY_GROUP_PREFIX("table.group.", null, PropertyType.PREFIX, "Properties in this category are per-table properties that define locality groups in a table. These properties start " - + "with the category prefix, followed by a name, followed by a period, and followed by a property for that group.
" + + "with the category prefix, followed by a name, followed by a period, and followed by a property for that group.\n" + "For example table.group.group1=x,y,z sets the column families for a group called group1. Once configured, " - + "group1 can be enabled by adding it to the list of groups in the " + TABLE_LOCALITY_GROUPS.getKey() + " property.
" - + "Additional group options may be specified for a named group by setting table.group.<name>.opt.<key>=<value>."), + + "group1 can be enabled by adding it to the list of groups in the " + TABLE_LOCALITY_GROUPS.getKey() + " property.\n" + + "Additional group options may be specified for a named group by setting table.group..opt.=."), TABLE_FORMATTER_CLASS("table.formatter", DefaultFormatter.class.getName(), PropertyType.STRING, "The Formatter class to apply on results in the shell"), TABLE_INTERPRETER_CLASS("table.interepreter", DefaultScanInterpreter.class.getName(), PropertyType.STRING, "The ScanInterpreter class to apply on scan arguments in the shell"), http://git-wip-us.apache.org/repos/asf/accumulo/blob/8bcf3469/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java ----------------------------------------------------------------------