Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 84DCB9DD3 for ; Tue, 20 Mar 2012 17:38:54 +0000 (UTC) Received: (qmail 2399 invoked by uid 500); 20 Mar 2012 17:38:54 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 2381 invoked by uid 500); 20 Mar 2012 17:38:54 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 2373 invoked by uid 99); 20 Mar 2012 17:38:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Mar 2012 17:38:54 +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; Tue, 20 Mar 2012 17:38:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 121F72388865; Tue, 20 Mar 2012 17:38:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1303036 - in /incubator/accumulo/trunk: ./ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/client/impl/ core/src/main/java/org/apache... Date: Tue, 20 Mar 2012 17:38:24 -0000 To: accumulo-commits@incubator.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120320173825.121F72388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Tue Mar 20 17:38:23 2012 New Revision: 1303036 URL: http://svn.apache.org/viewvc?rev=1303036&view=rev Log: ACCUMULO-477 merge to trunk Modified: incubator/accumulo/trunk/ (props changed) incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java incubator/accumulo/trunk/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/iterator/GlobalIndexUidTest.java Propchange: incubator/accumulo/trunk/ ------------------------------------------------------------------------------ Merged /incubator/accumulo/branches/1.4:r1303034 Merged /incubator/accumulo/branches/1.4/src:r1303034 Modified: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java (original) +++ incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java Tue Mar 20 17:38:23 2012 @@ -16,6 +16,7 @@ */ package org.apache.accumulo.core.client; +import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; @@ -111,6 +112,7 @@ public class IteratorSetting { * Get the configuration parameters for this iterator. * * @return the properties + * @deprecated Since 1.4.1, see {@link IteratorSetting.getOptions} */ public Map getProperties() { return properties; @@ -121,6 +123,7 @@ public class IteratorSetting { * * @param properties * the properties to set + * @deprecated Since 1.4.1, see {@link IteratorSetting.clearOptions} and {@link IteratorSetting.setOptions} */ public void setProperties(Map properties) { this.properties.clear(); @@ -129,6 +132,7 @@ public class IteratorSetting { /** * @return true if this iterator has configuration parameters. + * @deprecated Since 1.4.1, see {@link IteratorSetting.getOptions} and test {@link Map.isEmpty} */ public boolean hasProperties() { return !properties.isEmpty(); @@ -261,6 +265,15 @@ public class IteratorSetting { } /** + * Get the configuration parameters for this iterator. + * + * @return the properties + */ + public Map getOptions() { + return Collections.unmodifiableMap(properties); + } + + /** * Remove all options from the iterator. */ public void clearOptions() { Modified: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java (original) +++ incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java Tue Mar 20 17:38:23 2012 @@ -42,7 +42,7 @@ public abstract class TableOperationsHel checkIteratorConflicts(tableName, setting, scopes); for (IteratorScope scope : scopes) { String root = String.format("%s%s.%s", Property.TABLE_ITERATOR_PREFIX, scope.name().toLowerCase(), setting.getName()); - for (Entry prop : setting.getProperties().entrySet()) { + for (Entry prop : setting.getOptions().entrySet()) { this.setProperty(tableName, root + ".opt." + prop.getKey(), prop.getValue()); } this.setProperty(tableName, root, setting.getPriority() + "," + setting.getIteratorClass()); Modified: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java (original) +++ incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java Tue Mar 20 17:38:23 2012 @@ -80,7 +80,7 @@ public class ScannerOptions implements S opts = new HashMap(); serverSideIteratorOptions.put(si.getName(), opts); } - opts.putAll(si.getProperties()); + opts.putAll(si.getOptions()); } @Override Modified: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original) +++ incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Tue Mar 20 17:38:23 2012 @@ -366,7 +366,7 @@ public abstract class InputFormatBase entry : cfg.getProperties().entrySet()) { + for (Entry entry : cfg.getOptions().entrySet()) { if (entry.getValue() == null) continue; Modified: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original) +++ incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Tue Mar 20 17:38:23 2012 @@ -412,7 +412,7 @@ public class Shell extends ShellOptions sb.append("- Iterator ").append(setting.getName()).append(" options:\n"); sb.append("- ").append("iteratorPriority").append(" = ").append(setting.getPriority()).append("\n"); sb.append("- ").append("iteratorClassName").append(" = ").append(setting.getIteratorClass()).append("\n"); - for (Entry optEntry : setting.getProperties().entrySet()) { + for (Entry optEntry : setting.getOptions().entrySet()) { sb.append("- ").append(optEntry.getKey()).append(" = ").append(optEntry.getValue()).append("\n"); } } Modified: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java (original) +++ incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java Tue Mar 20 17:38:23 2012 @@ -76,7 +76,7 @@ public class ListIterCommand extends Com sb.append("- Iterator ").append(setting.getName()).append(", ").append(scope).append(" scope options:\n"); sb.append("- ").append("iteratorPriority").append(" = ").append(setting.getPriority()).append("\n"); sb.append("- ").append("iteratorClassName").append(" = ").append(setting.getIteratorClass()).append("\n"); - for (Entry optEntry : setting.getProperties().entrySet()) { + for (Entry optEntry : setting.getOptions().entrySet()) { sb.append("- ").append(optEntry.getKey()).append(" = ").append(optEntry.getValue()).append("\n"); } } Modified: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java (original) +++ incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java Tue Mar 20 17:38:23 2012 @@ -118,7 +118,7 @@ public class ScanCommand extends Command for (IteratorSetting setting : tableScanIterators) { Shell.log.debug("Setting scan iterator " + setting.getName() + " at priority " + setting.getPriority() + " using class name " + setting.getIteratorClass()); - for (Entry option : setting.getProperties().entrySet()) { + for (Entry option : setting.getOptions().entrySet()) { Shell.log.debug("Setting option for " + setting.getName() + ": " + option.getKey() + "=" + option.getValue()); } scanner.addScanIterator(setting); Modified: incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java (original) +++ incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java Tue Mar 20 17:38:23 2012 @@ -131,12 +131,12 @@ public class FilterTest { IteratorSetting is = new IteratorSetting(1, SimpleFilter.class); Filter.setNegate(is, true); - filter.init(new SortedMapIterator(tm), is.getProperties(), null); + filter.init(new SortedMapIterator(tm), is.getOptions(), null); filter.seek(new Range(), EMPTY_COL_FAMS, false); int size = size(filter); assertTrue("size = " + size, size == 900); - filter.init(new SortedMapIterator(tm), is.getProperties(), null); + filter.init(new SortedMapIterator(tm), is.getOptions(), null); Key k = new Key(new Text("500")); filter.seek(new Range(k, null), EMPTY_COL_FAMS, false); size = size(filter); @@ -144,7 +144,7 @@ public class FilterTest { filter.init(new SortedMapIterator(tm), EMPTY_OPTS, null); Filter filter2 = new SimpleFilter2(); - filter2.init(filter, is.getProperties(), null); + filter2.init(filter, is.getOptions(), null); filter2.seek(new Range(), EMPTY_COL_FAMS, false); size = size(filter2); assertTrue("size = " + size, size == 100); @@ -168,7 +168,7 @@ public class FilterTest { IteratorSetting is = new IteratorSetting(1, SimpleFilter.class); Filter.setNegate(is, true); - filter.init(new SortedMapIterator(tm), is.getProperties(), null); + filter.init(new SortedMapIterator(tm), is.getOptions(), null); SortedKeyValueIterator copy = filter.deepCopy(null); filter.seek(new Range(), EMPTY_COL_FAMS, false); int size = size(filter); @@ -197,7 +197,7 @@ public class FilterTest { AgeOffFilter.setTTL(is, 101l); AgeOffFilter.setCurrentTime(is, 1001l); AgeOffFilter.setNegate(is, true); - a.init(new SortedMapIterator(tm), is.getProperties(), null); + a.init(new SortedMapIterator(tm), is.getOptions(), null); a = a.deepCopy(null); SortedKeyValueIterator copy = a.deepCopy(null); a.seek(new Range(), EMPTY_COL_FAMS, false); @@ -223,19 +223,19 @@ public class FilterTest { assertTrue(tm.size() == 1000); ColumnAgeOffFilter a = new ColumnAgeOffFilter(); - a.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + a.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); a.overrideCurrentTime(ts); a.seek(new Range(), EMPTY_COL_FAMS, false); assertEquals(size(a), 902); ColumnAgeOffFilter.addTTL(is, new IteratorSetting.Column("a", "b"), 101l); - a.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + a.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); a.overrideCurrentTime(ts); a.seek(new Range(), EMPTY_COL_FAMS, false); assertEquals(size(a), 102); ColumnAgeOffFilter.removeTTL(is, new IteratorSetting.Column("a", "b")); - a.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + a.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); a = (ColumnAgeOffFilter) a.deepCopy(null); a.overrideCurrentTime(ts); a.seek(new Range(), EMPTY_COL_FAMS, false); @@ -398,49 +398,49 @@ public class FilterTest { TimestampFilter a = new TimestampFilter(); IteratorSetting is = new IteratorSetting(1, TimestampFilter.class); TimestampFilter.setRange(is, "19990101010011GMT+01:00", "19990101010031GMT+01:00"); - a.init(new SortedMapIterator(tm), is.getProperties(), null); + a.init(new SortedMapIterator(tm), is.getOptions(), null); a = (TimestampFilter) a.deepCopy(null); a.seek(new Range(), EMPTY_COL_FAMS, false); assertEquals(size(a), 21); TimestampFilter.setRange(is, baseTime + 11000, baseTime + 31000); - a.init(new SortedMapIterator(tm), is.getProperties(), null); + a.init(new SortedMapIterator(tm), is.getOptions(), null); a.seek(new Range(), EMPTY_COL_FAMS, false); assertEquals(size(a), 21); TimestampFilter.setEnd(is, "19990101000031GMT", false); - a.init(new SortedMapIterator(tm), is.getProperties(), null); + a.init(new SortedMapIterator(tm), is.getOptions(), null); a.seek(new Range(), EMPTY_COL_FAMS, false); assertEquals(size(a), 20); TimestampFilter.setStart(is, "19990101000011GMT", false); - a.init(new SortedMapIterator(tm), is.getProperties(), null); + a.init(new SortedMapIterator(tm), is.getOptions(), null); a.seek(new Range(), EMPTY_COL_FAMS, false); assertEquals(size(a), 19); TimestampFilter.setEnd(is, "19990101000031GMT", true); - a.init(new SortedMapIterator(tm), is.getProperties(), null); + a.init(new SortedMapIterator(tm), is.getOptions(), null); a.seek(new Range(), EMPTY_COL_FAMS, false); assertEquals(size(a), 20); is.clearOptions(); TimestampFilter.setStart(is, "19990101000011GMT", true); - a.init(new SortedMapIterator(tm), is.getProperties(), null); + a.init(new SortedMapIterator(tm), is.getOptions(), null); a.seek(new Range(), EMPTY_COL_FAMS, false); assertEquals(size(a), 89); TimestampFilter.setStart(is, "19990101000011GMT", false); - a.init(new SortedMapIterator(tm), is.getProperties(), null); + a.init(new SortedMapIterator(tm), is.getOptions(), null); a.seek(new Range(), EMPTY_COL_FAMS, false); assertEquals(size(a), 88); is.clearOptions(); TimestampFilter.setEnd(is, "19990101000031GMT", true); - a.init(new SortedMapIterator(tm), is.getProperties(), null); + a.init(new SortedMapIterator(tm), is.getOptions(), null); a.seek(new Range(), EMPTY_COL_FAMS, false); assertEquals(size(a), 32); TimestampFilter.setEnd(is, "19990101000031GMT", false); - a.init(new SortedMapIterator(tm), is.getProperties(), null); + a.init(new SortedMapIterator(tm), is.getOptions(), null); a.seek(new Range(), EMPTY_COL_FAMS, false); assertEquals(size(a), 31); } Modified: incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java (original) +++ incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/GrepIteratorTest.java Tue Mar 20 17:38:23 2012 @@ -83,16 +83,16 @@ public class GrepIteratorTest { GrepIterator gi = new GrepIterator(); IteratorSetting is = new IteratorSetting(1, GrepIterator.class); GrepIterator.setTerm(is, "ab"); - gi.init(new SortedMapIterator(input), is.getProperties(), null); + gi.init(new SortedMapIterator(input), is.getOptions(), null); gi.seek(new Range(), EMPTY_COL_FAMS, false); checkEntries(gi, output); GrepIterator.setTerm(is, "cde"); - gi.init(new SortedMapIterator(input), is.getProperties(), null); + gi.init(new SortedMapIterator(input), is.getOptions(), null); gi.deepCopy(null); gi.seek(new Range(), EMPTY_COL_FAMS, false); checkEntries(gi, output); GrepIterator.setTerm(is, "def"); - gi.init(new SortedMapIterator(input), is.getProperties(), null); + gi.init(new SortedMapIterator(input), is.getOptions(), null); gi.seek(new Range(), EMPTY_COL_FAMS, false); checkEntries(gi, output); } Modified: incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java (original) +++ incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java Tue Mar 20 17:38:23 2012 @@ -196,7 +196,7 @@ public class IndexedDocIteratorTest exte IndexedDocIterator.setColumnFamilies(is, columnFamilies); IndexedDocIterator.setColfs(is, indexColf.toString(), docColfPrefix); IndexedDocIterator iter = new IndexedDocIterator(); - iter.init(source, is.getProperties(), env); + iter.init(source, is.getOptions(), env); iter.seek(new Range(), EMPTY_COL_FAMS, false); int hitCount = 0; while (iter.hasTop()) { @@ -234,7 +234,7 @@ public class IndexedDocIteratorTest exte IndexedDocIterator.setColumnFamilies(is, columnFamilies); IndexedDocIterator.setColfs(is, indexColf.toString(), docColfPrefix); IndexedDocIterator iter = new IndexedDocIterator(); - iter.init(source, is.getProperties(), env); + iter.init(source, is.getOptions(), env); iter.seek(new Range(), EMPTY_COL_FAMS, false); int hitCount = 0; while (iter.hasTop()) { @@ -276,7 +276,7 @@ public class IndexedDocIteratorTest exte IndexedDocIterator.setColumnFamilies(is, columnFamilies); IndexedDocIterator.setColfs(is, indexColf.toString(), docColfPrefix); IndexedDocIterator iter = new IndexedDocIterator(); - iter.init(mi, is.getProperties(), env); + iter.init(mi, is.getOptions(), env); iter.seek(new Range(), EMPTY_COL_FAMS, false); int hitCount = 0; while (iter.hasTop()) { @@ -317,7 +317,7 @@ public class IndexedDocIteratorTest exte IndexedDocIterator.setColumnFamilies(is, columnFamilies, notFlags); IndexedDocIterator.setColfs(is, indexColf.toString(), docColfPrefix); IndexedDocIterator iter = new IndexedDocIterator(); - iter.init(source, is.getProperties(), env); + iter.init(source, is.getOptions(), env); iter.seek(new Range(), EMPTY_COL_FAMS, false); int hitCount = 0; while (iter.hasTop()) { Modified: incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java (original) +++ incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java Tue Mar 20 17:38:23 2012 @@ -156,7 +156,7 @@ public class IntersectingIteratorTest ex IteratorSetting is = new IteratorSetting(1, IntersectingIterator.class); IntersectingIterator.setColumnFamilies(is, columnFamilies); IntersectingIterator iter = new IntersectingIterator(); - iter.init(source, is.getProperties(), env); + iter.init(source, is.getOptions(), env); iter.seek(new Range(), EMPTY_COL_FAMS, false); int hitCount = 0; while (iter.hasTop()) { @@ -185,7 +185,7 @@ public class IntersectingIteratorTest ex IteratorSetting is = new IteratorSetting(1, IntersectingIterator.class); IntersectingIterator.setColumnFamilies(is, columnFamilies); IntersectingIterator iter = new IntersectingIterator(); - iter.init(source, is.getProperties(), env); + iter.init(source, is.getOptions(), env); iter.seek(new Range(), EMPTY_COL_FAMS, false); int hitCount = 0; while (iter.hasTop()) { @@ -222,7 +222,7 @@ public class IntersectingIteratorTest ex IteratorSetting is = new IteratorSetting(1, IntersectingIterator.class); IntersectingIterator.setColumnFamilies(is, columnFamilies); IntersectingIterator iter = new IntersectingIterator(); - iter.init(mi, is.getProperties(), env); + iter.init(mi, is.getOptions(), env); iter.seek(new Range(), EMPTY_COL_FAMS, false); int hitCount = 0; while (iter.hasTop()) { @@ -258,7 +258,7 @@ public class IntersectingIteratorTest ex IteratorSetting is = new IteratorSetting(1, IntersectingIterator.class); IntersectingIterator.setColumnFamilies(is, columnFamilies, notFlags); IntersectingIterator iter = new IntersectingIterator(); - iter.init(source, is.getProperties(), env); + iter.init(source, is.getOptions(), env); iter.seek(new Range(), EMPTY_COL_FAMS, false); int hitCount = 0; while (iter.hasTop()) { Modified: incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java (original) +++ incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/LargeRowFilterTest.java Tue Mar 20 17:38:23 2012 @@ -61,7 +61,7 @@ public class LargeRowFilterTest extends LargeRowFilter lrfi = new LargeRowFilter(); IteratorSetting is = new IteratorSetting(1, LargeRowFilter.class); LargeRowFilter.setMaxColumns(is, maxColumns); - lrfi.init(new ColumnFamilySkippingIterator(smi), is.getProperties(), new RowDeletingIteratorTest.TestIE(scope, false)); + lrfi.init(new ColumnFamilySkippingIterator(smi), is.getOptions(), new RowDeletingIteratorTest.TestIE(scope, false)); return lrfi; } Modified: incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java (original) +++ incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/RegExFilterTest.java Tue Mar 20 17:38:23 2012 @@ -59,8 +59,8 @@ public class RegExFilterTest extends Tes IteratorSetting is = new IteratorSetting(1, RegExFilter.class); RegExFilter.setRegexs(is, ".*2", null, null, null, false); - rei.validateOptions(is.getProperties()); - rei.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + rei.validateOptions(is.getOptions()); + rei.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); rei.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(rei.hasTop()); @@ -72,8 +72,8 @@ public class RegExFilterTest extends Tes is.clearOptions(); RegExFilter.setRegexs(is, null, "ya.*", null, null, false); - rei.validateOptions(is.getProperties()); - rei.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + rei.validateOptions(is.getOptions()); + rei.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); rei.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(rei.hasTop()); @@ -85,8 +85,8 @@ public class RegExFilterTest extends Tes is.clearOptions(); RegExFilter.setRegexs(is, null, null, ".*01", null, false); - rei.validateOptions(is.getProperties()); - rei.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + rei.validateOptions(is.getOptions()); + rei.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); rei.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(rei.hasTop()); @@ -98,8 +98,8 @@ public class RegExFilterTest extends Tes is.clearOptions(); RegExFilter.setRegexs(is, null, null, null, ".*at", false); - rei.validateOptions(is.getProperties()); - rei.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + rei.validateOptions(is.getOptions()); + rei.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); rei.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(rei.hasTop()); @@ -111,7 +111,7 @@ public class RegExFilterTest extends Tes is.clearOptions(); RegExFilter.setRegexs(is, null, null, null, ".*ap", false); - rei.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + rei.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); rei.seek(new Range(), EMPTY_COL_FAMS, false); assertFalse(rei.hasTop()); @@ -120,7 +120,7 @@ public class RegExFilterTest extends Tes is.clearOptions(); RegExFilter.setRegexs(is, null, "ya.*", null, ".*at", false); - rei.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + rei.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); rei.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(rei.hasTop()); @@ -132,7 +132,7 @@ public class RegExFilterTest extends Tes is.clearOptions(); RegExFilter.setRegexs(is, null, "ya.*", null, ".*ap", false); - rei.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + rei.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); rei.seek(new Range(), EMPTY_COL_FAMS, false); assertFalse(rei.hasTop()); @@ -141,7 +141,7 @@ public class RegExFilterTest extends Tes is.clearOptions(); RegExFilter.setRegexs(is, "boo1", null, null, null, false); - rei.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + rei.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); rei.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(rei.hasTop()); @@ -155,7 +155,7 @@ public class RegExFilterTest extends Tes // ----------------------------------------------------- is.clearOptions(); - rei.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + rei.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); rei.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(rei.hasTop()); @@ -173,7 +173,7 @@ public class RegExFilterTest extends Tes is.clearOptions(); RegExFilter.setRegexs(is, "hamster", null, "hamster", "hamster", true); - rei.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + rei.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); rei.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(rei.hasTop()); @@ -185,7 +185,7 @@ public class RegExFilterTest extends Tes is.clearOptions(); RegExFilter.setRegexs(is, null, "ya.*", "hamster", null, true); - rei.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + rei.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); rei.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(rei.hasTop()); @@ -196,7 +196,7 @@ public class RegExFilterTest extends Tes is.clearOptions(); RegExFilter.setRegexs(is, null, "ya.*", "hamster", null, true); - rei.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + rei.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); rei.seek(new Range(), EMPTY_COL_FAMS, false); rei.deepCopy(new DefaultIteratorEnvironment()); @@ -211,7 +211,7 @@ public class RegExFilterTest extends Tes is.clearOptions(); RegExFilter.setRegexs(is, null, null, null, multiByteRegex, true); - rei.init(new SortedMapIterator(tm), is.getProperties(), new DefaultIteratorEnvironment()); + rei.init(new SortedMapIterator(tm), is.getOptions(), new DefaultIteratorEnvironment()); rei.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(rei.hasTop()); Modified: incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java (original) +++ incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/VersioningIteratorTest.java Tue Mar 20 17:38:23 2012 @@ -75,7 +75,7 @@ public class VersioningIteratorTest { VersioningIterator it = new VersioningIterator(); IteratorSetting is = new IteratorSetting(1, VersioningIterator.class); VersioningIterator.setMaxVersions(is, 3); - it.init(new SortedMapIterator(tm), is.getProperties(), null); + it.init(new SortedMapIterator(tm), is.getOptions(), null); it.seek(new Range(), EMPTY_COL_FAMS, false); TreeMap tmOut = iteratorOverTestData(it); @@ -106,7 +106,7 @@ public class VersioningIteratorTest { VersioningIterator it = new VersioningIterator(); IteratorSetting is = new IteratorSetting(1, VersioningIterator.class); VersioningIterator.setMaxVersions(is, 3); - it.init(new SortedMapIterator(tm), is.getProperties(), null); + it.init(new SortedMapIterator(tm), is.getOptions(), null); // after doing this seek, should only get two keys for row 1 // since we are seeking to the middle of the most recent @@ -142,7 +142,7 @@ public class VersioningIteratorTest { VersioningIterator it = new VersioningIterator(); IteratorSetting is = new IteratorSetting(1, VersioningIterator.class); VersioningIterator.setMaxVersions(is, 3); - it.init(new SortedMapIterator(tm), is.getProperties(), null); + it.init(new SortedMapIterator(tm), is.getOptions(), null); // after doing this seek, should get zero keys for row 1 Key seekKey = new Key(new Text(String.format("%03d", 1)), colf, colq, 15); @@ -192,7 +192,7 @@ public class VersioningIteratorTest { VersioningIterator it = new VersioningIterator(); IteratorSetting is = new IteratorSetting(1, VersioningIterator.class); VersioningIterator.setMaxVersions(is, i); - it.init(new SortedMapIterator(tm), is.getProperties(), null); + it.init(new SortedMapIterator(tm), is.getOptions(), null); it.seek(new Range(), EMPTY_COL_FAMS, false); TreeMap tmOut = iteratorOverTestData(it); @@ -219,7 +219,7 @@ public class VersioningIteratorTest { VersioningIterator it = new VersioningIterator(); IteratorSetting is = new IteratorSetting(1, VersioningIterator.class); VersioningIterator.setMaxVersions(is, 3); - it.init(new SortedMapIterator(tm), is.getProperties(), null); + it.init(new SortedMapIterator(tm), is.getOptions(), null); Key seekKey = new Key(new Text(String.format("%03d", 1)), colf, colq, 19); it.seek(new Range(seekKey, false, null, true), EMPTY_COL_FAMS, false); @@ -241,7 +241,7 @@ public class VersioningIteratorTest { VersioningIterator it = new VersioningIterator(); IteratorSetting is = new IteratorSetting(1, VersioningIterator.class); VersioningIterator.setMaxVersions(is, 3); - it.init(new SortedMapIterator(tm), is.getProperties(), null); + it.init(new SortedMapIterator(tm), is.getOptions(), null); VersioningIterator it2 = it.deepCopy(null); Key seekKey = new Key(new Text(String.format("%03d", 1)), colf, colq, 19); Modified: incubator/accumulo/trunk/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/iterator/GlobalIndexUidTest.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/iterator/GlobalIndexUidTest.java?rev=1303036&r1=1303035&r2=1303036&view=diff ============================================================================== --- incubator/accumulo/trunk/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/iterator/GlobalIndexUidTest.java (original) +++ incubator/accumulo/trunk/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/iterator/GlobalIndexUidTest.java Tue Mar 20 17:38:23 2012 @@ -157,7 +157,7 @@ public class GlobalIndexUidTest { IteratorSetting setting = new IteratorSetting(1, GlobalIndexUidCombiner.class); GlobalIndexUidCombiner.setCombineAllColumns(setting, true); GlobalIndexUidCombiner.setLossyness(setting, true); - comb.init(null, setting.getProperties(), null); + comb.init(null, setting.getOptions(), null); Logger.getLogger(GlobalIndexUidCombiner.class).setLevel(Level.OFF); Value val = new Value(UUID.randomUUID().toString().getBytes()); values.add(val);