accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1303582 - in /incubator/accumulo/branches/1.4/src/core/src: main/java/org/apache/accumulo/core/client/ test/java/org/apache/accumulo/core/client/admin/ test/java/org/apache/accumulo/core/iterators/user/
Date Wed, 21 Mar 2012 21:35:14 GMT
Author: kturner
Date: Wed Mar 21 21:35:14 2012
New Revision: 1303582

URL: http://svn.apache.org/viewvc?rev=1303582&view=rev
Log:
ACCUMULO-477 removed deprecated methods that were never released

Modified:
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
    incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
    incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java?rev=1303582&r1=1303581&r2=1303582&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
Wed Mar 21 21:35:14 2012
@@ -109,36 +109,6 @@ public class IteratorSetting {
   }
   
   /**
-   * Get the configuration parameters for this iterator.
-   * 
-   * @return the properties
-   * @deprecated Since 1.4.1, see {@link #getOptions()}
-   */
-  public Map<String,String> getProperties() {
-    return properties;
-  }
-  
-  /**
-   * Set the configuration parameters for this iterator.
-   * 
-   * @param properties
-   *          the properties to set
-   * @deprecated Since 1.4.1, see {@link #clearOptions()} and {@link #addOptions(Map)}
-   */
-  public void setProperties(Map<String,String> properties) {
-    this.properties.clear();
-    addOptions(properties);
-  }
-  
-  /**
-   * @return <tt>true</tt> if this iterator has configuration parameters.
-   * @deprecated Since 1.4.1, see {@link #getOptions()} and test {@link Map#isEmpty()}
-   */
-  public boolean hasProperties() {
-    return !properties.isEmpty();
-  }
-  
-  /**
    * Constructs an iterator setting configured for the scan scope with no parameters. (Parameters
can be added later.)
    * 
    * @param priority

Modified: incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java?rev=1303582&r1=1303581&r2=1303582&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
Wed Mar 21 21:35:14 2012
@@ -235,12 +235,12 @@ public class TableOperationsHelperTest {
     setting = t.getIteratorSetting("table", "otherName", IteratorScope.scan);
     Assert.assertEquals(20, setting.getPriority());
     Assert.assertEquals("some.classname", setting.getIteratorClass());
-    Assert.assertFalse(setting.hasProperties());
+    Assert.assertTrue(setting.getOptions().isEmpty());
     setting = t.getIteratorSetting("table", "otherName", IteratorScope.majc);
     Assert.assertEquals(20, setting.getPriority());
     Assert.assertEquals("some.classname", setting.getIteratorClass());
-    Assert.assertTrue(setting.hasProperties());
-    Assert.assertEquals(Collections.singletonMap("key", "value"), setting.getProperties());
+    Assert.assertFalse(setting.getOptions().isEmpty());
+    Assert.assertEquals(Collections.singletonMap("key", "value"), setting.getOptions());
     t.attachIterator("table", setting, EnumSet.of(IteratorScope.minc));
     t.check("table", new String[] {"table.iterator.majc.otherName=20,some.classname", "table.iterator.majc.otherName.opt.key=value",
         "table.iterator.minc.otherName=20,some.classname", "table.iterator.minc.otherName.opt.key=value",
"table.iterator.scan.otherName=20,some.classname",});

Modified: incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java?rev=1303582&r1=1303581&r2=1303582&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
Wed Mar 21 21:35:14 2012
@@ -102,7 +102,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, SummingCombiner.Type.VARLEN);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("2")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -167,7 +167,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, VarLenEncoder.class);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -233,7 +233,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, FixedLenEncoder.class.getName());
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -299,7 +299,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, FixedLenEncoder.class.getName());
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     
     SortedKeyValueIterator<Key,Value> ai2 = ai.deepCopy(null);
     SortedKeyValueIterator<Key,Value> ai3 = ai.deepCopy(null);
@@ -370,7 +370,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, SummingCombiner.Type.STRING);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -425,7 +425,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, SummingCombiner.Type.STRING);
     Combiner.setCombineAllColumns(is, true);
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -476,7 +476,7 @@ public class CombinerTest {
     sources.add(new SortedMapIterator(tm3));
     
     MultiIterator mi = new MultiIterator(sources, true);
-    ai.init(mi, is.getProperties(), null);
+    ai.init(mi, is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -500,7 +500,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, VarLenEncoder.class.getName());
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), new DefaultIteratorEnvironment());
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), new DefaultIteratorEnvironment());
     
     // try seeking to the beginning of a key that aggregates
     
@@ -528,7 +528,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, SummingCombiner.Type.FIXEDLEN);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), new DefaultIteratorEnvironment());
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), new DefaultIteratorEnvironment());
     
     ai.seek(nr(1, 1, 1, 4, true), EMPTY_COL_FAMS, false);
     
@@ -547,7 +547,7 @@ public class CombinerTest {
     tm1 = new TreeMap<Key,Value>();
     nkv(tm1, 1, 1, 1, 2, true, 0l, encoder);
     ai = new SummingCombiner();
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), new DefaultIteratorEnvironment());
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), new DefaultIteratorEnvironment());
     
     ai.seek(nr(1, 1, 1, 4, true), EMPTY_COL_FAMS, false);
     
@@ -589,7 +589,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, SummingCombiner.Type.VARLEN);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -602,7 +602,7 @@ public class CombinerTest {
     
     ai = new MinCombiner();
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -645,7 +645,7 @@ public class CombinerTest {
     SummingArrayCombiner.setEncodingType(is, type);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -660,7 +660,7 @@ public class CombinerTest {
     SummingArrayCombiner.setEncodingType(is, encoderClass);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -675,7 +675,7 @@ public class CombinerTest {
     SummingArrayCombiner.setEncodingType(is, encoderClass.getName());
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -691,7 +691,7 @@ public class CombinerTest {
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
     try {
-      ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+      ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
       Assert.fail();
     } catch (IllegalArgumentException e) {}
     
@@ -700,7 +700,7 @@ public class CombinerTest {
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
     try {
-      ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+      ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
       Assert.fail();
     } catch (IllegalArgumentException e) {}
   }



Mime
View raw message