Changeset 31206 for other-projects/hathitrust/wcsa

Timestamp:

2016-12-12T15:05:33+13:00 (7 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:

• BloomFilterAdvanced.java (modified) (6 diffs)
• BloomFilterAdvancedStrategies.java (modified) (1 diff)

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

@@ -68 +68 @@
    * <p>Implementations should be collections of pure functions (i.e. stateless).
    */
-  interface xxStrategy extends java.io.Serializable {
+  interface Strategy extends java.io.Serializable {
 
     /**
@@ -106 +106 @@
    * The strategy we employ to map an element T to {@code numHashFunctions} bit indexes.
    */
-  private final BloomFilter.Strategy strategy;
+  private final Strategy strategy;
 
   /**
@@ -112 +112 @@
    */
   private BloomFilterAdvanced(
-      BitArray bits, int numHashFunctions, Funnel<? super T> funnel, BloomFilter.Strategy strategy) {
+      BitArray bits, int numHashFunctions, Funnel<? super T> funnel, Strategy strategy) {
     checkArgument(numHashFunctions > 0, "numHashFunctions (%s) must be > 0", numHashFunctions);
     checkArgument(
@@ -323 +323 @@
   @VisibleForTesting
   static <T> BloomFilterAdvanced<T> create(
-      Funnel<? super T> funnel, long expectedInsertions, double fpp, BloomFilter.Strategy strategy) {
+      Funnel<? super T> funnel, long expectedInsertions, double fpp, Strategy strategy) {
     checkNotNull(funnel);
     checkArgument(
@@ -447 +447 @@
     final int numHashFunctions;
     final Funnel<? super T> funnel;
-    final BloomFilter.Strategy strategy;
+    final Strategy strategy;
 
     SerialForm(BloomFilterAdvanced<T> bf) {
@@ -511 +511 @@
       dataLength = din.readInt();
 
-      BloomFilter.Strategy strategy = BloomFilterAdvancedStrategies.values()[strategyOrdinal];
+      Strategy strategy = BloomFilterAdvancedStrategies.values()[strategyOrdinal];
       long[] data = new long[dataLength];
       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

@@ -36 +36 @@
  * @author Kurt Alfred Kluever
  */
-enum BloomFilterAdvancedStrategies implements BloomFilter.Strategy {
+enum BloomFilterAdvancedStrategies implements BloomFilterAdvanced.Strategy {
   /**
    * See "Less Hashing, Same Performance: Building a Better Bloom Filter" by Adam Kirsch and Michael