Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java Wed Jan 23 20:51:59 2013 @@ -102,8 +102,13 @@ public abstract class LongCombiner exten @Override public boolean validateOptions(Map<String,String> options) { - super.validateOptions(options); - setEncoder(options); + if (super.validateOptions(options) == false) + return false; + try { + setEncoder(options); + } catch (Exception e) { + throw new IllegalArgumentException("bad encoder option", e); + } return true; }
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java Wed Jan 23 20:51:59 2013 @@ -122,7 +122,9 @@ public interface OptionDescriber { * * @param options * a map of option names to option values - * @return true if options are valid, false otherwise + * @return true if options are valid, false otherwise (IllegalArgumentException preferred) + * @exception IllegalArgumentException + * if there are problems with the options */ public boolean validateOptions(Map<String,String> options); } Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyIterator.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyIterator.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyIterator.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyIterator.java Wed Jan 23 20:51:59 2013 @@ -47,6 +47,6 @@ public class SortedKeyIterator extends W @Override public boolean validateOptions(Map<String,String> options) { - return options == null || options.isEmpty(); + return true; } } Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java Wed Jan 23 20:51:59 2013 @@ -211,8 +211,13 @@ public abstract class TypedValueCombiner @Override public boolean validateOptions(Map<String,String> options) { - super.validateOptions(options); - setLossyness(options); + if (super.validateOptions(options) == false) + return false; + try { + setLossyness(options); + } catch (Exception e) { + throw new IllegalArgumentException("bad boolean " + LOSSY + ":" + options.get(LOSSY)); + } return true; } Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java Wed Jan 23 20:51:59 2013 @@ -91,11 +91,12 @@ public class AgeOffFilter extends Filter @Override public boolean validateOptions(Map<String,String> options) { - super.validateOptions(options); + if (super.validateOptions(options) == false) + return false; try { Long.parseLong(options.get(TTL)); - } catch (NumberFormatException e) { - return false; + } catch (Exception e) { + throw new IllegalArgumentException("bad long " + TTL + ":" + options.get(TTL)); } return true; } Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java Wed Jan 23 20:51:59 2013 @@ -99,8 +99,13 @@ public class ColumnAgeOffFilter extends @Override public boolean validateOptions(Map<String,String> options) { - super.validateOptions(options); - this.ttls = new TTLSet(options); + if (super.validateOptions(options) == false) + return false; + try { + this.ttls = new TTLSet(options); + } catch (Exception e) { + throw new IllegalArgumentException("bad TTL options", e); + } return true; } Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java Wed Jan 23 20:51:59 2013 @@ -50,9 +50,8 @@ import org.apache.log4j.Logger; * * This iterator is commonly used with BatchScanner or AccumuloInputFormat, to parallelize the search over all shardIDs. * - * This iterator will *ignore* any columnFamilies passed to {@link #seek(Range, Collection, boolean)} as it performs intersections - * over terms. Extending classes should override the {@link TermSource#seekColfams} in their implementation's - * {@link #init(SortedKeyValueIterator, Map, IteratorEnvironment)} method. + * This iterator will *ignore* any columnFamilies passed to {@link #seek(Range, Collection, boolean)} as it performs intersections over terms. Extending classes + * should override the {@link TermSource#seekColfams} in their implementation's {@link #init(SortedKeyValueIterator, Map, IteratorEnvironment)} method. * * README.shard in docs/examples shows an example of using the IntersectingIterator. */ @@ -86,7 +85,7 @@ public class IntersectingIterator implem protected static final Logger log = Logger.getLogger(IntersectingIterator.class); - protected static class TermSource { + public static class TermSource { public SortedKeyValueIterator<Key,Value> iter; public Text term; public Collection<ByteSequence> seekColfams; @@ -108,7 +107,7 @@ public class IntersectingIterator implem this.term = term; this.notFlag = notFlag; // The desired column families for this source is the term itself - this.seekColfams = Collections.<ByteSequence>singletonList(new ArrayByteSequence(term.getBytes(), 0, term.getLength())); + this.seekColfams = Collections.<ByteSequence> singletonList(new ArrayByteSequence(term.getBytes(), 0, term.getLength())); } public String getTermString() { @@ -489,7 +488,6 @@ public class IntersectingIterator implem currentPartition = new Text(); currentDocID.set(emptyByteArray); - // seek each of the sources to the right column family within the row given by key for (int i = 0; i < sourcesCount; i++) { Key sourceKey; Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java Wed Jan 23 20:51:59 2013 @@ -257,20 +257,15 @@ public class LargeRowFilter implements S @Override public boolean validateOptions(Map<String,String> options) { if (options == null || options.size() < 1) { - System.out.println("Bad # of options, must supply: " + MAX_COLUMNS + " as value"); - return false; + throw new IllegalArgumentException("Bad # of options, must supply: " + MAX_COLUMNS + " as value"); } - if (options.containsKey(MAX_COLUMNS)) { - try { - maxColumns = Integer.parseInt(options.get(MAX_COLUMNS)); - } catch (NumberFormatException e) { - e.printStackTrace(); - return false; - } - } else { - System.out.println("Need to have " + MAX_COLUMNS); - return false; + if (!options.containsKey(MAX_COLUMNS)) + throw new IllegalArgumentException("Bad # of options, must supply: " + MAX_COLUMNS + " as value"); + try { + maxColumns = Integer.parseInt(options.get(MAX_COLUMNS)); + } catch (Exception e) { + throw new IllegalArgumentException("bad integer " + MAX_COLUMNS + ":" + options.get(MAX_COLUMNS)); } return true; Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java Wed Jan 23 20:51:59 2013 @@ -46,8 +46,6 @@ public class RegExFilter extends Filter return result; } - - public static final String ROW_REGEX = "rowRegex"; public static final String COLF_REGEX = "colfRegex"; public static final String COLQ_REGEX = "colqRegex"; @@ -101,18 +99,12 @@ public class RegExFilter extends Filter @Override public boolean accept(Key key, Value value) { if (orFields) - return ( - (matches(rowMatcher, rowMatcher == null ? null : key.getRowData())) || - (matches(colfMatcher, colfMatcher == null ? null : key.getColumnFamilyData())) || - (matches(colqMatcher, colqMatcher == null ? null : key.getColumnQualifierData())) || - (matches(valueMatcher, value.get(), 0, value.get().length)) - ); - return ( - (matches(rowMatcher, rowMatcher == null ? null : key.getRowData())) && - (matches(colfMatcher, colfMatcher == null ? null : key.getColumnFamilyData())) && - (matches(colqMatcher, colqMatcher == null ? null : key.getColumnQualifierData())) && - (matches(valueMatcher, value.get(), 0, value.get().length)) - ); + return ((matches(rowMatcher, rowMatcher == null ? null : key.getRowData())) + || (matches(colfMatcher, colfMatcher == null ? null : key.getColumnFamilyData())) + || (matches(colqMatcher, colqMatcher == null ? null : key.getColumnQualifierData())) || (matches(valueMatcher, value.get(), 0, value.get().length))); + return ((matches(rowMatcher, rowMatcher == null ? null : key.getRowData())) + && (matches(colfMatcher, colfMatcher == null ? null : key.getColumnFamilyData())) + && (matches(colqMatcher, colqMatcher == null ? null : key.getColumnQualifierData())) && (matches(valueMatcher, value.get(), 0, value.get().length))); } @Override @@ -149,9 +141,9 @@ public class RegExFilter extends Filter } if (options.containsKey(MATCH_SUBSTRING)) { - matchSubstring = Boolean.parseBoolean(options.get(MATCH_SUBSTRING)); + matchSubstring = Boolean.parseBoolean(options.get(MATCH_SUBSTRING)); } else { - matchSubstring = false; + matchSubstring = false; } if (options.containsKey(ENCODING)) { @@ -168,7 +160,7 @@ public class RegExFilter extends Filter io.addNamedOption(RegExFilter.COLF_REGEX, "regular expression on column family"); io.addNamedOption(RegExFilter.COLQ_REGEX, "regular expression on column qualifier"); io.addNamedOption(RegExFilter.VALUE_REGEX, "regular expression on value"); - io.addNamedOption(RegExFilter.OR_FIELDS, "use OR instread of AND when multiple regexes given"); + io.addNamedOption(RegExFilter.OR_FIELDS, "use OR instead of AND when multiple regexes given"); io.addNamedOption(RegExFilter.MATCH_SUBSTRING, "match on substrings"); io.addNamedOption(RegExFilter.ENCODING, "character encoding of byte array value (default is " + ENCODING_DEFAULT + ")"); return io; @@ -176,27 +168,33 @@ public class RegExFilter extends Filter @Override public boolean validateOptions(Map<String,String> options) { - super.validateOptions(options); - if (options.containsKey(ROW_REGEX)) - Pattern.compile(options.get(ROW_REGEX)).matcher(""); - - if (options.containsKey(COLF_REGEX)) - Pattern.compile(options.get(COLF_REGEX)).matcher(""); + if (super.validateOptions(options) == false) + return false; - if (options.containsKey(COLQ_REGEX)) - Pattern.compile(options.get(COLQ_REGEX)).matcher(""); - - if (options.containsKey(VALUE_REGEX)) - Pattern.compile(options.get(VALUE_REGEX)).matcher(""); + try { + if (options.containsKey(ROW_REGEX)) + Pattern.compile(options.get(ROW_REGEX)).matcher(""); + + if (options.containsKey(COLF_REGEX)) + Pattern.compile(options.get(COLF_REGEX)).matcher(""); + + if (options.containsKey(COLQ_REGEX)) + Pattern.compile(options.get(COLQ_REGEX)).matcher(""); + + if (options.containsKey(VALUE_REGEX)) + Pattern.compile(options.get(VALUE_REGEX)).matcher(""); + } catch (Exception e) { + throw new IllegalArgumentException("bad regex", e); + } if (options.containsKey(ENCODING)) { try { this.encoding = options.get(ENCODING); - @SuppressWarnings("unused") - String test = new String("test".getBytes(), encoding); + if ("".equals(this.encoding)) + encoding = ENCODING_DEFAULT; + new String("test".getBytes(), encoding); } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - return false; + throw new IllegalArgumentException("invalid encoding " + ENCODING + ":" + this.encoding, e); } } @@ -204,8 +202,7 @@ public class RegExFilter extends Filter } /** - * Encode the terms to match against in the iterator - * Same as calling setRegexs(IteratorSetting si, String rowTerm, String cfTerm, String cqTerm, String valueTerm, boolean orFields, boolean matchSubstring) + * Encode the terms to match against in the iterator. Same as calling {@link #setRegexs(IteratorSetting, String, String, String, String, boolean, boolean)} * with matchSubstring set to false * * @param si @@ -221,7 +218,7 @@ public class RegExFilter extends Filter * @param orFields * if true, any of the non-null terms can match to return the entry */ - public static void setRegexs(IteratorSetting si, String rowTerm, String cfTerm, String cqTerm, String valueTerm, boolean orFields) { + public static void setRegexs(IteratorSetting si, String rowTerm, String cfTerm, String cqTerm, String valueTerm, boolean orFields) { setRegexs(si, rowTerm, cfTerm, cqTerm, valueTerm, orFields, false); } @@ -242,7 +239,7 @@ public class RegExFilter extends Filter * if true then search expressions will match on partial strings */ public static void setRegexs(IteratorSetting si, String rowTerm, String cfTerm, String cqTerm, String valueTerm, boolean orFields, boolean matchSubstring) { - + if (rowTerm != null) si.addOption(RegExFilter.ROW_REGEX, rowTerm); if (cfTerm != null) @@ -252,13 +249,10 @@ public class RegExFilter extends Filter if (valueTerm != null) si.addOption(RegExFilter.VALUE_REGEX, valueTerm); si.addOption(RegExFilter.OR_FIELDS, String.valueOf(orFields)); - si.addOption(RegExFilter.MATCH_SUBSTRING, String.valueOf(matchSubstring)); - + si.addOption(RegExFilter.MATCH_SUBSTRING, String.valueOf(matchSubstring)); + } - - - /** * Set the encoding string to use when interpreting characters * Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java Wed Jan 23 20:51:59 2013 @@ -127,8 +127,13 @@ public class SummingArrayCombiner extend @Override public boolean validateOptions(Map<String,String> options) { - super.validateOptions(options); - setEncoder(options); + if (super.validateOptions(options) == false) + return false; + try { + setEncoder(options); + } catch (Exception e) { + throw new IllegalArgumentException("bad encoder option", e); + } return true; } Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java Wed Jan 23 20:51:59 2013 @@ -136,7 +136,8 @@ public class TimestampFilter extends Fil @Override public boolean validateOptions(Map<String,String> options) { - super.validateOptions(options); + if (super.validateOptions(options) == false) + return false; boolean hasStart = false; boolean hasEnd = false; try { @@ -157,13 +158,13 @@ public class TimestampFilter extends Fil dateParser.parse(s); } if (!hasStart && !hasEnd) - return false; + throw new IllegalArgumentException(START + " or " + END + " must be specified"); if (options.get(START_INCL) != null) Boolean.parseBoolean(options.get(START_INCL)); if (options.get(END_INCL) != null) Boolean.parseBoolean(options.get(END_INCL)); } catch (Exception e) { - return false; + throw new IllegalArgumentException("invalid options", e); } return true; } Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/VersioningIterator.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/VersioningIterator.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/VersioningIterator.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/VersioningIterator.java Wed Jan 23 20:51:59 2013 @@ -147,7 +147,12 @@ public class VersioningIterator extends @Override public boolean validateOptions(Map<String,String> options) { - int i = Integer.parseInt(options.get(MAXVERSIONS_OPT)); + int i; + try { + i = Integer.parseInt(options.get(MAXVERSIONS_OPT)); + } catch (Exception e) { + throw new IllegalArgumentException("bad integer " + MAXVERSIONS_OPT + ":" + options.get(MAXVERSIONS_OPT)); + } if (i < 1) throw new IllegalArgumentException(MAXVERSIONS_OPT + " for versioning iterator must be >= 1"); return true; @@ -160,6 +165,8 @@ public class VersioningIterator extends * @param maxVersions */ public static void setMaxVersions(IteratorSetting cfg, int maxVersions) { + if (maxVersions < 1) + throw new IllegalArgumentException(MAXVERSIONS_OPT + " for versioning iterator must be >= 1"); cfg.addOption(MAXVERSIONS_OPT, Integer.toString(maxVersions)); } } Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java Wed Jan 23 20:51:59 2013 @@ -355,14 +355,14 @@ import org.slf4j.LoggerFactory; case 1: // ITERATORS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list62 = iprot.readListBegin(); - struct.iterators = new ArrayList<TIteratorSetting>(_list62.size); - for (int _i63 = 0; _i63 < _list62.size; ++_i63) + org.apache.thrift.protocol.TList _list98 = iprot.readListBegin(); + struct.iterators = new ArrayList<TIteratorSetting>(_list98.size); + for (int _i99 = 0; _i99 < _list98.size; ++_i99) { - TIteratorSetting _elem64; // required - _elem64 = new TIteratorSetting(); - _elem64.read(iprot); - struct.iterators.add(_elem64); + TIteratorSetting _elem100; // required + _elem100 = new TIteratorSetting(); + _elem100.read(iprot); + struct.iterators.add(_elem100); } iprot.readListEnd(); } @@ -390,9 +390,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(ITERATORS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.iterators.size())); - for (TIteratorSetting _iter65 : struct.iterators) + for (TIteratorSetting _iter101 : struct.iterators) { - _iter65.write(oprot); + _iter101.write(oprot); } oprot.writeListEnd(); } @@ -423,9 +423,9 @@ import org.slf4j.LoggerFactory; if (struct.isSetIterators()) { { oprot.writeI32(struct.iterators.size()); - for (TIteratorSetting _iter66 : struct.iterators) + for (TIteratorSetting _iter102 : struct.iterators) { - _iter66.write(oprot); + _iter102.write(oprot); } } } @@ -437,14 +437,14 @@ import org.slf4j.LoggerFactory; BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list67 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.iterators = new ArrayList<TIteratorSetting>(_list67.size); - for (int _i68 = 0; _i68 < _list67.size; ++_i68) + org.apache.thrift.protocol.TList _list103 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.iterators = new ArrayList<TIteratorSetting>(_list103.size); + for (int _i104 = 0; _i104 < _list103.size; ++_i104) { - TIteratorSetting _elem69; // required - _elem69 = new TIteratorSetting(); - _elem69.read(iprot); - struct.iterators.add(_elem69); + TIteratorSetting _elem105; // required + _elem105 = new TIteratorSetting(); + _elem105.read(iprot); + struct.iterators.add(_elem105); } } struct.setIteratorsIsSet(true); Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java?rev=1437726&r1=1437725&r2=1437726&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java Wed Jan 23 20:51:59 2013 @@ -615,15 +615,15 @@ import org.slf4j.LoggerFactory; case 4: // PROPERTIES if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map52 = iprot.readMapBegin(); - struct.properties = new HashMap<String,String>(2*_map52.size); - for (int _i53 = 0; _i53 < _map52.size; ++_i53) + org.apache.thrift.protocol.TMap _map88 = iprot.readMapBegin(); + struct.properties = new HashMap<String,String>(2*_map88.size); + for (int _i89 = 0; _i89 < _map88.size; ++_i89) { - String _key54; // required - String _val55; // required - _key54 = iprot.readString(); - _val55 = iprot.readString(); - struct.properties.put(_key54, _val55); + String _key90; // required + String _val91; // required + _key90 = iprot.readString(); + _val91 = iprot.readString(); + struct.properties.put(_key90, _val91); } iprot.readMapEnd(); } @@ -664,10 +664,10 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PROPERTIES_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.properties.size())); - for (Map.Entry<String, String> _iter56 : struct.properties.entrySet()) + for (Map.Entry<String, String> _iter92 : struct.properties.entrySet()) { - oprot.writeString(_iter56.getKey()); - oprot.writeString(_iter56.getValue()); + oprot.writeString(_iter92.getKey()); + oprot.writeString(_iter92.getValue()); } oprot.writeMapEnd(); } @@ -716,10 +716,10 @@ import org.slf4j.LoggerFactory; if (struct.isSetProperties()) { { oprot.writeI32(struct.properties.size()); - for (Map.Entry<String, String> _iter57 : struct.properties.entrySet()) + for (Map.Entry<String, String> _iter93 : struct.properties.entrySet()) { - oprot.writeString(_iter57.getKey()); - oprot.writeString(_iter57.getValue()); + oprot.writeString(_iter93.getKey()); + oprot.writeString(_iter93.getValue()); } } } @@ -743,15 +743,15 @@ import org.slf4j.LoggerFactory; } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map58 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.properties = new HashMap<String,String>(2*_map58.size); - for (int _i59 = 0; _i59 < _map58.size; ++_i59) + org.apache.thrift.protocol.TMap _map94 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.properties = new HashMap<String,String>(2*_map94.size); + for (int _i95 = 0; _i95 < _map94.size; ++_i95) { - String _key60; // required - String _val61; // required - _key60 = iprot.readString(); - _val61 = iprot.readString(); - struct.properties.put(_key60, _val61); + String _key96; // required + String _val97; // required + _key96 = iprot.readString(); + _val97 = iprot.readString(); + struct.properties.put(_key96, _val97); } } struct.setPropertiesIsSet(true);
