Index: lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucene40Postings.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucene40Postings.java (révision 1381222) +++ lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucene40Postings.java (copie de travail) @@ -22,13 +22,10 @@ import org.apache.lucene.codecs.FieldsConsumer; import org.apache.lucene.codecs.FieldsProducer; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.bloom.BloomFilteringPostingsFormat; import org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; -import org.apache.lucene.util.FuzzySet; -import org.apache.lucene.util.hash.MurmurHash2; /** * A class used for testing {@link BloomFilteringPostingsFormat} with a concrete Index: lucene/core/src/resources/META-INF/services/org.apache.lucene.util.hash.HashFunction (deleted) =================================================================== Index: lucene/core/src/java/org/apache/lucene/util/hash/MurmurHash2.java (deleted) =================================================================== Index: lucene/core/src/java/org/apache/lucene/util/hash/package.html (deleted) =================================================================== Index: lucene/core/src/java/org/apache/lucene/util/hash/HashFunction.java (deleted) =================================================================== Index: lucene/core/src/java/org/apache/lucene/util/FuzzySet.java (deleted) =================================================================== Index: lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java (révision 1381222) +++ lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java (copie de travail) @@ -1,4 +1,4 @@ -package org.apache.lucene.util.hash; +package org.apache.lucene.codecs.bloom; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,10 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import java.util.Set; - import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.NamedSPILoader; /** @@ -27,7 +24,7 @@ * on the range of bytes referenced in the provided {@link BytesRef} * @lucene.experimental */ -public abstract class HashFunction implements NamedSPILoader.NamedSPI { +public abstract class HashFunction { /** * Hashes the contents of the referenced bytes @@ -35,50 +32,5 @@ * @return the hash of the bytes referenced by bytes.offset and length bytes.length */ public abstract int hash(BytesRef bytes); - - private static final NamedSPILoader loader = - new NamedSPILoader(HashFunction.class); - private final String name; - - public HashFunction(String name) { - NamedSPILoader.checkServiceName(name); - this.name = name; - } - - /** Returns this codec's name */ - @Override - public final String getName() { - return name; - } - - /** looks up a hash function by name */ - public static HashFunction forName(String name) { - return loader.lookup(name); - } - - /** returns a list of all available hash function names */ - public static Set availableHashFunctionNames() { - return loader.availableServices(); - } - - /** - * Reloads the hash function list from the given {@link ClassLoader}. - * Changes to the function list are visible after the method ends, all - * iterators ({@link #availableHashFunctionNames()},...) stay consistent. - * - *

NOTE: Only new functions are added, existing ones are - * never removed or replaced. - * - *

This method is expensive and should only be called for discovery - * of new functions on the given classpath/classloader! - */ - public static void reloadHashFunctions(ClassLoader classloader) { - loader.reload(classloader); - } - - @Override - public String toString() { - return name; - } } Index: lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java (révision 1381222) +++ lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java (copie de travail) @@ -17,9 +17,6 @@ */ import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.SegmentWriteState; -import org.apache.lucene.util.FuzzySet; -import org.apache.lucene.util.hash.HashFunction; -import org.apache.lucene.util.hash.MurmurHash2; /** * Default policy is to allocate a bitset with 10% saturation given a unique term per document. Index: lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (révision 1381222) +++ lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (copie de travail) @@ -33,6 +33,7 @@ import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.TermStats; import org.apache.lucene.codecs.TermsConsumer; +import org.apache.lucene.codecs.bloom.FuzzySet.ContainsResult; import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo; @@ -46,11 +47,8 @@ import org.apache.lucene.store.IndexOutput; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.FuzzySet; -import org.apache.lucene.util.FuzzySet.ContainsResult; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.automaton.CompiledAutomaton; -import org.apache.lucene.util.hash.MurmurHash2; /** *

Index: lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java (révision 1381222) +++ lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java (copie de travail) @@ -1,4 +1,4 @@ -package org.apache.lucene.util.hash; +package org.apache.lucene.codecs.bloom; /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -33,14 +33,9 @@ * @lucene.experimental */ public class MurmurHash2 extends HashFunction{ - - - public static final String HASH_NAME="MurmurHash2"; - - public MurmurHash2() { - super(HASH_NAME); - } + public static final MurmurHash2 INSTANCE = new MurmurHash2(); + public static int hash(byte[] data, int seed, int offset, int len) { int m = 0x5bd1e995; int r = 24; Index: lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java (révision 1381222) +++ lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java (copie de travail) @@ -1,4 +1,4 @@ -package org.apache.lucene.util; +package org.apache.lucene.codecs.bloom; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,7 +20,8 @@ import org.apache.lucene.store.DataInput; import org.apache.lucene.store.DataOutput; -import org.apache.lucene.util.hash.HashFunction; +import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.FixedBitSet; /** *

@@ -45,9 +46,20 @@ * @lucene.experimental */ public class FuzzySet { - - public static final int FUZZY_SERIALIZATION_VERSION=1; - + + public static final int VERSION_SPI = 1; // HashFunction used to be loaded through a SPI + public static final int VERSION_START = VERSION_SPI; + public static final int VERSION_CURRENT = 2; + + public static HashFunction hashFunctionForVersion(int version) { + if (version < VERSION_START) { + throw new IllegalArgumentException("Version " + version + " is too old, expected at least " + VERSION_START); + } else if (version > VERSION_CURRENT) { + throw new IllegalArgumentException("Version " + version + " is too new, expected at most " + VERSION_CURRENT); + } + return MurmurHash2.INSTANCE; + } + /** * Result from {@link FuzzySet#contains(BytesRef)}: * can never return definitively YES (always MAYBE), @@ -174,8 +186,7 @@ */ public void serialize(DataOutput out) throws IOException { - out.writeInt(FUZZY_SERIALIZATION_VERSION); - out.writeString(hashFunction.getName()); + out.writeInt(VERSION_CURRENT); out.writeInt(bloomSize); long[] bits = filter.getBits(); out.writeInt(bits.length); @@ -188,11 +199,10 @@ public static FuzzySet deserialize(DataInput in) throws IOException { int version=in.readInt(); - if(version!=FUZZY_SERIALIZATION_VERSION) - { - throw new IOException("Error deserializing: set version is not "+FUZZY_SERIALIZATION_VERSION); + if (version == VERSION_SPI) { + in.readString(); } - HashFunction hashFunction=HashFunction.forName(in.readString()); + final HashFunction hashFunction = hashFunctionForVersion(version); int bloomSize=in.readInt(); int numLongs=in.readInt(); long[]longs=new long[numLongs]; Index: lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java (révision 1381222) +++ lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java (copie de travail) @@ -17,7 +17,6 @@ */ import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.SegmentWriteState; -import org.apache.lucene.util.FuzzySet; /** Index: solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java =================================================================== --- solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (révision 1381222) +++ solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (copie de travail) @@ -36,7 +36,6 @@ import org.apache.lucene.analysis.util.TokenizerFactory; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.util.hash.HashFunction; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.solr.common.ResourceLoader; import org.apache.solr.handler.admin.CoreAdminHandler; @@ -176,8 +175,6 @@ * this ResourceLoader. */ void reloadLuceneSPI() { - // Hash functions: - HashFunction.reloadHashFunctions(this.classLoader); // Codecs: PostingsFormat.reloadPostingsFormats(this.classLoader); Codec.reloadCodecs(this.classLoader);