Changeset 31206

Show
Ignore:
Timestamp:
12.12.2016 15:05:33 (3 years ago)
Author:
davidb
Message:

More tweaking of Guava cloned code

Location:
other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/com/google/common/hash
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/com/google/common/hash/BloomFilterAdvanced.java

    r31205 r31206  
    6868   * <p>Implementations should be collections of pure functions (i.e. stateless). 
    6969   */ 
    70   interface xxStrategy extends java.io.Serializable { 
     70  interface Strategy extends java.io.Serializable { 
    7171 
    7272    /** 
     
    106106   * The strategy we employ to map an element T to {@code numHashFunctions} bit indexes. 
    107107   */ 
    108   private final BloomFilter.Strategy strategy; 
     108  private final Strategy strategy; 
    109109 
    110110  /** 
     
    112112   */ 
    113113  private BloomFilterAdvanced( 
    114       BitArray bits, int numHashFunctions, Funnel<? super T> funnel, BloomFilter.Strategy strategy) { 
     114      BitArray bits, int numHashFunctions, Funnel<? super T> funnel, Strategy strategy) { 
    115115    checkArgument(numHashFunctions > 0, "numHashFunctions (%s) must be > 0", numHashFunctions); 
    116116    checkArgument( 
     
    323323  @VisibleForTesting 
    324324  static <T> BloomFilterAdvanced<T> create( 
    325       Funnel<? super T> funnel, long expectedInsertions, double fpp, BloomFilter.Strategy strategy) { 
     325      Funnel<? super T> funnel, long expectedInsertions, double fpp, Strategy strategy) { 
    326326    checkNotNull(funnel); 
    327327    checkArgument( 
     
    447447    final int numHashFunctions; 
    448448    final Funnel<? super T> funnel; 
    449     final BloomFilter.Strategy strategy; 
     449    final Strategy strategy; 
    450450 
    451451    SerialForm(BloomFilterAdvanced<T> bf) { 
     
    511511      dataLength = din.readInt(); 
    512512 
    513       BloomFilter.Strategy strategy = BloomFilterAdvancedStrategies.values()[strategyOrdinal]; 
     513      Strategy strategy = BloomFilterAdvancedStrategies.values()[strategyOrdinal]; 
    514514      long[] data = new long[dataLength]; 
    515515      for (int i = 0; i < data.length; i++) { 
  • other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/com/google/common/hash/BloomFilterAdvancedStrategies.java

    r31205 r31206  
    3636 * @author Kurt Alfred Kluever 
    3737 */ 
    38 enum BloomFilterAdvancedStrategies implements BloomFilter.Strategy { 
     38enum BloomFilterAdvancedStrategies implements BloomFilterAdvanced.Strategy { 
    3939  /** 
    4040   * See "Less Hashing, Same Performance: Building a Better Bloom Filter" by Adam Kirsch and Michael